diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rwxr-xr-x | build_functions.py | 12 | ||||
| -rwxr-xr-x | build_nss.py | 10 | ||||
| -rwxr-xr-x | build_nss.sh | 5 | ||||
| -rwxr-xr-x | checkout-all-packages.sh | 5 | ||||
| -rwxr-xr-x | prepare-all-srpms.sh | 12 |
6 files changed, 33 insertions, 21 deletions
@@ -3,17 +3,17 @@ all: use-defaults use-defaults: prepare (export dist=rawhide; export arch=i386; \ export nss_pkgs="nspr nss-util nss-softokn nss"; \ - export clients="curl dconf evolution-data-server libreswan firefox crypto-utils crontabs dconf"; \ + export clients="crypto-utils"; \ sh ./build_nss.sh) build-for-rawhide-i386: prepare (dist=rawhide arch=i386 \ - nss_pkgs="nspr nss-util nss-softokn nss" clients="" ./build_nss.sh) + export nss_pkgs="nspr nss-util nss-softokn nss"; export clients=""; ./build_nss.sh) build-for-rawhide-x86_64: prepare (dist=rawhide arch=x86_64 \ - nss_pkgs="nspr nss-util nss-softokn nss" clients="" ./build_nss.sh) + export nss_pkgs="nspr nss-util nss-softokn nss"; export clients=""; ./build_nss.sh) prepare: - ./checkout-all-packages.sh - ./prepare-all-srpms.sh + (export clients=""; ./checkout-all-packages.sh) + (export clients=""; ./prepare-all-srpms.sh) diff --git a/build_functions.py b/build_functions.py index f6f1fbe..9558012 100755 --- a/build_functions.py +++ b/build_functions.py @@ -13,7 +13,7 @@ import distutils.dir_util ########################################################################################## -def email(message, mailTo): +def email(message, mailTo): import smtplib import socket # mail_server='smtp.corp.redhat.com' @@ -199,15 +199,15 @@ def build_package(package, mock_cfg, gitrev, buildDir, group, optionsDebug, mail # scriptPath = scriptsDir + script # for line in runProcess(['/home/kwright/scripts/srpm_timestamp.sh', SRPM, gitrev]): -# for line in runProcess([scriptPath, SRPM, gitrev]): -# print line, +# for line in runProcess([scriptPath, SRPM, gitrev]): +# print line, # os.remove(SRPM) # for fileName in os.listdir(SRPMS): # if re.search(srpmPattern, fileName): # print_debug("fileName %s" % fileName) # SRPM = fileName -# else: -# print "INFO: This srpm has already been converted.\n" +# else: +# print "INFO: This srpm has already been converted.\n" #resultsDir= '/var/lib/mock/' + mock_cfg + '/result' resultsDir= os.path.join('/var/lib/mock', mock_cfg, 'result') @@ -340,7 +340,7 @@ def build_nss_pkgs( logFilePath = os.path.join(buildLogs, package + ".log") logFile = open(logFilePath, "w") status = 0 - for line in runProcess(['mock', '--no-cleanup-after', '-v', '-r', mock_cfg, '--shell', 'build_nss.sh']): + for line in runProcess(['mock', '--no-clean --no-cleanup-after', '-v', '-r', mock_cfg, '--shell', 'build_nss.sh']): logFile.write(line,) print line, print "Build status = %s for %s " % (status, package) diff --git a/build_nss.py b/build_nss.py index 06edcac..0660b2f 100755 --- a/build_nss.py +++ b/build_nss.py @@ -92,9 +92,9 @@ parser.add_argument('-b', '--build', parser.add_argument('-c', '--clients', action='store', dest='clientPackageList', nargs='+', - default=[ 'xulrunner' ], + default=[ '' ], help='specify a list of one of more builds to perform. ', - choices=('mod_nss', 'mod_revocator', 'curl', 'evolution-data-server', 'libreswan', 'xulrunner')) + choices=('', 'mod_nss', 'mod_revocator', 'curl', 'evolution-data-server', 'libreswan', 'xulrunner')) parser.add_argument('-m', '--mock_cfg', action="store", dest="mockCfgList", nargs='+', @@ -102,8 +102,8 @@ parser.add_argument('-m', '--mock_cfg', help='specify a list of one or more mock configs to use. [default = fedora-rawhide-i386", "fedora-rawhide-x86_64]', choices=("fedora-rawhide-i386", "fedora-rawhide-x86_64")) -parser.add_argument("-nc", "--no-cleanup-after", - action='store_true', dest="noCleanupAfter", default= "True", +parser.add_argument("-nc", "--no-clean", + action='store_true', dest="noClean", default= "True", help="don't cleanup the buildroot first") options = parser.parse_args() @@ -146,7 +146,7 @@ print_debug("skipWget = %s " % options.skipWget) print_debug("nssPackageList = %s " % options.nssPackageList) print_debug("clientPackageList = %s " % options.clientPackageList) print_debug("mockCfgList = %s " % options.mockCfgList) -print_debug("noCleanupAfter = %s " % options.noCleanupAfter) +#print_debug("noCleanupAfter = %s " % options.noCleanupAfter) ####################################################### mockCfgList=[] diff --git a/build_nss.sh b/build_nss.sh index 6910f54..3e57d52 100755 --- a/build_nss.sh +++ b/build_nss.sh @@ -33,7 +33,10 @@ all_clients="mod_nss mod_revocator curl evolution-data-server libreswan firefox clients=${clients:-$all_clients} workdir=`pwd` for pkg in ${nss_pkgs}; do - fedpkg srpm + if [ $p = nss -o $p = nss-util -o $p = nss-softokn ]; then + fedpkg switch-branch private-emaldona-upstream-experiment + fi + fedpkg --dist=f24 srpm mock -r fedora-${dist}-${arch2} --copyin ${pkg}/${pkg}-*.src.rpm /tmp done # repeat for client packages diff --git a/checkout-all-packages.sh b/checkout-all-packages.sh index 25242e2..542b6ba 100755 --- a/checkout-all-packages.sh +++ b/checkout-all-packages.sh @@ -14,6 +14,9 @@ checkout_pkgs() { fi for p in $1; do fedpkg clone $p ${OPT_BRANCH} -a + if [ $p = nss -o $p = nss-util -o $p = nss-softokn ]; then + fedpkg switch-branch private-emaldona-upstream-experiment + fi done } @@ -25,7 +28,7 @@ remove_pkgs() { #---------------------------------------------------------- nssPkgs="nspr nss-util nss-softokn nss" -clientPkgs="curl evolution-data-server mod_nss libreswan crypto-utils dconf firefox" +clientPkgs="crypto-utils curl dconf evolution-data-server mod_nss libreswan firefox" # default branch=master diff --git a/prepare-all-srpms.sh b/prepare-all-srpms.sh index 926809c..e481482 100755 --- a/prepare-all-srpms.sh +++ b/prepare-all-srpms.sh @@ -20,7 +20,10 @@ srpm_pkgs() { fi for p in $1; do pushd $p - fedpkg srpm + if [ $p = nss -o $p = nss-util -o $p = nss-softokn ]; then + fedpkg switch-branch private-emaldona-upstream-experiment + fi + fedpkg --dist=f24 srpm cp -p $p-*.src.rpm ../packages/SRPMS popd done @@ -35,7 +38,10 @@ checkout_and_srpm_pkgs() { for p in $1; do fedpkg clone $p ${OPTION_BRANCH} --anonymous pushd $p - fedpkg srpm + if [ $p = nss -o $p = nss-util -o $p = nss-softokn" ]; then + fedpkg switch-branch private-emaldona-upstream-experiment + fi + fedpkg --dist=f24 srpm cp -p $p-*.src.rpm ../packages/SRPMS popd done @@ -43,7 +49,7 @@ checkout_and_srpm_pkgs() { #---------------------------------------------------------- nssPkgs="nspr nss-util nss-softokn nss" -clientPkgs="curl evolution-data-server mod_nss libreswan crypto-utils dconf firefox" +clientPkgs="crypto-utils curl dconf evolution-data-server libreswan firefox" # default branch=master |