Change the location of zImage.lds

This commit is contained in:
Martin Gracik 2011-03-08 16:03:49 +01:00
parent d65c36b128
commit b7912a22b3

View File

@ -51,7 +51,6 @@ NETBOOTDIR = "images/netboot"
MKZIMAGE = "usr/bin/mkzimage" MKZIMAGE = "usr/bin/mkzimage"
ZIMAGE_STUB = "usr/share/ppc64-utils/zImage.stub" ZIMAGE_STUB = "usr/share/ppc64-utils/zImage.stub"
ZIMAGE_LDS = "usr/share/ppc64-utils/zImage.lds"
WRAPPER = "usr/sbin/wrapper" WRAPPER = "usr/sbin/wrapper"
ISOPATHDIR = "isopath" ISOPATHDIR = "isopath"
@ -94,10 +93,6 @@ class PPC(object):
self.reqs["yabootconf"] = cpfile(yabootconf, workdir) self.reqs["yabootconf"] = cpfile(yabootconf, workdir)
# zImage.lds
zimage_lds = joinpaths(self.installtree.root, ZIMAGE_LDS)
self.reqs["zimage_lds"] = cpfile(zimage_lds, workdir)
# bootinfo.txt # bootinfo.txt
bootinfo_txt = joinpaths(self.installtree.root, ANABOOTDIR, bootinfo_txt = joinpaths(self.installtree.root, ANABOOTDIR,
"bootinfo.txt") "bootinfo.txt")
@ -207,8 +202,11 @@ class PPC(object):
if (os.path.exists(mkzimage) and os.path.exists(zimage_stub)): if (os.path.exists(mkzimage) and os.path.exists(zimage_stub)):
logger.info("creating the z image") logger.info("creating the z image")
# copy zImage.lds
zimage_lds = cpfile(self.reqs["zimage_lds"], # XXX copy zImage.lds
zimage_lds = joinpaths(self.installtree.root,
"usr/%s/kernel-wrapper/zImage.lds" % libdir)
zimage_lds = cpfile(zimage_lds,
joinpaths(self.outputroot, ppcdir)) joinpaths(self.outputroot, ppcdir))
# change current working directory # change current working directory