[oe-commits] org.oe.dev merge of '209ccafa5a29dc4d6ec16bbb89bfd465904ce377'
rpurdie commit
openembedded-commits at lists.openembedded.org
Tue Sep 4 09:04:41 UTC 2007
merge of '209ccafa5a29dc4d6ec16bbb89bfd465904ce377'
and '6e5c49eb75135e003132c12690930ce3bd10298f'
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 72c178b1440b044fcf6acdbb1cd21921f80d5b9b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=72c178b1440b044fcf6acdbb1cd21921f80d5b9b
Files:
1
packages/madwifi/madwifi-ng_r2702-20070903.bb
packages/maemo3/hildon-1
packages/maemo3/hildon-1/buttonbox.patch
packages/maemo3/hildon-1_svn.bb
classes/base.bbclass
classes/debian.bbclass
classes/multimachine.bbclass
classes/openmoko2.bbclass
classes/package.bbclass
classes/package_deb.bbclass
classes/package_ipk.bbclass
classes/package_rpm.bbclass
classes/package_tar.bbclass
classes/rm_work.bbclass
classes/rootfs_deb.bbclass
classes/rootfs_ipk.bbclass
conf/bitbake.conf
conf/sanity.conf
packages/dfu-util/dfu-util_svn.bb
packages/ezx/opentapi_svn.bb
packages/gnuradio/gnuradio_svn.bb
packages/gsm/libgsmd_svn.bb
packages/gtk-webcore/osb-browser_svn.bb
packages/gtk-webcore/osb-jscore_svn.bb
packages/gtk-webcore/osb-nrcit_svn.bb
packages/gtk-webcore/osb-nrcore_svn.bb
packages/maemo3/libosso_1.20.bb
packages/openmoko-apps/openmoko-appmanager_svn.bb
packages/openmoko-apps/openmoko-calculator_svn.bb
packages/openmoko-apps/openmoko-dialer_svn.bb
packages/openmoko-apps/openmoko-footer_svn.bb
packages/openmoko-apps/openmoko-messages_svn.bb
packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
packages/openmoko-apps/openmoko-taskmanager_svn.bb
packages/openmoko-base/openmoko-common_svn.bb
packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
packages/openmoko-base/openmoko-libs_svn.bb
packages/openmoko-base/openmoko-session_svn.bb
packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb
packages/openmoko-base/openmoko-theme-standard_svn.bb
packages/openmoko-examples/openmoko-finger-demo_svn.bb
packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb
packages/openmoko-examples/openmoko-panel-demo_svn.bb
packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb
packages/openmoko-examples/openmoko-stylus-demo_svn.bb
packages/openmoko-inputmethods/openmoko-keyboard_svn.bb
packages/openmoko-pim/openmoko-contacts_svn.bb
packages/openmoko-pim/openmoko-dates_svn.bb
packages/openmoko-pim/openmoko-tasks_svn.bb
packages/openmoko-pim/openmoko-today_svn.bb
packages/scummvm/scummvm.inc
packages/uclibc/uclibc_svn.bb
packages/webkit/webkit-gtk_svn.bb
Diffs:
#
# mt diff -r209ccafa5a29dc4d6ec16bbb89bfd465904ce377 -r72c178b1440b044fcf6acdbb1cd21921f80d5b9b
#
#
#
# add_file "packages/madwifi/madwifi-ng_r2702-20070903.bb"
# content [c1a3090f2306173ae94202b7e71f996c56c9a7f4]
#
============================================================
--- packages/madwifi/madwifi-ng_r2702-20070903.bb c1a3090f2306173ae94202b7e71f996c56c9a7f4
+++ packages/madwifi/madwifi-ng_r2702-20070903.bb c1a3090f2306173ae94202b7e71f996c56c9a7f4
@@ -0,0 +1,14 @@
+# Bitbake recipe for the madwifi-ng driver
+
+# Don't use this unless you know what you're doing -- this version does
+# *NOT* build on BE kernels.
+DEFAULT_PREFERENCE = "-1"
+
+# Disable stripping of kernel modules, since this action strips too
+# much out, and the resulting module won't load.
+INHIBIT_PACKAGE_STRIP = "1"
+
+require madwifi-ng_r.inc
+
+# PR set after the include, to override what's set in the included file.
+PR = "r0"
#
# mt diff -r6e5c49eb75135e003132c12690930ce3bd10298f -r72c178b1440b044fcf6acdbb1cd21921f80d5b9b
#
#
#
# add_dir "packages/maemo3/hildon-1"
#
# add_file "packages/maemo3/hildon-1/buttonbox.patch"
# content [77e17222c21ae3e801e2ad5650c6181234ef32ae]
#
# add_file "packages/maemo3/hildon-1_svn.bb"
# content [a3c930f472ff7778ca8ec08ae57d1087310b54d3]
#
# patch "classes/base.bbclass"
# from [372ea5a35ab3fd0e2d7d37ea1bb72d4d9e69a041]
# to [d0d8cdb0b25aaa62b66b99e71e401912b449c593]
#
# patch "classes/debian.bbclass"
# from [0314e5e02b030c0b609710095a3d82e11a7a713a]
# to [3faf23c6fd98ff2bd435268edd5e503953d4eef5]
#
# patch "classes/multimachine.bbclass"
# from [a237dbcaf9325ca862cbf52d3bb70f3314591e1d]
# to [b825fe152383c51713a009221a6fa34f71baf94b]
#
# patch "classes/openmoko2.bbclass"
# from [aeee18267ff406fd5434a5b0cfc049c370d20948]
# to [29f242d782fea5f73f4bdfee2121a66a5c13c4b9]
#
# patch "classes/package.bbclass"
# from [8214219f4cf766c4e5f3298b107e9215fe944e47]
# to [133959252573ef8846b3b217a8fc0a1245d0233f]
#
# patch "classes/package_deb.bbclass"
# from [73842f1df6176a56ec4f8018d2d98ca667df785f]
# to [a9e3536edbfc3c7688cdfdf6eb31098a6756cb91]
#
# patch "classes/package_ipk.bbclass"
# from [1872f53596730bd9e157720baf9341c875d2bc44]
# to [89bc8829d8e01336d5c7388a5fa756a042940a40]
#
# patch "classes/package_rpm.bbclass"
# from [bb81b0ca13339c5590f4287cb163cfd408618bab]
# to [544d06eecdf8053fd26fb5ad0149bf70d704de12]
#
# patch "classes/package_tar.bbclass"
# from [3b2206e771dcb118314fab5af6570042df83f633]
# to [cb0aff337888acb90332c226a3b5ba7c508f5190]
#
# patch "classes/rm_work.bbclass"
# from [ee47e8ab4e8989bafbb4ab34525d27fa9ea12103]
# to [e7bd77dd0dc1cf9bd9e2b63fb4bbb5351e7b1ebe]
#
# patch "classes/rootfs_deb.bbclass"
# from [721dd852a06abb344a5af38514cf89deeaa73f78]
# to [58bcec513e02215254895fcca453dfb26ab4d111]
#
# patch "classes/rootfs_ipk.bbclass"
# from [c9bd969ffbc28a671b048b88d67a776b1b7fc57e]
# to [0a6a677036faf7c5f940acbb04357cb21c26a3fc]
#
# patch "conf/bitbake.conf"
# from [d345b97ed205e335f85c0528040d80119f07236d]
# to [27f28821d89de0f8fab490644ac698eedc27f811]
#
# patch "conf/sanity.conf"
# from [0c7bde35788c8bef29a1bb5effc41bf31f6ec14a]
# to [9ad5f1d9953217df59e03a3c6727b8246f383334]
#
# patch "packages/dfu-util/dfu-util_svn.bb"
# from [91a2d202807c65780d73db9a9ff2d1d73d4d2127]
# to [cf6a45fe99370f4938bed1dbc2ca7123380f8322]
#
# patch "packages/ezx/opentapi_svn.bb"
# from [61bf0e19ae3a64b21cfc9338ee4d8cc7d07513f8]
# to [dee0ed6cee403f8c6e8f8b389f89a3390ea9122e]
#
# patch "packages/gnuradio/gnuradio_svn.bb"
# from [a884e96d58dc5d6fe78c3e176d52eb47219c0d69]
# to [60afef07fd78cf20eec7eaec38e79318fa6ec205]
#
# patch "packages/gsm/libgsmd_svn.bb"
# from [e45be6172fbb275631f81e60264fcdf723f81df1]
# to [2a8eaeac4025570622a8d2e31183b60094c23103]
#
# patch "packages/gtk-webcore/osb-browser_svn.bb"
# from [29ac825dc90c89d49c0efdadf6420e5b765422ef]
# to [a4aaa87e84fa4a445154cd52d8091f3f8bb46963]
#
# patch "packages/gtk-webcore/osb-jscore_svn.bb"
# from [647f258f28e238e3cbe16c6f7b00a323422919a4]
# to [b9e84c178b8314578103df9fe9f70faa86e25b62]
#
# patch "packages/gtk-webcore/osb-nrcit_svn.bb"
# from [a010ace04d4211000bc9397b8e218f21bf8ee1f0]
# to [d2946241f9a427b0631ba309b8c8408ff33bebf7]
#
# patch "packages/gtk-webcore/osb-nrcore_svn.bb"
# from [43f8b003f6e8e794c4d18e39398404ddccf10a78]
# to [8a2e36e22d6546437b3ebec3bc6df6aa17c82174]
#
# patch "packages/maemo3/libosso_1.20.bb"
# from [6d012753b73e537d4bb913dd5b217695cc6802a0]
# to [69fc7761255ea98056e60c85e95af817d36b90da]
#
# patch "packages/openmoko-apps/openmoko-appmanager_svn.bb"
# from [aed7dc523849ff416897598584ebec6f172d98dd]
# to [5e6d715079d83613ab230ef19f83d501ebc43004]
#
# patch "packages/openmoko-apps/openmoko-calculator_svn.bb"
# from [337cc4cd117cefda5d1110edcb0ff572ffdda2ca]
# to [b579fbd038db97a450bbf66faf89779538e6a278]
#
# patch "packages/openmoko-apps/openmoko-dialer_svn.bb"
# from [b9f5872a90527e8cf637798e92fcf82f330da2de]
# to [9f8a070f3af5fb313e63346a23e14692bb9c7b07]
#
# patch "packages/openmoko-apps/openmoko-footer_svn.bb"
# from [e29041be4629c3921d594f8acea51216739c13d9]
# to [9e3b5f9ae56e272cfff7bc1e4a420777c6976284]
#
# patch "packages/openmoko-apps/openmoko-messages_svn.bb"
# from [73dae0cee4d854f19c854e4d32d11d0c0f75a692]
# to [b9f8d5d6dd6a67caf795f0db243fa966c57ab839]
#
# patch "packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb"
# from [ff7b2b131312b8895dac7806dd21916a3223a45a]
# to [947e2b664eed5bf5c4dc16c44945f66faef5fb4b]
#
# patch "packages/openmoko-apps/openmoko-taskmanager_svn.bb"
# from [d8663882b7da29e87322a252eba559ca6152bc4d]
# to [eff7e785aaa7343573839bc227a49621159f83d7]
#
# patch "packages/openmoko-base/openmoko-common_svn.bb"
# from [b6ea4c8929e3ea38891217c094d4a5967472e5ba]
# to [141ffd3c48b36875114a53bead66224d8ce28eec]
#
# patch "packages/openmoko-base/openmoko-icon-theme-standard_svn.bb"
# from [80697dbfe450a8f2d4047ec78dde405e797d5a57]
# to [b4be36048fc6fbe8531c236e1e19af9f0a187b4b]
#
# patch "packages/openmoko-base/openmoko-libs_svn.bb"
# from [adf0ca211a78e2352a7a4ba89dc18d49eb8f2ee7]
# to [15b2f1a5d97278cb60ede86dc82e857220a8b592]
#
# patch "packages/openmoko-base/openmoko-session_svn.bb"
# from [718fa6627900d5dca4f892c41ae12c3e48cc8ff2]
# to [6fd1baa1a8268be5e1e6e5524b9a1e79c3141d47]
#
# patch "packages/openmoko-base/openmoko-sound-theme-standard_svn.bb"
# from [6e57e9b6ea74759e04f0c76d6855305a93ded158]
# to [ffdd2c4eb73a274c31f10be81ceaea91f36b1bf0]
#
# patch "packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb"
# from [98797e9e5d5270e9375a56ce3fa90b4d485e0ac1]
# to [73aeddafad060a27d192b9653cfcaf0c1eb1e033]
#
# patch "packages/openmoko-base/openmoko-theme-standard_svn.bb"
# from [ff0592bad5222f7d71a955c7e1708a1a5f1d9909]
# to [d66444399cbbdcacfa20fbc1456b25ad287391e9]
#
# patch "packages/openmoko-examples/openmoko-finger-demo_svn.bb"
# from [7fde8b1952e5cd3150a106e426e2f45764e9594e]
# to [1b779d819838359e07883d366836c669e5294e86]
#
# patch "packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb"
# from [2d60cf28c5326b2da682e0f38625b5dc084b34fd]
# to [98762ebc1fdc8b3ab903d9b13d01260a63251758]
#
# patch "packages/openmoko-examples/openmoko-panel-demo_svn.bb"
# from [246ff616a9518e5b714cadf764f0a86ae04d8c66]
# to [ceee50ff97caf7e0bb9fa38acba1b3ec78c007b4]
#
# patch "packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb"
# from [64a2f2173170f02e3aac60b943545e104717e5bf]
# to [13187c40952969a502dfeb7d624bdfeec06f76f1]
#
# patch "packages/openmoko-examples/openmoko-stylus-demo_svn.bb"
# from [1ece7b32635e5fec1a6b31a53e4b4b517b39520b]
# to [f0fc154d0822ca21eb95d9d63da2b4a83b983378]
#
# patch "packages/openmoko-inputmethods/openmoko-keyboard_svn.bb"
# from [d907df3d45fbb7c7c83f72701cc0512eed2cfc7e]
# to [be568d37fb09c09d3d344537a0058bc8c8d1d4a4]
#
# patch "packages/openmoko-pim/openmoko-contacts_svn.bb"
# from [3e82b9ec53a6c844d48cdc18665d66daa0e2dab3]
# to [8fff8b2ab4dce4984883f8bac9bebe4cdaa7cd3e]
#
# patch "packages/openmoko-pim/openmoko-dates_svn.bb"
# from [bfc63108e3dc559f00f3a76883668682fdd583c0]
# to [e07494a2099214592b089a9dd799caf49d1da5d9]
#
# patch "packages/openmoko-pim/openmoko-tasks_svn.bb"
# from [9c4d4168ec79558e95869d4094bbb093beb1bf0e]
# to [e0adb0cc92edbf6039e876cf02646a8e4a1a7189]
#
# patch "packages/openmoko-pim/openmoko-today_svn.bb"
# from [df476ab7fc344063de78fe6a654104181e61337e]
# to [ab51a2b8ddc55babadc903a495d2250120c0c2de]
#
# patch "packages/scummvm/scummvm.inc"
# from [cef002bae21f245d788d417975ddee8d243d249f]
# to [ecde5b023a1702e049927d1b5a4b7d2adb7e3d82]
#
# patch "packages/uclibc/uclibc_svn.bb"
# from [92cb851f710f300b1521589a72e241b2b21569ad]
# to [224dba45f3c9cfd8430a24a707222605c885e2fb]
#
# patch "packages/webkit/webkit-gtk_svn.bb"
# from [d4502d16a5835c6b6f743bd4033bb0c4d66e43de]
# to [d607d56e5fd24af74f8bb3cfdb8e04d0768202de]
#
============================================================
--- packages/maemo3/hildon-1/buttonbox.patch 77e17222c21ae3e801e2ad5650c6181234ef32ae
+++ packages/maemo3/hildon-1/buttonbox.patch 77e17222c21ae3e801e2ad5650c6181234ef32ae
@@ -0,0 +1,11 @@
+--- /tmp/hildon-code-dialog.c 2007-08-07 11:46:03.000000000 +0200
++++ hildon-1/src/hildon-code-dialog.c 2007-08-07 11:46:16.468400000 +0200
+@@ -277,7 +277,7 @@
+ gtk_container_add (GTK_CONTAINER (priv->buttons[3][2]), image1);
+ dialog_action_area1 = GTK_DIALOG (dialog)->action_area;
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1),
+- GTK_BUTTONBOX_CENTER);
++ GTK_BUTTONBOX_DEFAULT);
+
+ okButton = gtk_dialog_add_button (GTK_DIALOG (dialog) ,DEVICELOCK_OK,
+ GTK_RESPONSE_OK);
============================================================
--- packages/maemo3/hildon-1_svn.bb a3c930f472ff7778ca8ec08ae57d1087310b54d3
+++ packages/maemo3/hildon-1_svn.bb a3c930f472ff7778ca8ec08ae57d1087310b54d3
@@ -0,0 +1,20 @@
+DESCRIPTION = "Hildon widget library"
+LICENSE = "LGPL"
+
+DEPENDS = "gconf-dbus esound gtk+"
+
+PV = "1.0.12+svnr${SRCREV}"
+
+SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/trunk;module=hildon-1;proto=https \
+ file://buttonbox.patch;patch=1 "
+S = "${WORKDIR}/hildon-1"
+
+inherit autotools pkgconfig lib_package
+
+EXTRA_OECONF = "--with-maemo-gtk=no"
+
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- classes/base.bbclass 372ea5a35ab3fd0e2d7d37ea1bb72d4d9e69a041
+++ classes/base.bbclass d0d8cdb0b25aaa62b66b99e71e401912b449c593
@@ -374,6 +374,12 @@ oe_machinstall() {
fi
}
+# Remove and re-create ${D} so that is it guaranteed to be empty
+do_install_prepend() {
+ rm -rf ${D}
+ mkdir -p ${D}
+}
+
addtask listtasks
do_listtasks[nostamp] = "1"
python do_listtasks() {
@@ -576,10 +582,6 @@ python base_do_unpack() {
local = bb.data.expand(bb.fetch.localpath(url, localdata), localdata)
except bb.MalformedUrl, e:
raise FuncFailed('Unable to generate local path for malformed uri: %s' % e)
- # dont need any parameters for extraction, strip them off
- # RP: Insane. localpath shouldn't have parameters
- # RP: Scehdule for removal with bitbake 1.8.8
- local = re.sub(';.*$', '', local)
local = os.path.realpath(local)
ret = oe_unpack_file(local, localdata, url)
if not ret:
@@ -871,14 +873,6 @@ python () {
base_after_parse(d)
}
-# Remove me when we switch to bitbake 1.8.8
-def base_get_srcrev(d):
- import bb
-
- if hasattr(bb.fetch, "get_srcrev"):
- return bb.fetch.get_srcrev(d)
- return "NOT IMPLEMENTED"
-
# Patch handling
inherit patch
============================================================
--- classes/debian.bbclass 0314e5e02b030c0b609710095a3d82e11a7a713a
+++ classes/debian.bbclass 3faf23c6fd98ff2bd435268edd5e503953d4eef5
@@ -7,7 +7,10 @@ STAGING_PKGMAPS_DIR = "${STAGING_DIR}/pk
#
# Better expressed as ensure all RDEPENDS package before we package
# This means we can't have circular RDEPENDS/RRECOMMENDS
-do_package_write[rdeptask] = "do_package"
+do_package_write_ipk[rdeptask] = "do_package"
+do_package_write_deb[rdeptask] = "do_package"
+do_package_write_tar[rdeptask] = "do_package"
+do_package_write_rpm[rdeptask] = "do_package"
python debian_package_name_hook () {
import glob, copy, stat, errno, re
============================================================
--- classes/multimachine.bbclass a237dbcaf9325ca862cbf52d3bb70f3314591e1d
+++ classes/multimachine.bbclass b825fe152383c51713a009221a6fa34f71baf94b
@@ -1,9 +1,7 @@ STAGING_KERNEL_DIR = "${STAGING_DIR}/${M
STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}"
WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}"
STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel"
-# Enable me to fix pkgdata problems with multimachine
-# Requires all install tasks to rerun (wipe all install stamps from tmp/stamps/
-#PKGDATA_DIR = "${STAGING_DIR}/pkgdata/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+PKGDATA_DIR = "${STAGING_DIR}/pkgdata/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
# Find any machine specific sub packages and if present, mark the
# whole package as machine specific for multimachine purposes.
============================================================
--- classes/openmoko2.bbclass aeee18267ff406fd5434a5b0cfc049c370d20948
+++ classes/openmoko2.bbclass 29f242d782fea5f73f4bdfee2121a66a5c13c4b9
@@ -29,5 +29,5 @@ FILES_${PN} += "${datadir}/icons"
FILES_${PN} += "${datadir}/icons"
+SVNREV = "r${SRCREV}"
+#SVNREV = "${SRCDATE}"
-# SVNREV = "r${SRCREV}"
-SVNREV = "${SRCDATE}"
============================================================
--- classes/package.bbclass 8214219f4cf766c4e5f3298b107e9215fe944e47
+++ classes/package.bbclass 133959252573ef8846b3b217a8fc0a1245d0233f
@@ -1,7 +1,9 @@
#
# General packaging help functions
#
+PKGDEST = "${WORKDIR}/install"
+
def legitimize_package_name(s):
"""
Make sure package names are legitimate strings
@@ -120,18 +122,12 @@ python () {
python () {
import bb
-
if bb.data.getVar('PACKAGES', d, True) != '':
deps = bb.data.getVarFlag('do_package', 'depends', d) or ""
for dep in (bb.data.getVar('PACKAGE_DEPENDS', d, True) or "").split():
deps += " %s:do_populate_staging" % dep
bb.data.setVarFlag('do_package', 'depends', deps, d)
- deps = bb.data.getVarFlag('do_package_write', 'depends', d) or ""
- for dep in (bb.data.getVar('PACKAGE_EXTRA_DEPENDS', d, True) or "").split():
- deps += " %s:do_populate_staging" % dep
- bb.data.setVarFlag('do_package_write', 'depends', deps, d)
-
# shlibs requires any DEPENDS to have already packaged for the *.list files
bb.data.setVarFlag('do_package', 'deptask', 'do_package', d)
}
@@ -380,25 +376,21 @@ python populate_packages () {
if not os.path.islink(file) and not os.path.isdir(file) and isexec(file):
runstrip(file, d)
+ pkgdest = bb.data.getVar('PKGDEST', d, 1)
+ os.system('rm -rf %s' % pkgdest)
+
for pkg in package_list:
localdata = bb.data.createCopy(d)
- root = os.path.join(workdir, "install", pkg)
+ root = os.path.join(pkgdest, pkg)
+ bb.mkdirhier(root)
- os.system('rm -rf %s' % root)
-
- bb.data.setVar('ROOT', '', localdata)
- bb.data.setVar('ROOT_%s' % pkg, root, localdata)
bb.data.setVar('PKG', pkg, localdata)
-
overrides = bb.data.getVar('OVERRIDES', localdata, 1)
if not overrides:
raise bb.build.FuncFailed('OVERRIDES not defined')
- bb.data.setVar('OVERRIDES', overrides+':'+pkg, localdata)
-
+ bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
bb.data.update_data(localdata)
- root = bb.data.getVar('ROOT', localdata, 1)
- bb.mkdirhier(root)
filesvar = bb.data.getVar('FILES', localdata, 1) or ""
files = filesvar.split()
for file in files:
@@ -451,7 +443,7 @@ python populate_packages () {
for pkg in package_list:
dangling_links[pkg] = []
pkg_files[pkg] = []
- inst_root = os.path.join(workdir, "install", pkg)
+ inst_root = os.path.join(pkgdest, pkg)
for root, dirs, files in os.walk(inst_root):
for f in files:
path = os.path.join(root, f)
@@ -572,6 +564,8 @@ python package_do_shlibs() {
bb.error("TARGET_SYS not defined")
return
+ pkgdest = bb.data.getVar('PKGDEST', d, 1)
+
shlibs_dir = os.path.join(staging, target_sys, "shlibs")
old_shlibs_dir = os.path.join(staging, "shlibs")
bb.mkdirhier(shlibs_dir)
@@ -584,7 +578,7 @@ python package_do_shlibs() {
needed[pkg] = []
sonames = list()
- top = os.path.join(workdir, "install", pkg)
+ top = os.path.join(pkgdest, pkg)
for root, dirs, files in os.walk(top):
for file in files:
soname = None
@@ -670,7 +664,7 @@ python package_do_shlibs() {
else:
bb.note("Couldn't find shared library provider for %s" % n)
- deps_file = os.path.join(workdir, "install", pkg + ".shlibdeps")
+ deps_file = os.path.join(pkgdest, pkg + ".shlibdeps")
if os.path.exists(deps_file):
os.remove(deps_file)
if len(deps):
@@ -703,6 +697,8 @@ python package_do_pkgconfig () {
bb.error("TARGET_SYS not defined")
return
+ pkgdest = bb.data.getVar('PK%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list