[oe-commits] org.oe.dev package_ipk/deb.bbclass: Make the PACKAGES check earlier so if there is nothing to package we don't read potentially stale pkgdata from staging. Fixes the strange ncurses-native issue after ncurses packaging was fixed
rpurdie commit
oe at amethyst.openembedded.net
Mon Mar 17 08:51:44 UTC 2008
package_ipk/deb.bbclass: Make the PACKAGES check earlier so if there is nothing to package we don't read potentially stale pkgdata from staging. Fixes the strange ncurses-native issue after ncurses packaging was fixed
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: eec4fc095d1cf02ab8534fd7ac02690d63b2e2ba
ViewMTN: http://monotone.openembedded.org/revision/info/eec4fc095d1cf02ab8534fd7ac02690d63b2e2ba
Files:
1
classes/package_deb.bbclass
classes/package_ipk.bbclass
Diffs:
#
# mt diff -ra0269bea8450a3f7d6ba8018b8cbe2a7898d6bb6 -reec4fc095d1cf02ab8534fd7ac02690d63b2e2ba
#
#
#
# patch "classes/package_deb.bbclass"
# from [e1c18789aa0e0ad6a1e1faafbefb41e9b69e22de]
# to [29ec1e6d134d74483c5c26043872a32cdc95bdc9]
#
# patch "classes/package_ipk.bbclass"
# from [5034d6b967ea7da5ccaf3b815655ea7f85cd3ca0]
# to [29c2d1055840133cc3b8317a33dc52aeeb4cd9fc]
#
============================================================
--- classes/package_deb.bbclass e1c18789aa0e0ad6a1e1faafbefb41e9b69e22de
+++ classes/package_deb.bbclass 29ec1e6d134d74483c5c26043872a32cdc95bdc9
@@ -88,10 +88,6 @@ python do_package_deb () {
return
bb.mkdirhier(dvar)
- packages = bb.data.getVar('PACKAGES', d, 1)
- if not packages:
- bb.debug(1, "PACKAGES not defined, nothing to package")
- return
tmpdir = bb.data.getVar('TMPDIR', d, 1)
@@ -102,6 +98,7 @@ python do_package_deb () {
bb.debug(1, "No packages; nothing to do")
return
+ packages = bb.data.getVar('PACKAGES', d, 1)
for pkg in packages.split():
localdata = bb.data.createCopy(d)
pkgdest = bb.data.getVar('PKGDEST', d, 1)
@@ -273,8 +270,13 @@ python do_package_write_deb () {
}
python do_package_write_deb () {
- bb.build.exec_func("read_subpackage_metadata", d)
- bb.build.exec_func("do_package_deb", d)
+ packages = bb.data.getVar('PACKAGES', d, True)
+ if not packages:
+ bb.debug(1, "No PACKAGES defined, nothing to package")
+ return
+
+ bb.build.exec_func("read_subpackage_metadata", d)
+ bb.build.exec_func("do_package_deb", d)
}
do_package_write_deb[dirs] = "${D}"
addtask package_write_deb before do_package_write after do_package
============================================================
--- classes/package_ipk.bbclass 5034d6b967ea7da5ccaf3b815655ea7f85cd3ca0
+++ classes/package_ipk.bbclass 29c2d1055840133cc3b8317a33dc52aeeb4cd9fc
@@ -137,20 +137,12 @@ python do_package_ipk () {
return
bb.mkdirhier(dvar)
- packages = bb.data.getVar('PACKAGES', d, 1)
- if not packages:
- bb.debug(1, "PACKAGES not defined, nothing to package")
- return
-
tmpdir = bb.data.getVar('TMPDIR', d, 1)
if os.access(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"), os.R_OK):
os.unlink(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"))
- if packages == []:
- bb.debug(1, "No packages; nothing to do")
- return
-
+ packages = bb.data.getVar('PACKAGES', d, True)
for pkg in packages.split():
localdata = bb.data.createCopy(d)
pkgdest = bb.data.getVar('PKGDEST', d, 1)
@@ -313,6 +305,11 @@ python do_package_write_ipk () {
}
python do_package_write_ipk () {
+ packages = bb.data.getVar('PACKAGES', d, True)
+ if not packages:
+ bb.debug(1, "No PACKAGES defined, nothing to package")
+ return
+
bb.build.exec_func("read_subpackage_metadata", d)
bb.build.exec_func("do_package_ipk", d)
}
More information about the Openembedded-commits
mailing list