[oe-commits] org.oe.dev merge of '105955293719b2a1414f1b03af410b8ff8dbdb1b'
koen commit
openembedded-commits at lists.openembedded.org
Fri Dec 7 11:26:50 UTC 2007
merge of '105955293719b2a1414f1b03af410b8ff8dbdb1b'
and 'e94fdfc4cfd1145195d512ee0bbf48e1ecaa41be'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 7444d12b1f1d463507de1ebfd203527718c89cfa
ViewMTN: http://monotone.openembedded.org/revision/info/7444d12b1f1d463507de1ebfd203527718c89cfa
Files:
1
classes/package_ipk.bbclass
conf/sanity.conf
conf/distro/angstrom-2007.1.conf
Diffs:
#
# mt diff -r105955293719b2a1414f1b03af410b8ff8dbdb1b -r7444d12b1f1d463507de1ebfd203527718c89cfa
#
#
#
# patch "classes/package_ipk.bbclass"
# from [233f2e97aea453bf7350e317d172d0844ece5397]
# to [fdf9fdf2855198b24b017026dd3777995b2977d2]
#
# patch "conf/sanity.conf"
# from [9ad5f1d9953217df59e03a3c6727b8246f383334]
# to [0ca4f223707a3e2792c4eb0b4ab4ada4461ee385]
#
============================================================
--- classes/package_ipk.bbclass 233f2e97aea453bf7350e317d172d0844ece5397
+++ classes/package_ipk.bbclass fdf9fdf2855198b24b017026dd3777995b2977d2
@@ -32,7 +32,7 @@ python package_ipk_install () {
# Generate ipk.conf if it or the stamp doesnt exist
conffile = os.path.join(stagingdir,"ipkg.conf")
- if not os.access(conffile, os.R_OK):
+ if not os.access(conffile, os.R_OK):
ipkg_archs = bb.data.getVar('PACKAGE_ARCHS',d)
if ipkg_archs is None:
bb.error("PACKAGE_ARCHS missing")
@@ -114,7 +114,7 @@ python do_package_ipk () {
}
python do_package_ipk () {
- import sys, re, fcntl, copy
+ import sys, re, copy
workdir = bb.data.getVar('WORKDIR', d, 1)
if not workdir:
@@ -127,10 +127,6 @@ python do_package_ipk () {
bb.error("DEPLOY_DIR_IPK not defined, unable to package")
return
- arch = bb.data.getVar('PACKAGE_ARCH', d, 1)
- outdir = "%s/%s" % (outdir, arch)
- bb.mkdirhier(outdir)
-
dvar = bb.data.getVar('D', d, 1)
if not dvar:
bb.error("D not defined, unable to package")
@@ -151,20 +147,12 @@ python do_package_ipk () {
bb.debug(1, "No packages; nothing to do")
return
- def lockfile(name):
- lf = open(name, "a+")
- fcntl.flock(lf.fileno(), fcntl.LOCK_EX)
- return lf
-
- def unlockfile(lf):
- fcntl.flock(lf.fileno(), fcntl.LOCK_UN)
- lf.close
-
for pkg in packages.split():
localdata = bb.data.createCopy(d)
- root = "%s/install/%s" % (workdir, pkg)
+ pkgdest = bb.data.getVar('PKGDEST', d, 1)
+ root = "%s/%s" % (pkgdest, pkg)
- lf = lockfile(root + ".lock")
+ lf = bb.utils.lockfile(root + ".lock")
bb.data.setVar('ROOT', '', localdata)
bb.data.setVar('ROOT_%s' % pkg, root, localdata)
@@ -181,7 +169,8 @@ python do_package_ipk () {
bb.data.update_data(localdata)
basedir = os.path.join(os.path.dirname(root))
- pkgoutdir = outdir
+ arch = bb.data.getVar('PACKAGE_ARCH', localdata, 1)
+ pkgoutdir = "%s/%s" % (outdir, arch)
bb.mkdirhier(pkgoutdir)
os.chdir(root)
from glob import glob
@@ -194,7 +183,7 @@ python do_package_ipk () {
if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
from bb import note
note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
- unlockfile(lf)
+ bb.utils.unlockfile(lf)
continue
controldir = os.path.join(root, 'CONTROL')
@@ -202,6 +191,7 @@ python do_package_ipk () {
try:
ctrlfile = file(os.path.join(controldir, 'control'), 'w')
except OSError:
+ bb.utils.unlockfile(lf)
raise bb.build.FuncFailed("unable to open control file for writing.")
fields = []
@@ -235,6 +225,7 @@ python do_package_ipk () {
except KeyError:
(type, value, traceback) = sys.exc_info()
ctrlfile.close()
+ bb.utils.unlockfile(lf)
raise bb.build.FuncFailed("Missing field for ipk generation: %s" % value)
# more fields
@@ -271,6 +262,7 @@ python do_package_ipk () {
try:
scriptfile = file(os.path.join(controldir, script), 'w')
except OSError:
+ bb.utils.unlockfile(lf)
raise bb.build.FuncFailed("unable to open %s script file for writing." % script)
scriptfile.write(scriptvar)
scriptfile.close()
@@ -281,6 +273,7 @@ python do_package_ipk () {
try:
conffiles = file(os.path.join(controldir, 'conffiles'), 'w')
except OSError:
+ bb.utils.unlockfile(lf)
raise bb.build.FuncFailed("unable to open conffiles for writing.")
for f in conffiles_str.split():
conffiles.write('%s\n' % f)
@@ -290,6 +283,7 @@ python do_package_ipk () {
ret = os.system("PATH=\"%s\" %s %s %s" % (bb.data.getVar("PATH", localdata, 1),
bb.data.getVar("IPKGBUILDCMD",d,1), pkg, pkgoutdir))
if ret != 0:
+ bb.utils.unlockfile(lf)
raise bb.build.FuncFailed("ipkg-build execution failed")
for script in ["preinst", "postinst", "prerm", "postrm", "control" ]:
@@ -302,13 +296,16 @@ python do_package_ipk () {
os.rmdir(controldir)
except OSError:
pass
- unlockfile(lf)
+ bb.utils.unlockfile(lf)
}
python () {
import bb
if bb.data.getVar('PACKAGES', d, True) != '':
- bb.data.setVarFlag('do_package_write_ipk', 'depends', 'ipkg-utils-native:do_populate_staging fakeroot-native:do_populate_staging', d)
+ deps = (bb.data.getVarFlag('do_package_write_ipk', 'depends', d) or "").split()
+ deps.append('ipkg-utils-native:do_populate_staging')
+ deps.append('fakeroot-native:do_populate_staging')
+ bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d)
}
python do_package_write_ipk () {
============================================================
--- conf/sanity.conf 9ad5f1d9953217df59e03a3c6727b8246f383334
+++ conf/sanity.conf 0ca4f223707a3e2792c4eb0b4ab4ada4461ee385
@@ -1,8 +1,8 @@
# Sanity checks for common user misconfigurations
#
# See sanity.bbclass
#
# Expert users can confirm their sanity with "touch conf/sanity.conf"
-BB_MIN_VERSION = "1.8.8"
+BB_MIN_VERSION = "1.8.9"
INHERIT += "sanity"
#
# mt diff -re94fdfc4cfd1145195d512ee0bbf48e1ecaa41be -r7444d12b1f1d463507de1ebfd203527718c89cfa
#
#
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [a59b4bdff5fea83e852628a968abbeb155999248]
# to [781a9a9775be71ff7f91c9abe1fb7a8c7af4b061]
#
============================================================
--- conf/distro/angstrom-2007.1.conf a59b4bdff5fea83e852628a968abbeb155999248
+++ conf/distro/angstrom-2007.1.conf 781a9a9775be71ff7f91c9abe1fb7a8c7af4b061
@@ -237,7 +237,7 @@ DISTRO_EXTRA_RDEPENDS += "\
update-modules \
${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \
angstrom-version \
- ipkg ipkg-collateral angstrom-feed-configs \
+ ipkg ipkg-collateral ${ANGSTROM_FEED_CONFIGS} \
util-linux-mount util-linux-umount \
${EXTRA_STUFF} \
${DEBUG_APPS} \
More information about the Openembedded-commits
mailing list