sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

classes: Sync various tweaks from OE 

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2643 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie 2007-09-01 23:49:12 +00:00
parent 8d342dc056
commit 63b739f0fe
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/classes/image.bbclass
View File

@ -75,7 +75,6 @@ fakeroot do_rootfs () {
mkdir -p ${IMAGE_ROOTFS}
if [ "${USE_DEVFS}" != "1" ]; then
mkdir -p ${IMAGE_ROOTFS}/dev
for devtable in ${@get_devtable_list(d)}; do
makedevs -r ${IMAGE_ROOTFS} -D $devtable
done

3
meta/classes/package_deb.bbclass
View File

@ -136,7 +136,7 @@ python do_package_deb () {
del g[g.index('./DEBIAN')]
except ValueError:
pass
if not g and not bb.data.getVar('ALLOW_EMPTY', localdata):
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)
@ -253,7 +253,6 @@ python do_package_deb () {
os.rmdir(controldir)
except OSError:
pass
del localdata
unlockfile(lf)
}

6
meta/classes/package_ipk.bbclass
View File

@ -152,7 +152,7 @@ python do_package_ipk () {
localdata = bb.data.createCopy(d)
root = "%s/install/%s" % (workdir, pkg)
lf = lockfile(root + ".lock")
lf = lockfile(root + ".lock")
bb.data.setVar('ROOT', '', localdata)
bb.data.setVar('ROOT_%s' % pkg, root, localdata)
@ -179,11 +179,12 @@ python do_package_ipk () {
del g[g.index('./CONTROL')]
except ValueError:
pass
if not g and not bb.data.getVar('ALLOW_EMPTY', localdata):
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)
continue
controldir = os.path.join(root, 'CONTROL')
bb.mkdirhier(controldir)
try:
@ -289,7 +290,6 @@ python do_package_ipk () {
os.rmdir(controldir)
except OSError:
pass
del localdata
unlockfile(lf)
}

14
meta/classes/rootfs_ipk.bbclass
View File

@ -19,11 +19,15 @@ fakeroot rootfs_ipk_do_rootfs () {
mkdir -p ${T}
ipkg-cl ${IPKG_ARGS} update
if [ ! -z "${LINGUAS_INSTALL}" ]; then
ipkg-cl ${IPKG_ARGS} install glibc-localedata-i18n
for i in ${LINGUAS_INSTALL}; do
ipkg-cl ${IPKG_ARGS} install $i
done
# Uclibc builds don't provide this stuff...
if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then
if [ ! -z "${LINGUAS_INSTALL}" ]; then
ipkg-cl ${IPKG_ARGS} install glibc-localedata-i18n
for i in ${LINGUAS_INSTALL}; do
ipkg-cl ${IPKG_ARGS} install $i
done
fi
fi
if [ ! -z "${PACKAGE_INSTALL}" ]; then
ipkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL}