The 'osutil' source code currently exists in two repos: * https://fedorahosted.org/pki/browser/trunk/pki/base/osutil (SVN) * https://fedorahosted.org/osutil/browser (GIT) (1) verify osutil (GIT) contains the very latest source code (2) port osutil (SVN) compose script and spec file to osutil (GIT) (3) verify osutil (GIT) builds, installs, and is usable (4) remove the osutil CMake-related code from the PKI (SVN) TIP ONLY! NOTE: The 'osutil' source code under SVN will be removed during the legacy build cleanup and Wiki documentation effort needed to release Dogtag 9.0.0.
Created attachment 471966 [details] Consolidated SVN repo changes to GIT repo
'osutil' GIT repo: # cd osutil # git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # new file: compose_osutil_packages # new file: osutil.spec # # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: CMakeLists.txt # modified: cmake/Modules/DefineInstallationPaths.cmake # modified: cmake/Modules/FindNSS.cmake # modified: cmake/Modules/UseJava.cmake # modified: cmake/Modules/UseJavaClassFilelist.cmake # modified: src/CMakeLists.txt # modified: src/com/netscape/osutil/CMakeLists.txt # # git commit [master 4e82064] Bugzilla Bug #667556 - Consolidate 'osutil' SVN source code with 'osutil' GIT source code Committer: Matthew Harmsen <mharmsen.redhat.com> Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly: git config --global user.name "Your Name" git config --global user.email you If the identity used for this commit is wrong, you can fix it with: git commit --amend --author='Your Name <you>' 2 files changed, 240 insertions(+), 0 deletions(-) create mode 100755 compose_osutil_packages create mode 100644 osutil.spec
# git commit -a [master 6fb43bc] Bugzilla Bug #667556 - Consolidate 'osutil' SVN source code with 'osutil' GIT source code Committer: Matthew Harmsen <mharmsen.redhat.com> Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly: git config --global user.name "Your Name" git config --global user.email you If the identity used for this commit is wrong, you can fix it with: git commit --amend --author='Your Name <you>' 7 files changed, 619 insertions(+), 60 deletions(-)
git push Counting objects: 32, done. Delta compression using up to 4 threads. Compressing objects: 100% (16/16), done. Writing objects: 100% (19/19), 9.10 KiB, done. Total 19 (delta 10), reused 0 (delta 0) To ssh://git.fedorahosted.org/git/osutil.git 986d410..6fb43bc master -> master
[master 28016cf] Updated spec file per Fedora builds. Committer: Matthew Harmsen <mharmsen.redhat.com> Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly: git config --global user.name "Your Name" git config --global user.email you If the identity used for this commit is wrong, you can fix it with: git commit --amend --author='Your Name <you>' 1 files changed, 36 insertions(+), 21 deletions(-) pkilinux.sjc.redhat.com:/home/mharmsen/OSUTIL/osutil[85] git push Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 855 bytes, done. Total 3 (delta 2), reused 0 (delta 0) To ssh://git.fedorahosted.org/git/osutil.git 6fb43bc..28016cf master -> master
[master 1c9903a] Bugzilla Bug #667556 - Consolidate 'osutil' SVN source code with 'osutil' GIT source code Committer: Matthew Harmsen <mharmsen.redhat.com> Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly: git config --global user.name "Your Name" git config --global user.email you If the identity used for this commit is wrong, you can fix it with: git commit --amend --author='Your Name <you>' 1 files changed, 5 insertions(+), 2 deletions(-) pkilinux.sjc.redhat.com:/home/mharmsen/OSUTIL/osutil[75] git push Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 453 bytes, done. Total 3 (delta 2), reused 0 (delta 0) To ssh://git.fedorahosted.org/git/osutil.git 28016cf..1c9903a master -> master
Created attachment 472329 [details] Removal of 'osutil' CMake build infrastructure from 'SVN' repo . . .
# cd pki # svn status | grep -v ^$ | grep -v ^P | grep -v ^X | grep -v ^? D scripts/compose_osutil_packages D base/osutil/src/CMakeLists.txt D base/osutil/src/com/netscape/osutil/CMakeLists.txt D base/osutil/CMakeLists.txt M base/CMakeLists.txt M CMakeLists.txt D specs/osutil.spec # svn commit Sending CMakeLists.txt Sending base/CMakeLists.txt Deleting base/osutil/CMakeLists.txt Deleting base/osutil/src/CMakeLists.txt Deleting base/osutil/src/com/netscape/osutil/CMakeLists.txt Deleting scripts/compose_osutil_packages Deleting specs/osutil.spec Transmitting file data .. Committed revision 1715.
IMPORTANT: This bug DOES NOT remove 'osutil' source code from the 'SVN' repository! This will be done as a part of the process of removing the legacy build system from 'SVN' in a future bug!