summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-09-01 23:49:12 +0000
committerRichard Purdie <richard@openedhand.com>2007-09-01 23:49:12 +0000
commit63b739f0fe03873402731f0cf9992551540c16df (patch)
treefa3f2ef3988648402d2bdacaa72aab73f29a2f77 /meta/classes
parent8d342dc0569fb4274b8ac9dfe40b1ce8543799f4 (diff)
downloadpoky-63b739f0fe03873402731f0cf9992551540c16df.tar.gz
classes: Sync various tweaks from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2643 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image.bbclass1
-rw-r--r--meta/classes/package_deb.bbclass3
-rw-r--r--meta/classes/package_ipk.bbclass6
-rw-r--r--meta/classes/rootfs_ipk.bbclass14
4 files changed, 13 insertions, 11 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index dbbdee3686..40402921cf 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -75,7 +75,6 @@ fakeroot do_rootfs () {
75 mkdir -p ${IMAGE_ROOTFS} 75 mkdir -p ${IMAGE_ROOTFS}
76 76
77 if [ "${USE_DEVFS}" != "1" ]; then 77 if [ "${USE_DEVFS}" != "1" ]; then
78 mkdir -p ${IMAGE_ROOTFS}/dev
79 for devtable in ${@get_devtable_list(d)}; do 78 for devtable in ${@get_devtable_list(d)}; do
80 makedevs -r ${IMAGE_ROOTFS} -D $devtable 79 makedevs -r ${IMAGE_ROOTFS} -D $devtable
81 done 80 done
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 550436a5eb..2ab537f174 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -136,7 +136,7 @@ python do_package_deb () {
136 del g[g.index('./DEBIAN')] 136 del g[g.index('./DEBIAN')]
137 except ValueError: 137 except ValueError:
138 pass 138 pass
139 if not g and not bb.data.getVar('ALLOW_EMPTY', localdata): 139 if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
140 from bb import note 140 from bb import note
141 note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1))) 141 note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
142 unlockfile(lf) 142 unlockfile(lf)
@@ -253,7 +253,6 @@ python do_package_deb () {
253 os.rmdir(controldir) 253 os.rmdir(controldir)
254 except OSError: 254 except OSError:
255 pass 255 pass
256 del localdata
257 256
258 unlockfile(lf) 257 unlockfile(lf)
259} 258}
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 1175d1e751..9e654aac5e 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -152,7 +152,7 @@ python do_package_ipk () {
152 localdata = bb.data.createCopy(d) 152 localdata = bb.data.createCopy(d)
153 root = "%s/install/%s" % (workdir, pkg) 153 root = "%s/install/%s" % (workdir, pkg)
154 154
155 lf = lockfile(root + ".lock") 155 lf = lockfile(root + ".lock")
156 156
157 bb.data.setVar('ROOT', '', localdata) 157 bb.data.setVar('ROOT', '', localdata)
158 bb.data.setVar('ROOT_%s' % pkg, root, localdata) 158 bb.data.setVar('ROOT_%s' % pkg, root, localdata)
@@ -179,11 +179,12 @@ python do_package_ipk () {
179 del g[g.index('./CONTROL')] 179 del g[g.index('./CONTROL')]
180 except ValueError: 180 except ValueError:
181 pass 181 pass
182 if not g and not bb.data.getVar('ALLOW_EMPTY', localdata): 182 if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
183 from bb import note 183 from bb import note
184 note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1))) 184 note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
185 unlockfile(lf) 185 unlockfile(lf)
186 continue 186 continue
187
187 controldir = os.path.join(root, 'CONTROL') 188 controldir = os.path.join(root, 'CONTROL')
188 bb.mkdirhier(controldir) 189 bb.mkdirhier(controldir)
189 try: 190 try:
@@ -289,7 +290,6 @@ python do_package_ipk () {
289 os.rmdir(controldir) 290 os.rmdir(controldir)
290 except OSError: 291 except OSError:
291 pass 292 pass
292 del localdata
293 unlockfile(lf) 293 unlockfile(lf)
294} 294}
295 295
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 3c9d03f9dd..50df68c76f 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -19,11 +19,15 @@ fakeroot rootfs_ipk_do_rootfs () {
19 mkdir -p ${T} 19 mkdir -p ${T}
20 20
21 ipkg-cl ${IPKG_ARGS} update 21 ipkg-cl ${IPKG_ARGS} update
22 if [ ! -z "${LINGUAS_INSTALL}" ]; then 22
23 ipkg-cl ${IPKG_ARGS} install glibc-localedata-i18n 23 # Uclibc builds don't provide this stuff...
24 for i in ${LINGUAS_INSTALL}; do 24 if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then
25 ipkg-cl ${IPKG_ARGS} install $i 25 if [ ! -z "${LINGUAS_INSTALL}" ]; then
26 done 26 ipkg-cl ${IPKG_ARGS} install glibc-localedata-i18n
27 for i in ${LINGUAS_INSTALL}; do
28 ipkg-cl ${IPKG_ARGS} install $i
29 done
30 fi
27 fi 31 fi
28 if [ ! -z "${PACKAGE_INSTALL}" ]; then 32 if [ ! -z "${PACKAGE_INSTALL}" ]; then
29 ipkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL} 33 ipkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL}