... | ... |
@@ -60,6 +60,7 @@ |
60 | 60 |
"Linux-PAM-lang", "make", "bindutils", "gperf", "lua-devel", "which", "less", |
61 | 61 |
"cmake", "gpgme-devel", "parted", "vim", "xz-devel", "xerces-c-devel", "xml-security-c-devel", |
62 | 62 |
"nss-devel", "ncurses-devel", "tzdata", "itstool", "sed-lang", "gptfdisk", "ntp", "flex", "patch", "m4", "dracut", "dracut-tools", |
63 |
+ "libarchive", "libsoup", "asciidoc", "mkinitcpio" |
|
63 | 64 |
"ostree", "tdnf-devel", "rpm-ostree", "createrepo", "glibmm", "deltarpm", "cdrkit", "dparted", "libgsystem", |
64 | 65 |
"rpm-ostree-toolbox","libsepol","libselinux","device-mapper-libs","device-mapper", |
65 | 66 |
"acl","btrfs-progs","btrfs-progs-devel","device-mapper-devel","device-mapper-event","device-mapper-event-devel", |
... | ... |
@@ -67,7 +68,7 @@ |
67 | 67 |
"libaio","libaio-devel","thin-provisioning-tools","lvm2","lvm2-devel","lvm2-libs","lvm2-python-libs","lzo","lzo-devel","lzo-minilzo","swig", |
68 | 68 |
"rpm-devel","pycurl","urlgrabber","yum-metadata-parser","yum", "rocket", "strace", "cracklib-python", |
69 | 69 |
"haveged", "haveged-devel", |
70 |
- "postgresql", "openjdk", "apr", "apr-util", "httpd", "openvswitch"] |
|
70 |
+ "postgresql", "openjdk", "apr", "apr-util", "httpd", "openvswitch"] |
|
71 | 71 |
} |
72 | 72 |
|
73 | 73 |
|
... | ... |
@@ -28,6 +28,7 @@ class PackageBuilder(object): |
28 | 28 |
try: |
29 | 29 |
chrUtils = ChrootUtils(self.logName,self.logPath) |
30 | 30 |
returnVal,chrootID = chrUtils.createChroot(chrootName) |
31 |
+ self.logger.debug("Created new chroot: " + chrootID) |
|
31 | 32 |
if not returnVal: |
32 | 33 |
raise Exception("Unable to prepare build root") |
33 | 34 |
tUtils=ToolChainUtils(self.logName,self.logPath) |
... | ... |
@@ -37,6 +38,7 @@ class PackageBuilder(object): |
37 | 37 |
tUtils.installToolChain(chrootID) |
38 | 38 |
except Exception as e: |
39 | 39 |
if chrootID is not None: |
40 |
+ self.logger.debug("Deleting chroot: " + chrootID) |
|
40 | 41 |
chrUtils.destroyChroot(chrootID) |
41 | 42 |
raise e |
42 | 43 |
return chrootID |
... | ... |
@@ -102,11 +104,11 @@ class PackageBuilder(object): |
102 | 102 |
pkgUtils.buildRPMSForGivenPackage(package,chrootID,destLogPath) |
103 | 103 |
self.logger.info("Successfully built the package:"+package) |
104 | 104 |
except Exception as e: |
105 |
- self.logger.error("Failed while building package:"+package) |
|
105 |
+ self.logger.error("Failed while building package:" + package) |
|
106 |
+ self.logger.debug("Chroot with ID: " + chrootID + " not deleted for debugging.") |
|
106 | 107 |
raise e |
107 |
- finally: |
|
108 |
- if chrootID is not None: |
|
109 |
- chrUtils.destroyChroot(chrootID) |
|
108 |
+ if chrootID is not None: |
|
109 |
+ chrUtils.destroyChroot(chrootID) |
|
110 | 110 |
|
111 | 111 |
|
112 | 112 |
def findRunTimeRequiredRPMPackages(self,rpmPackage): |
... | ... |
@@ -85,7 +85,7 @@ class PackageUtils(object): |
85 | 85 |
if len(sourcePath) > 1: |
86 | 86 |
self.logger.error("Multiple sources found for source:"+source+"\n"+ ",".join(sourcePath) +"\nUnable to determine one.") |
87 | 87 |
raise Exception("Multiple sources found") |
88 |
- self.logger.info("Source path :" + source + " Source filename: " + sourcePath[0]) |
|
88 |
+ self.logger.info("Copying... Source path :" + source + " Source filename: " + sourcePath[0]) |
|
89 | 89 |
shutil.copy2(sourcePath[0], destDir) |
90 | 90 |
|
91 | 91 |
def buildRPMSForGivenPackage(self,package, chrootID,destLogPath=None): |
... | ... |
@@ -46,6 +46,9 @@ cp ./locale* ${BUILDROOT}${PARENT}/ |
46 | 46 |
#copy kernel config files |
47 | 47 |
cp ./config* ${BUILDROOT}${PARENT}/ |
48 | 48 |
|
49 |
+mkdir ${BUILDROOT}/etc |
|
50 |
+cp /etc/resolv.conf ${BUILDROOT}/etc/ |
|
51 |
+ |
|
49 | 52 |
#copy our macros and set the processor count |
50 | 53 |
#NUMPROCS=`nproc` |
51 | 54 |
#let NUMPROCS=$NUMPROCS+1 |