* [RC Fixes 01/19] scripts/combo-layer: fix still overzealous regex in default hook script
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 9:39 ` [RC Fixes 02/19] deb packages support: switch from /var/dpkg to /var/lib/dpkg Saul Wold
` (18 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
In the previous fix to this hook script (OE core revision
e7aae45414e4597e9244f86a81fbc940f73785c8) a start-of-line (^) marker was
missed, so if a commit had no Signed-off-by line but it contained an
inner patch that did, the inner patch was modified causing a "corrupt
patch" error.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
scripts/combo-layer-hook-default.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/combo-layer-hook-default.sh b/scripts/combo-layer-hook-default.sh
index e535d5f..8b148ac 100755
--- a/scripts/combo-layer-hook-default.sh
+++ b/scripts/combo-layer-hook-default.sh
@@ -10,4 +10,4 @@ rev=$2
reponame=$3
sed -i -e "s#^Subject: \[PATCH\] \(.*\)#Subject: \[PATCH\] $reponame: \1#" $patchfile
-sed -i -e "0,/^Signed-off-by:/s#\(Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile
+sed -i -e "0,/^Signed-off-by:/s#\(^Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* [RC Fixes 02/19] deb packages support: switch from /var/dpkg to /var/lib/dpkg
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
2011-09-21 9:39 ` [RC Fixes 01/19] scripts/combo-layer: fix still overzealous regex in default hook script Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 9:39 ` [RC Fixes 03/19] libzypp: git repo moved to github Saul Wold
` (17 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
[YOCTO #1086]
The pach was backported from OE:
http://git.openembedded.net/cgit.cgi/openembedded/commit/?id=41e0fbf792037f249d1b8d283b3de81718887c9f
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
meta/classes/package_deb.bbclass | 10 +++++-----
meta/classes/populate_sdk_deb.bbclass | 4 ++--
meta/classes/rootfs_deb.bbclass | 20 ++++++++++----------
meta/recipes-devtools/apt/apt-native_0.7.14.bb | 2 +-
meta/recipes-devtools/apt/apt_0.7.14.bb | 2 +-
meta/recipes-devtools/apt/files/apt.conf | 4 ++--
.../dpkg/run-postinsts/run-postinsts | 2 +-
.../dpkg/run-postinsts/run-postinsts.awk | 2 +-
meta/recipes-devtools/dpkg/run-postinsts_1.0.bb | 2 +-
.../update-alternatives-dpkg.inc | 6 +++---
10 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 5a32047..6733e64 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -135,11 +135,11 @@ package_install_internal_deb () {
export APT_CONFIG="${STAGING_ETCDIR_NATIVE}/apt/apt-${task}.conf"
- mkdir -p ${target_rootfs}/var/dpkg/info
- mkdir -p ${target_rootfs}/var/dpkg/updates
+ mkdir -p ${target_rootfs}/var/lib/dpkg/info
+ mkdir -p ${target_rootfs}/var/lib/dpkg/updates
- > ${target_rootfs}/var/dpkg/status
- > ${target_rootfs}/var/dpkg/available
+ > ${target_rootfs}/var/lib/dpkg/status
+ > ${target_rootfs}/var/lib/dpkg/available
apt-get update
@@ -179,7 +179,7 @@ package_install_internal_deb () {
done
# Mark all packages installed
- sed -i -e "s/Status: install ok unpacked/Status: install ok installed/;" ${target_rootfs}/var/dpkg/status
+ sed -i -e "s/Status: install ok unpacked/Status: install ok installed/;" ${target_rootfs}/var/lib/dpkg/status
}
deb_log_check() {
diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
index 2cff69e..be7b552 100644
--- a/meta/classes/populate_sdk_deb.bbclass
+++ b/meta/classes/populate_sdk_deb.bbclass
@@ -52,8 +52,8 @@ fakeroot populate_sdk_deb () {
populate_sdk_post_deb ${SDK_OUTPUT}/${SDKPATHNATIVE}
#move remainings
- install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}/var/dpkg
- mv ${SDK_OUTPUT}/var/dpkg/* ${SDK_OUTPUT}/${SDKPATHNATIVE}/var/dpkg
+ install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}/var/lib/dpkg
+ mv ${SDK_OUTPUT}/var/lib/dpkg/* ${SDK_OUTPUT}/${SDKPATHNATIVE}/var/lib/dpkg
rm -rf ${SDK_OUTPUT}/var
populate_sdk_log_check populate_sdk
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index e03e80b..bab8e1e 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -13,7 +13,7 @@ opkglibdir = "${localstatedir}/lib/opkg"
fakeroot rootfs_deb_do_rootfs () {
set +e
- mkdir -p ${IMAGE_ROOTFS}/var/dpkg/alternatives
+ mkdir -p ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives
# update index
package_update_index_deb
@@ -36,15 +36,15 @@ fakeroot rootfs_deb_do_rootfs () {
export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
_flag () {
- sed -i -e "/^Package: $2\$/{n; s/Status: install ok .*/Status: install ok $1/;}" ${IMAGE_ROOTFS}/var/dpkg/status
+ sed -i -e "/^Package: $2\$/{n; s/Status: install ok .*/Status: install ok $1/;}" ${IMAGE_ROOTFS}/var/lib/dpkg/status
}
_getflag () {
- cat ${IMAGE_ROOTFS}/var/dpkg/status | sed -n -e "/^Package: $2\$/{n; s/Status: install ok .*/$1/; p}"
+ cat ${IMAGE_ROOTFS}/var/lib/dpkg/status | sed -n -e "/^Package: $2\$/{n; s/Status: install ok .*/$1/; p}"
}
# Attempt to run preinsts
# Mark packages with preinst failures as unpacked
- for i in ${IMAGE_ROOTFS}/var/dpkg/info/*.preinst; do
+ for i in ${IMAGE_ROOTFS}/var/lib/dpkg/info/*.preinst; do
if [ -f $i ] && ! sh $i; then
_flag unpacked `basename $i .preinst`
fi
@@ -52,7 +52,7 @@ fakeroot rootfs_deb_do_rootfs () {
# Attempt to run postinsts
# Mark packages with postinst failures as unpacked
- for i in ${IMAGE_ROOTFS}/var/dpkg/info/*.postinst; do
+ for i in ${IMAGE_ROOTFS}/var/lib/dpkg/info/*.postinst; do
if [ -f $i ] && ! sh $i configure; then
_flag unpacked `basename $i .postinst`
fi
@@ -65,12 +65,12 @@ fakeroot rootfs_deb_do_rootfs () {
# Hacks to allow opkg's update-alternatives and opkg to coexist for now
mkdir -p ${IMAGE_ROOTFS}${opkglibdir}
- if [ -e ${IMAGE_ROOTFS}/var/dpkg/alternatives ]; then
- rmdir ${IMAGE_ROOTFS}/var/dpkg/alternatives
+ if [ -e ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives ]; then
+ rmdir ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives
fi
- ln -s ${opkglibdir}/alternatives ${IMAGE_ROOTFS}/var/dpkg/alternatives
- ln -s /var/dpkg/info ${IMAGE_ROOTFS}${opkglibdir}/info
- ln -s /var/dpkg/status ${IMAGE_ROOTFS}${opkglibdir}/status
+ ln -s ${opkglibdir}/alternatives ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives
+ ln -s /var/lib/dpkg/info ${IMAGE_ROOTFS}${opkglibdir}/info
+ ln -s /var/lib/dpkg/status ${IMAGE_ROOTFS}${opkglibdir}/status
${ROOTFS_POSTPROCESS_COMMAND}
diff --git a/meta/recipes-devtools/apt/apt-native_0.7.14.bb b/meta/recipes-devtools/apt/apt-native_0.7.14.bb
index b1bd55b..c82d606 100644
--- a/meta/recipes-devtools/apt/apt-native_0.7.14.bb
+++ b/meta/recipes-devtools/apt/apt-native_0.7.14.bb
@@ -1,6 +1,6 @@
require apt-native.inc
-PR = "r4"
+PR = "r5"
SRC_URI += "file://nodoc.patch \
file://noconfigure.patch \
diff --git a/meta/recipes-devtools/apt/apt_0.7.14.bb b/meta/recipes-devtools/apt/apt_0.7.14.bb
index 1335c16..93eebe9 100644
--- a/meta/recipes-devtools/apt/apt_0.7.14.bb
+++ b/meta/recipes-devtools/apt/apt_0.7.14.bb
@@ -3,7 +3,7 @@ RDEPENDS_${PN} = "dpkg"
LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
require apt.inc
-PR = "r7"
+PR = "r8"
SRC_URI += "file://nodoc.patch \
file://includes-fix.patch "
diff --git a/meta/recipes-devtools/apt/files/apt.conf b/meta/recipes-devtools/apt/files/apt.conf
index 5732137..ab7a5db 100644
--- a/meta/recipes-devtools/apt/files/apt.conf
+++ b/meta/recipes-devtools/apt/files/apt.conf
@@ -3,7 +3,7 @@ Dir "${STAGING_DIR_NATIVE}/"
State "var/lib/apt/"
{
Lists "lists/";
- status "#ROOTFS#/var/dpkg/status";
+ status "#ROOTFS#/var/lib/dpkg/status";
};
Cache "var/cache/apt/"
{
@@ -39,5 +39,5 @@ APT
};
};
-DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/dpkg";"--force-all";"--no-debsig"};
+DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/lib/dpkg";"--force-all";"--no-debsig"};
};
diff --git a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts
index f632d1c..584a92e 100755
--- a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts
+++ b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts
@@ -5,7 +5,7 @@
# Author: Richard Purdie <rpurdie@openedhand.com>
#
-PKGSYSTEM=/var/dpkg
+PKGSYSTEM=/var/lib/dpkg
if [ ! -e $PKGSYSTEM/status ]; then
if [ -e /usr/lib/opkg/status ]; then
diff --git a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk
index 09a1400..d92200b 100644
--- a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk
+++ b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk
@@ -9,7 +9,7 @@
BEGIN {
rc=system("test -d /usr/dpkg/info/")
if (rc==0)
- pkgdir="/var/dpkg/info"
+ pkgdir="/var/lib/dpkg/info"
else
pkgdir="/usr/lib/opkg/info"
package=""
diff --git a/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb b/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb
index f15243b..f8f3368 100644
--- a/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb
+++ b/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Run postinstall scripts on device using awk"
SECTION = "devel"
-PR = "r6"
+PR = "r7"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
index f7f9ae9..c881ae0 100644
--- a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
+++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
@@ -8,7 +8,7 @@ SECTION = "base"
SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2"
S = "${WORKDIR}/dpkg-${PV}"
PACKAGE_ARCH = "all"
-INC_PR = "r2"
+INC_PR = "r3"
inherit gettext
@@ -20,7 +20,7 @@ do_patch () {
s/^.*$/$D=$ENV{"D"} || ""\;/;
p;
x;
- s,^\$admindir=.*staging.*$,$admindir="$D${localstatedir}/dpkg"\;,;
+ s,^\$admindir=.*staging.*$,$admindir="$D${localstatedir}/lib/dpkg"\;,;
};
s,^\$altdir=.*$,$altdir="$D${sysconfdir}/alternatives"\;,;
p;' > ${S}/scripts/update-alternatives
@@ -28,7 +28,7 @@ do_patch () {
do_install () {
install -d ${D}${sbindir} \
- ${D}${localstatedir}/dpkg/alternatives \
+ ${D}${localstatedir}/lib/dpkg/alternatives \
${D}${sysconfdir}/alternatives
install -m 0755 scripts/update-alternatives ${D}${sbindir}/update-alternatives
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* [RC Fixes 03/19] libzypp: git repo moved to github
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
2011-09-21 9:39 ` [RC Fixes 01/19] scripts/combo-layer: fix still overzealous regex in default hook script Saul Wold
2011-09-21 9:39 ` [RC Fixes 02/19] deb packages support: switch from /var/dpkg to /var/lib/dpkg Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 9:39 ` [RC Fixes 04/19] sat-solver: " Saul Wold
` (16 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
From: Anders Darander <anders@chargestorm.se>
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
meta/recipes-extended/libzypp/libzypp_git.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index aeae7df..4b1b8e4 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -16,7 +16,7 @@ SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
PV = "0.0-git${SRCPV}"
PR = "r14"
-SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
+SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
file://no-doc.patch \
file://rpm5.patch \
file://rpm5-no-rpmdbinit.patch \
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* [RC Fixes 04/19] sat-solver: git repo moved to github
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
` (2 preceding siblings ...)
2011-09-21 9:39 ` [RC Fixes 03/19] libzypp: git repo moved to github Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 9:39 ` [RC Fixes 05/19] zypper: " Saul Wold
` (15 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
From: Anders Darander <anders@chargestorm.se>
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
meta/recipes-extended/sat-solver/sat-solver_git.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/sat-solver/sat-solver_git.bb b/meta/recipes-extended/sat-solver/sat-solver_git.bb
index 9b212db..0d9a439 100644
--- a/meta/recipes-extended/sat-solver/sat-solver_git.bb
+++ b/meta/recipes-extended/sat-solver/sat-solver_git.bb
@@ -12,7 +12,7 @@ PR = "r11"
PARALLEL_MAKE=""
-SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
+SRC_URI = "git://github.com/openSUSE/sat-solver.git;protocol=git \
file://sat-solver_rpm5.patch \
file://sat-solver_obsolete.patch \
file://cmake.patch \
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* [RC Fixes 05/19] zypper: git repo moved to github
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
` (3 preceding siblings ...)
2011-09-21 9:39 ` [RC Fixes 04/19] sat-solver: " Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 9:39 ` [RC Fixes 06/19] distrodata: fix distro_check code Saul Wold
` (14 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
From: Anders Darander <anders@chargestorm.se>
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
meta/recipes-extended/zypper/zypper_git.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/zypper/zypper_git.bb b/meta/recipes-extended/zypper/zypper_git.bb
index 299fcb5..7f7ceb3 100644
--- a/meta/recipes-extended/zypper/zypper_git.bb
+++ b/meta/recipes-extended/zypper/zypper_git.bb
@@ -11,7 +11,7 @@ SRCREV = "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582"
inherit cmake
-SRC_URI = "git://gitorious.org/opensuse/zypper.git;protocol=git \
+SRC_URI = "git://github.com/openSUSE/zypper.git;protocol=git \
file://cmake.patch \
file://dso_linking_change_build_fix.patch \
file://rpm5-flag.patch \
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* [RC Fixes 06/19] distrodata: fix distro_check code
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
` (4 preceding siblings ...)
2011-09-21 9:39 ` [RC Fixes 05/19] zypper: " Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 9:39 ` [RC Fixes 07/19] distro tracking: Update Distro Aliases Saul Wold
` (13 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
This fixes a problem with package names from inherits showing up
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/distrodata.bbclass | 19 +++++++++++++++++--
meta/lib/oe/distro_check.py | 8 ++++----
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index e91200d..ce7b931 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -8,7 +8,7 @@ python distro_eventhandler() {
logfile = dc.create_log_file(e.data, "distrodata.csv")
lf = bb.utils.lockfile("%s.lock" % logfile)
f = open(logfile, "a")
- f.write("Package,Description,Owner,License,ChkSum,Status,VerMatch,Version,Upsteam,Non-Update,Reason,Recipe Status\n")
+ f.write("Package,Description,Owner,License,ChkSum,Status,VerMatch,Version,Upsteam,Non-Update,Reason,Recipe Status,Distro 1,Distro 2,Distro 3\n")
f.close()
bb.utils.unlockfile(lf)
@@ -34,12 +34,24 @@ python do_distrodata_np() {
bb.data.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + bb.data.getVar('OVERRIDES', d, True), localdata)
bb.data.update_data(localdata)
+ if pn.find("-nativesdk") != -1:
+ pnstripped = pn.split("-nativesdk")
+ bb.note("Native Split: %s" % pnstripped)
+ bb.data.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + bb.data.getVar('OVERRIDES', d, True), localdata)
+ bb.data.update_data(localdata)
+
if pn.find("-cross") != -1:
pnstripped = pn.split("-cross")
bb.note("cross Split: %s" % pnstripped)
bb.data.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + bb.data.getVar('OVERRIDES', d, True), localdata)
bb.data.update_data(localdata)
+ if pn.find("-crosssdk") != -1:
+ pnstripped = pn.split("-crosssdk")
+ bb.note("cross Split: %s" % pnstripped)
+ bb.data.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + bb.data.getVar('OVERRIDES', d, True), localdata)
+ bb.data.update_data(localdata)
+
if pn.find("-initial") != -1:
pnstripped = pn.split("-initial")
bb.note("initial Split: %s" % pnstripped)
@@ -181,7 +193,7 @@ python do_distrodata() {
lf = bb.utils.lockfile("%s.lock" % logfile)
f = open(logfile, "a")
- f.write("%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s," % \
+ f.write("%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s" % \
(pname, pdesc, maintainer, plicense, pchksum, hasrstatus, vermatch, pcurver, pupver, noupdate, noupdate_reason, rstatus))
line = ""
for i in result:
@@ -671,6 +683,9 @@ python do_distro_check() {
import oe.distro_check as dc
import bb
import shutil
+ if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk',d):
+ return
+
localdata = bb.data.createCopy(d)
bb.data.update_data(localdata)
tmpdir = bb.data.getVar('TMPDIR', d, True)
diff --git a/meta/lib/oe/distro_check.py b/meta/lib/oe/distro_check.py
index 55cdcad..4721355 100644
--- a/meta/lib/oe/distro_check.py
+++ b/meta/lib/oe/distro_check.py
@@ -73,9 +73,9 @@ def clean_package_list(package_list):
def get_latest_released_meego_source_package_list():
"Returns list of all the name os packages in the latest meego distro"
- if not os.path.isfile("/tmp/Meego-1.0"):
- os.mknod("/tmp/Meego-1.0")
- f = open("/tmp/Meego-1.0", "r")
+ if not os.path.isfile("/tmp/Meego-1.1"):
+ os.mknod("/tmp/Meego-1.1")
+ f = open("/tmp/Meego-1.1", "r")
package_names = []
for line in f:
package_names.append(line[:-1] + ":" + "main") # Also strip the '\n' at the end
@@ -303,7 +303,7 @@ def compare_in_distro_packages_list(distro_check_dir, d):
bb.note("Recipe: %s" % recipe_name)
tmp = bb.data.getVar('DISTRO_PN_ALIAS', localdata, True)
- distro_exceptions = dict({"OE-Core":'OE-Core', "OpenedHand":'OpenedHand', "Intel":'Intel', "Upstream":'Upstream', "WindRiver":'Windriver', "OSPDT":'OSPDT Approved', "Poky":'poky'})
+ distro_exceptions = dict({"OE-Core":'OE-Core', "OpenedHand":'OpenedHand', "Intel":'Intel', "Upstream":'Upstream', "Windriver":'Windriver', "OSPDT":'OSPDT Approved', "Poky":'poky'})
if tmp:
list = tmp.split(' ')
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* [RC Fixes 07/19] distro tracking: Update Distro Aliases
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
` (5 preceding siblings ...)
2011-09-21 9:39 ` [RC Fixes 06/19] distrodata: fix distro_check code Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 10:35 ` Koen Kooi
2011-09-21 9:39 ` [RC Fixes 08/19] avahi: Refactor recipe to move UI to avahi-ui Saul Wold
` (12 subsequent siblings)
19 siblings, 1 reply; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 83 +++++++++++++++++++-
1 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index b150af8..7ff233c 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -613,6 +613,7 @@ RECIPE_MAINTAINER_pn-libzypp = "Mark Hatle <mark.hatle@windriver.com>"
RECIPE_LATEST_VERSION_pn-libzypp = "git"
RECIPE_INTEL_SECTION_pn-libzypp = "base libs"
RECIPE_COMMENTS_pn-libzypp = ""
+DISTRO_PN_ALIAS_pn-libzypp = "OpenSuse=libzypp Meego=libzypp"
RECIPE_STATUS_pn-dbus-wait = "green"
RECIPE_DEPENDENCY_CHECK_pn-dbus-wait = "not done"
@@ -743,6 +744,8 @@ RECIPE_COMMENTS_pn-opkg = ""
RECIPE_LAST_UPDATE_pn-opkg = "Jul 21, 2010"
RECIPE_MANUAL_CHECK_DATE_pn-opkg = "Jun 29, 2011"
RECIPE_MAINTAINER_pn-opkg = "Dongxiao Xu <dongxiao.xu@intel.com"
+DISTRO_PN_ALIAS_pn-opkg = "OSPDT upstream=http://svn.openmoko.org/trunk/src/tar"
+
RECIPE_STATUS_pn-opkg_nogpg = "green"
RECIPE_DEPENDENCY_CHECK_pn-opkg_nogpg = "not done"
@@ -753,6 +756,8 @@ RECIPE_LATEST_RELEASE_DATE_pn-opkg_nogpg = "02/2010"
RECIPE_COMMENTS_pn-opkg_nogpg = ""
RECIPE_LAST_UPDATE_pn-opkg_nogpg = "Jul 21, 2010"
RECIPE_MAINTAINER_pn-opkg_nogpg = "Dongxiao Xu <dongxiao.xu@intel.com"
+DISTRO_PN_ALIAS_pn-opkg_nogpg = "OSPDT upstream=http://svn.openmoko.org/trunk/s
+
RECIPE_STATUS_pn-dpkg = "green"
RECIPE_LATEST_VERSION_pn-dpkg = "1.16.0.3"
@@ -1051,6 +1056,7 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-shadow = "7 months"
RECIPE_LATEST_RELEASE_DATE_pn-shadow = "Feb 15, 2011"
RECIPE_LAST_UPDATE_pn-shadow = "Jun 4, 2011"
RECIPE_MAINTAINER_pn-shadow = "Scott Garman <scott.a.garman@intel.com>"
+DISTRO_PN_ALIAS_pn-shadow-sysroot = "Ubuntu=shadow Fedora=shadow"
RECIPE_STATUS_pn-coreutils = "green"
RECIPE_LAST_UPDATE_pn-coreutils = "Jul 2, 2011"
@@ -1151,6 +1157,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-libgdbus = "09/2008"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libgdbus = "unknown"
RECIPE_LAST_UPDATE_pn-libgdbus = "Jan 4, 2011"
RECIPE_MAINTAINER_pn-libgdbus = "Scott Garman <scott.a.garman@intel.com>"
+DISTRO_PN_ALIAS_pn-libgdbus = "Intel"
RECIPE_STATUS_pn-apr = "green"
RECIPE_LATEST_VERSION_pn-apr = "1.4.5"
@@ -1712,6 +1719,8 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-tzdata = "1 month"
RECIPE_LATEST_RELEASE_DATE_pn-tzdata = "05/2010"
RECIPE_MANUAL_CHECK_DATE_pn-tzdata = "May 24, 2011"
RECIPE_COMMENTS_pn-tzdata = ""
+DISTRO_PN_ALIAS_pn-tzcode = "OSPDT"
+
RECIPE_STATUS_pn-tinylogin = "yellow" # replaced, place holder for tracking
RECIPE_LAST_UPDATE_pn-tinylogin = "Jul 21, 2006"
@@ -1792,6 +1801,7 @@ RECIPE_MAINTAINER_pn-zypper = "Mark Hatle <mark.hatle@windriver.com>"
RECIPE_LATEST_VERSION_pn-zypper = "git"
RECIPE_INTEL_SECTION_pn-zypper = "base utils"
RECIPE_COMMENTS_pn-zypper = ""
+DISTRO_PN_ALIAS_pn-zypper = "OpenSuse=zypper Meego=zypper"
RECIPE_STATUS_pn-sysstat = "green"
RECIPE_LAST_UPDATE_pn-sysstat = "May 24, 2011"
@@ -2467,10 +2477,12 @@ DISTRO_PN_ALIAS_pn-core-image-sdk = "OE-Core"
RECIPE_STATUS_pn-task-core-console = "green"
RECIPE_LATEST_VERSION_pn-task-core-console = "1.0"
RECIPE_MAINTAINER_pn-task-core-console = "Dongxiao Xu <dongxiao.xu@intel.com>"
+DISTRO_PN_ALIAS_pn-core-console = "OE-Core"
RECIPE_STATUS_pn-task-core-x11 = "green"
RECIPE_LATEST_VERSION_pn-task-core-x11 = "1.0"
RECIPE_MAINTAINER_pn-task-core-x11 = "Dongxiao Xu <dongxiao.xu@intel.com>"
+DISTRO_PN_ALIAS_pn-core-x11 = "OE-Core"
RECIPE_STATUS_pn-task-core-basic = "green"
RECIPE_LATEST_VERSION_pn-task-core-basic = "1.0"
@@ -2795,7 +2807,7 @@ RECIPE_LAST_UPDATE_pn-latencytop = "Jul 22, 2010"
RECIPE_MAINTAINER_pn-latencytop = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-tcf-agent = "green"
-DISTRO_PN_ALIAS_pn-tcf-agent = "WindRiver upstream=http://www.eclipse.org/dsdp/tm/"
+DISTRO_PN_ALIAS_pn-tcf-agent = "Windriver upstream=http://www.eclipse.org/dsdp/tm/"
RECIPE_DEPENDENCY_CHECK_pn-tcf-agent = "not done"
RECIPE_LATEST_VERSION_pn-tcf-agent = "0.0+svnr1855"
RECIPE_MANUAL_CHECK_DATE_pn-tcf-agent = "Jul 21, 2011"
@@ -2899,6 +2911,8 @@ RECIPE_LATEST_VERSION_pn-gcc="4.6.1"
RECIPE_LAST_UPDATE_pn-gcc = "May 1, 2011"
RECIPE_MANUAL_CHECK_DATE_pn-gcc = "Jul 06, 2011"
RECIPE_MAINTAINER_pn-gcc = "Nitin A Kamble <nitin.a.kamble@intel.com>"
+DISTRO_PN_ALIAS_pn-gcc-runtime = "Ubuntu=gcc Fedora=gcc"
+
RECIPE_STATUS_pn-autoconf="red"
RECIPE_LATEST_VERSION_pn-autoconf="2.68"
@@ -3438,6 +3452,7 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "2 months"
RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/05/04"
RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "May 12, 2011"
RECIPE_MAINTAINER_pn-qt4-tools-nativesdk = "Paul Eggleton <paul.eggleton@linux.intel.com>"
+DISTRO_PN_ALIAS_pn-qt4-tools-nativesdk = "Mandriva=libqt4-devel Ubuntu=libqt4-dev"
RECIPE_STATUS_pn-qt4-embedded = "green"
RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.3"
@@ -3445,6 +3460,7 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "2 months"
RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/05/04"
RECIPE_LAST_UPDATE_pn-qt4-embedded = "May 12, 2011"
RECIPE_MAINTAINER_pn-qt4-embedded = "Paul Eggleton <paul.eggleton@linux.intel.com>"
+DISTRO_PN_ALIAS_pn-qt4-embedded = "OSPDT"
RECIPE_STATUS_pn-qt4-x11-free = "green"
RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.3"
@@ -5342,6 +5358,15 @@ RECIPE_LATEST_VERSION_pn-clutter-box2d-1.6 = "0.10.0"
RECIPE_MANUAL_CHECK_DATE_pn-clutter-box2d-1.6 = "Jun 28, 2011"
RECIPE_LAST_UPDATE_pn-clutter-box2d-1.6 = "Mar 28, 2011"
RECIPE_MAINTAINER_pn-clutter-box2d-1.6 = "Zhai Edwin <edwin.zhai@intel.com>"
+DISTRO_PN_ALIAS_pn-clutter-box2d-1.6 = "OpenedHand"
+
+RECIPE_STATUS_pn-clutter-box2d = "red"
+RECIPE_LATEST_VERSION_pn-clutter-box2d = "0.10.0"
+RECIPE_MANUAL_CHECK_DATE_pn-clutter-box2d = "Jun 28, 2011"
+RECIPE_LAST_UPDATE_pn-clutter-box2d = "Mar 28, 2011"
+RECIPE_MAINTAINER_pn-clutter-box2d = "Zhai Edwin <edwin.zhai@intel.com>"
+DISTRO_PN_ALIAS_pn-clutter-box2d = "OpenedHand"
+
RECIPE_STATUS_pn-clutter-gtk-1.4 = "red"
DISTRO_PN_ALIAS_pn-clutter-gtk-1.4 = "Fedora=clutter-gtk OpenSuSE=clutter-gtk Ubuntu=clutter-gtk-0.10 Mandriva=clutter-gtk Debian=clutter-gtk"
@@ -5468,14 +5493,22 @@ DISTRO_PN_ALIAS_pn-core-image-base = "OE-Core"
DISTRO_PN_ALIAS_pn-core-image-basic = "OE-Core"
DISTRO_PN_ALIAS_pn-core-image-core = "OE-Core"
DISTRO_PN_ALIAS_pn-core-image-lsb = "OE-Core"
+DISTRO_PN_ALIAS_pn-core-image-lsb-dev = "OE-Core"
+DISTRO_PN_ALIAS_pn-core-image-lsb-qt3 = "OE-Core"
+DISTRO_PN_ALIAS_pn-core-image-lsb-sdk = "OE-Core"
DISTRO_PN_ALIAS_pn-core-image-minimal = "OE-Core"
+DISTRO_PN_ALIAS_pn-core-image-minimal-dev = "OE-Core"
DISTRO_PN_ALIAS_pn-core-image-minimal-directdisk = "OE-Core"
DISTRO_PN_ALIAS_pn-core-image-minimal-initramfs = "OE-Core"
DISTRO_PN_ALIAS_pn-core-image-minimal-live = "OE-Core"
DISTRO_PN_ALIAS_pn-core-image-minimal-mtdutils = "OE-Core"
+DISTRO_PN_ALIAS_pn-core-image-rt = "OE-Core"
+DISTRO_PN_ALIAS_pn-core-image-rt-sdk = "OE-Core"
DISTRO_PN_ALIAS_pn-core-image-sato = "OE-Core"
+DISTRO_PN_ALIAS_pn-core-image-sato-dev = "OE-Core"
DISTRO_PN_ALIAS_pn-core-image-sato-directdisk = "OE-Core"
DISTRO_PN_ALIAS_pn-core-image-sato-live = "OE-Core"
+DISTRO_PN_ALIAS_pn-core-image-sato-sdk = "OE-Core"
DISTRO_PN_ALIAS_pn-task-core = "OE-Core"
DISTRO_PN_ALIAS_pn-task-core-apps-x11-pimlico = "OE-Core"
DISTRO_PN_ALIAS_pn-task-core-basic = "OE-Core"
@@ -5485,10 +5518,14 @@ DISTRO_PN_ALIAS_pn-task-core-nfs = "OE-Core"
DISTRO_PN_ALIAS_pn-task-core-qt = "OE-Core"
DISTRO_PN_ALIAS_pn-task-core-sdk = "OE-Core"
DISTRO_PN_ALIAS_pn-task-core-sdk-gmae = "OE-Core"
+DISTRO_PN_ALIAS_pn-task-core-ssh-dropbear = "Poky"
+DISTRO_PN_ALIAS_pn-task-core-ssh-openssh = "Poky"
DISTRO_PN_ALIAS_pn-task-core-standalone-gmae-sdk-target = "OE-Core"
DISTRO_PN_ALIAS_pn-task-core-standalone-sdk-target = "OE-Core"
DISTRO_PN_ALIAS_pn-task-core-tools = "OE-Core"
DISTRO_PN_ALIAS_pn-task-core-x11-sato = "OE-Core"
+DISTRO_PN_ALIAS_pn-task-qt4e = "Poky"
+DISTRO_PN_ALIAS_pn-task-qte-toolchain-host-natives = "Poky"
DISTRO_PN_ALIAS_pn-initramfs-boot = "OE-Core"
DISTRO_PN_ALIAS_pn-initramfs-live-boot = "OE-Core"
DISTRO_PN_ALIAS_pn-initramfs-live-install = "OE-Core"
@@ -5533,7 +5570,7 @@ DISTRO_PN_ALIAS_pn-xvideo-tests = "OpenedHand"
RECIPE_STATUS_pn-kern-tools-native = "red"
RECIPE_LATEST_VERSION_pn-kern-tools-native = "check"
-DISTRO_PN_ALIAS_pn-kern-tools-native = "WindRiver"
+DISTRO_PN_ALIAS_pn-kern-tools-native = "Windriver"
RECIPE_LAST_UPDATE_pn-kern-tools-native = "Nov 11, 2010"
RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield <bruce.ashfield@windriver.com>"
@@ -5632,6 +5669,8 @@ RECIPE_NO_UPDATE_REASON_pn-lsb = "1.4 is fixed version of LSB Test"
RECIPE_LATEST_VERSION_pn-lsbsetup = "0.9"
RECIPE_MANUAL_CHECK_DATE_pn-lsbsetup = "Jan 17, 2011"
+DISTRO_PN_ALIAS_pn-lsbsetup = "Windriver"
+
RECIPE_LATEST_VERSION_pn-libxml-simple-perl = "2.18"
RECIPE_LATEST_VERSION_pn-talloc = "2.0.5"
RECIPE_STATUS_pn-gthumb = "red"
@@ -5681,6 +5720,9 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-docbook-sgml-dtd = "unknown"
RECIPE_COMMENTS_pn-docbook-sgml-dtd = ""
RECIPE_LAST_UPDATE_pn-docbook-sgml-dtd = "Jan 28, 2011"
RECIPE_MAINTAINER_pn-docbook-sgml-dtd = "Scott Garman <scott.a.garman@intel.com>"
+DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-3.1 = "Fedora=docbook-dtds Mandriva=docbook-dtd31-sgml"
+DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-4.1 = "Fedora=docbook-dtds Mandriva=docbook-dtd41-sgml"
+DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-4.5 = "Fedora=docbook-dtds Mandriva=docbook-dtd42-sgml"
RECIPE_STATUS_pn-docbook-dsssl-stylesheet = "green"
RECIPE_DEPENDENCY_CHECK_pn-docbook-dsssl-stylesheet = "not done"
@@ -5691,6 +5733,8 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-docbook-dsssl-stylesheet = "unknown"
RECIPE_COMMENTS_pn-docbook-dsssl-stylesheet = ""
RECIPE_LAST_UPDATE_pn-docbook-dsssl-stylesheet = "Jan 26, 2011"
RECIPE_MAINTAINER_pn-docbook-dsssl-stylesheet = "Scott Garman <scott.a.garman@intel.com>"
+DISTRO_PN_ALIAS_pn-docbook-dsssl-stylesheet = "Fedora=docbook-style-dsssl Ubuntu=docbook-dsssl"
+DISTRO_PN_ALIAS_pn-docbook-dsssl-stylesheet-native = "Fedora=docbook-style-dsssl Ubuntu=docbook-dsssl"
RECIPE_STATUS_pn-sgmlspl = "green"
RECIPE_DEPENDENCY_CHECK_pn-sgmlspl = "not done"
@@ -5701,6 +5745,7 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sgmlspl = "5 days"
RECIPE_COMMENTS_pn-sgmlspl = ""
RECIPE_LAST_UPDATE_pn-sgmlspl = "Jan 26, 2011"
RECIPE_MAINTAINER_pn-sgmlspl = "Scott Garman <scott.a.garman@intel.com>"
+DISTRO_PN_ALIAS_pn-sgmlspl = "Debian=sgmlspl Ubuntu=sgmlspl"
RECIPE_STATUS_pn-opensp = "green"
RECIPE_DEPENDENCY_CHECK_pn-opensp = "not done"
@@ -5796,6 +5841,7 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-cdrtools = "6 years 2 months"
RECIPE_COMMENTS_pn-cdrtools = "This is the last GPL licensed version of cdrtools"
RECIPE_LAST_UPDATE_pn-cdrtools = "Apr 25, 2011"
RECIPE_MAINTAINER_pn-cdrtools = "Scott Garman <scott.a.garman@intel.com>"
+DISTRO_PN_ALIAS_pn-cdrtools = "OpenSUSE=cdrtools OSPDT"
RECIPE_STATUS_pn-rxvt-unicode = "green"
RECIPE_DEPENDENCY_CHECK_pn-rxvt-unicode = "not done"
@@ -5830,6 +5876,7 @@ RECIPE_LAST_UPDATE_pn-pseudo = "Jun 06, 2011"
RECIPE_MAINTAINER_pn-pseudo = "Mark Hatle <mark.hatle@windriver.com>"
RECIPE_COMMENTS_pn-pseudo = "Yocto Project maintained"
RECIPE_MANUAL_CHECK_DATE_pn-pseudo = "Jun 06, 2011"
+DISTRO_PN_ALIAS_pn-pseudo = "Windriver"
DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs"
DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests"
@@ -5846,3 +5893,35 @@ DISTRO_PN_ALIAS_pn-lame = "Debian=lame Ubuntu=lame"
DISTRO_PN_ALIAS_pn-libiconv = "Fedora=mingw-libiconv Opensuse=cross-mingw-libiconv"
DISTRO_PN_ALIAS_pn-qt4-native = "Fedora=qt4 Debian=qt4-dev-tools"
DISTRO_PN_ALIAS_pn-update-alternatives-dpkg = "Opensuse=update-alternatives Mandriva=update-alternatives"
+DISTRO_PN_ALIAS_pn-emgd-driver-bin = "Intel"
+DISTRO_PN_ALIAS_pn-external-csl-toolchain = "OE-Core"
+DISTRO_PN_ALIAS_pn-external-poky-toolchain = "Poky"
+DISTRO_PN_ALIAS_pn-hello-mod = "Poky"
+DISTRO_PN_ALIAS_pn-linux-dummy = "Intel"
+DISTRO_PN_ALIAS_pn-meta-environment-i586 = "Poky"
+DISTRO_PN_ALIAS_pn-meta-toolchain-gmae = "Poky"
+DISTRO_PN_ALIAS_pn-meta-toolchain-qte = "Poky"
+DISTRO_PN_ALIAS_pn-n450-audio = "Intel"
+DISTRO_PN_ALIAS_pn-qt-demo-init = "Poky"
+DISTRO_PN_ALIAS_pn-qt4e-demo-image = "Poky"
+DISTRO_PN_ALIAS_pn-xorg-cf-files = "Poky"
+
+DISTRO_PN_ALIAS_pn-task-core-yocto = "Poky"
+DISTRO_PN_ALIAS_pn-yocto-image-build = "Poky"
+DISTRO_PN_ALIAS_pn-task-core-x11 = "OE-Core"
+DISTRO_PN_ALIAS_pn-gcc-crosssdk-initial = "OE-Core"
+DISTRO_PN_ALIAS_pn-gcc-cross-initial = "OE-Core"
+DISTRO_PN_ALIAS_pn-python-ZSI = "OE-Core"
+DISTRO_PN_ALIAS_pn-swabber-native = "Poky"
+DISTRO_PN_ALIAS_pn-opkg-nogpg = "OE-Core"
+DISTRO_PN_ALIAS_pn-opkg-nogpg-native = "OE-Core"
+DISTRO_PN_ALIAS_pn-opkg-nogpg-nativesdk = "OE-Core"
+DISTRO_PN_ALIAS_pn-icecc-create-env = "OE-Core"
+DISTRO_PN_ALIAS_pn-sysvinit-inittab = "OE-Core"
+DISTRO_PN_ALIAS_pn-eglibc-locale = "OE-Core"
+DISTRO_PN_ALIAS_pn-eglibc-locale-nativesdk = "OE-Core"
+DISTRO_PN_ALIAS_pn-external-python-tarball = "OE-Core"
+DISTRO_PN_ALIAS_pn-task-core-console = "OE-Core"
+DISTRO_PN_ALIAS_pn-task-qte-toolchain-host-nativesdk = "OE-Core"
+DISTRO_PN_ALIAS_pn-tar-replacement-native = "OE-Core"
+DISTRO_PN_ALIAS_pn-task-cross-canadian-i586 = "OE-Core"
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [RC Fixes 07/19] distro tracking: Update Distro Aliases
2011-09-21 9:39 ` [RC Fixes 07/19] distro tracking: Update Distro Aliases Saul Wold
@ 2011-09-21 10:35 ` Koen Kooi
0 siblings, 0 replies; 22+ messages in thread
From: Koen Kooi @ 2011-09-21 10:35 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
To reiterate:
All the 'Poky' fields should be 'OE-core', OE-core should *not* have any poky references after the rebranding done post ELC 2011 a few months ago.
Op 21 sep. 2011, om 11:39 heeft Saul Wold het volgende geschreven:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> .../conf/distro/include/distro_tracking_fields.inc | 83 +++++++++++++++++++-
> 1 files changed, 81 insertions(+), 2 deletions(-)
>
> diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
> index b150af8..7ff233c 100644
> --- a/meta/conf/distro/include/distro_tracking_fields.inc
> +++ b/meta/conf/distro/include/distro_tracking_fields.inc
> @@ -613,6 +613,7 @@ RECIPE_MAINTAINER_pn-libzypp = "Mark Hatle <mark.hatle@windriver.com>"
> RECIPE_LATEST_VERSION_pn-libzypp = "git"
> RECIPE_INTEL_SECTION_pn-libzypp = "base libs"
> RECIPE_COMMENTS_pn-libzypp = ""
> +DISTRO_PN_ALIAS_pn-libzypp = "OpenSuse=libzypp Meego=libzypp"
>
> RECIPE_STATUS_pn-dbus-wait = "green"
> RECIPE_DEPENDENCY_CHECK_pn-dbus-wait = "not done"
> @@ -743,6 +744,8 @@ RECIPE_COMMENTS_pn-opkg = ""
> RECIPE_LAST_UPDATE_pn-opkg = "Jul 21, 2010"
> RECIPE_MANUAL_CHECK_DATE_pn-opkg = "Jun 29, 2011"
> RECIPE_MAINTAINER_pn-opkg = "Dongxiao Xu <dongxiao.xu@intel.com"
> +DISTRO_PN_ALIAS_pn-opkg = "OSPDT upstream=http://svn.openmoko.org/trunk/src/tar"
> +
>
> RECIPE_STATUS_pn-opkg_nogpg = "green"
> RECIPE_DEPENDENCY_CHECK_pn-opkg_nogpg = "not done"
> @@ -753,6 +756,8 @@ RECIPE_LATEST_RELEASE_DATE_pn-opkg_nogpg = "02/2010"
> RECIPE_COMMENTS_pn-opkg_nogpg = ""
> RECIPE_LAST_UPDATE_pn-opkg_nogpg = "Jul 21, 2010"
> RECIPE_MAINTAINER_pn-opkg_nogpg = "Dongxiao Xu <dongxiao.xu@intel.com"
> +DISTRO_PN_ALIAS_pn-opkg_nogpg = "OSPDT upstream=http://svn.openmoko.org/trunk/s
> +
>
> RECIPE_STATUS_pn-dpkg = "green"
> RECIPE_LATEST_VERSION_pn-dpkg = "1.16.0.3"
> @@ -1051,6 +1056,7 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-shadow = "7 months"
> RECIPE_LATEST_RELEASE_DATE_pn-shadow = "Feb 15, 2011"
> RECIPE_LAST_UPDATE_pn-shadow = "Jun 4, 2011"
> RECIPE_MAINTAINER_pn-shadow = "Scott Garman <scott.a.garman@intel.com>"
> +DISTRO_PN_ALIAS_pn-shadow-sysroot = "Ubuntu=shadow Fedora=shadow"
>
> RECIPE_STATUS_pn-coreutils = "green"
> RECIPE_LAST_UPDATE_pn-coreutils = "Jul 2, 2011"
> @@ -1151,6 +1157,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-libgdbus = "09/2008"
> RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libgdbus = "unknown"
> RECIPE_LAST_UPDATE_pn-libgdbus = "Jan 4, 2011"
> RECIPE_MAINTAINER_pn-libgdbus = "Scott Garman <scott.a.garman@intel.com>"
> +DISTRO_PN_ALIAS_pn-libgdbus = "Intel"
>
> RECIPE_STATUS_pn-apr = "green"
> RECIPE_LATEST_VERSION_pn-apr = "1.4.5"
> @@ -1712,6 +1719,8 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-tzdata = "1 month"
> RECIPE_LATEST_RELEASE_DATE_pn-tzdata = "05/2010"
> RECIPE_MANUAL_CHECK_DATE_pn-tzdata = "May 24, 2011"
> RECIPE_COMMENTS_pn-tzdata = ""
> +DISTRO_PN_ALIAS_pn-tzcode = "OSPDT"
> +
>
> RECIPE_STATUS_pn-tinylogin = "yellow" # replaced, place holder for tracking
> RECIPE_LAST_UPDATE_pn-tinylogin = "Jul 21, 2006"
> @@ -1792,6 +1801,7 @@ RECIPE_MAINTAINER_pn-zypper = "Mark Hatle <mark.hatle@windriver.com>"
> RECIPE_LATEST_VERSION_pn-zypper = "git"
> RECIPE_INTEL_SECTION_pn-zypper = "base utils"
> RECIPE_COMMENTS_pn-zypper = ""
> +DISTRO_PN_ALIAS_pn-zypper = "OpenSuse=zypper Meego=zypper"
>
> RECIPE_STATUS_pn-sysstat = "green"
> RECIPE_LAST_UPDATE_pn-sysstat = "May 24, 2011"
> @@ -2467,10 +2477,12 @@ DISTRO_PN_ALIAS_pn-core-image-sdk = "OE-Core"
> RECIPE_STATUS_pn-task-core-console = "green"
> RECIPE_LATEST_VERSION_pn-task-core-console = "1.0"
> RECIPE_MAINTAINER_pn-task-core-console = "Dongxiao Xu <dongxiao.xu@intel.com>"
> +DISTRO_PN_ALIAS_pn-core-console = "OE-Core"
>
> RECIPE_STATUS_pn-task-core-x11 = "green"
> RECIPE_LATEST_VERSION_pn-task-core-x11 = "1.0"
> RECIPE_MAINTAINER_pn-task-core-x11 = "Dongxiao Xu <dongxiao.xu@intel.com>"
> +DISTRO_PN_ALIAS_pn-core-x11 = "OE-Core"
>
> RECIPE_STATUS_pn-task-core-basic = "green"
> RECIPE_LATEST_VERSION_pn-task-core-basic = "1.0"
> @@ -2795,7 +2807,7 @@ RECIPE_LAST_UPDATE_pn-latencytop = "Jul 22, 2010"
> RECIPE_MAINTAINER_pn-latencytop = "Dexuan Cui <dexuan.cui@intel.com>"
>
> RECIPE_STATUS_pn-tcf-agent = "green"
> -DISTRO_PN_ALIAS_pn-tcf-agent = "WindRiver upstream=http://www.eclipse.org/dsdp/tm/"
> +DISTRO_PN_ALIAS_pn-tcf-agent = "Windriver upstream=http://www.eclipse.org/dsdp/tm/"
> RECIPE_DEPENDENCY_CHECK_pn-tcf-agent = "not done"
> RECIPE_LATEST_VERSION_pn-tcf-agent = "0.0+svnr1855"
> RECIPE_MANUAL_CHECK_DATE_pn-tcf-agent = "Jul 21, 2011"
> @@ -2899,6 +2911,8 @@ RECIPE_LATEST_VERSION_pn-gcc="4.6.1"
> RECIPE_LAST_UPDATE_pn-gcc = "May 1, 2011"
> RECIPE_MANUAL_CHECK_DATE_pn-gcc = "Jul 06, 2011"
> RECIPE_MAINTAINER_pn-gcc = "Nitin A Kamble <nitin.a.kamble@intel.com>"
> +DISTRO_PN_ALIAS_pn-gcc-runtime = "Ubuntu=gcc Fedora=gcc"
> +
>
> RECIPE_STATUS_pn-autoconf="red"
> RECIPE_LATEST_VERSION_pn-autoconf="2.68"
> @@ -3438,6 +3452,7 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "2 months"
> RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/05/04"
> RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "May 12, 2011"
> RECIPE_MAINTAINER_pn-qt4-tools-nativesdk = "Paul Eggleton <paul.eggleton@linux.intel.com>"
> +DISTRO_PN_ALIAS_pn-qt4-tools-nativesdk = "Mandriva=libqt4-devel Ubuntu=libqt4-dev"
>
> RECIPE_STATUS_pn-qt4-embedded = "green"
> RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.3"
> @@ -3445,6 +3460,7 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "2 months"
> RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/05/04"
> RECIPE_LAST_UPDATE_pn-qt4-embedded = "May 12, 2011"
> RECIPE_MAINTAINER_pn-qt4-embedded = "Paul Eggleton <paul.eggleton@linux.intel.com>"
> +DISTRO_PN_ALIAS_pn-qt4-embedded = "OSPDT"
>
> RECIPE_STATUS_pn-qt4-x11-free = "green"
> RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.3"
> @@ -5342,6 +5358,15 @@ RECIPE_LATEST_VERSION_pn-clutter-box2d-1.6 = "0.10.0"
> RECIPE_MANUAL_CHECK_DATE_pn-clutter-box2d-1.6 = "Jun 28, 2011"
> RECIPE_LAST_UPDATE_pn-clutter-box2d-1.6 = "Mar 28, 2011"
> RECIPE_MAINTAINER_pn-clutter-box2d-1.6 = "Zhai Edwin <edwin.zhai@intel.com>"
> +DISTRO_PN_ALIAS_pn-clutter-box2d-1.6 = "OpenedHand"
> +
> +RECIPE_STATUS_pn-clutter-box2d = "red"
> +RECIPE_LATEST_VERSION_pn-clutter-box2d = "0.10.0"
> +RECIPE_MANUAL_CHECK_DATE_pn-clutter-box2d = "Jun 28, 2011"
> +RECIPE_LAST_UPDATE_pn-clutter-box2d = "Mar 28, 2011"
> +RECIPE_MAINTAINER_pn-clutter-box2d = "Zhai Edwin <edwin.zhai@intel.com>"
> +DISTRO_PN_ALIAS_pn-clutter-box2d = "OpenedHand"
> +
>
> RECIPE_STATUS_pn-clutter-gtk-1.4 = "red"
> DISTRO_PN_ALIAS_pn-clutter-gtk-1.4 = "Fedora=clutter-gtk OpenSuSE=clutter-gtk Ubuntu=clutter-gtk-0.10 Mandriva=clutter-gtk Debian=clutter-gtk"
> @@ -5468,14 +5493,22 @@ DISTRO_PN_ALIAS_pn-core-image-base = "OE-Core"
> DISTRO_PN_ALIAS_pn-core-image-basic = "OE-Core"
> DISTRO_PN_ALIAS_pn-core-image-core = "OE-Core"
> DISTRO_PN_ALIAS_pn-core-image-lsb = "OE-Core"
> +DISTRO_PN_ALIAS_pn-core-image-lsb-dev = "OE-Core"
> +DISTRO_PN_ALIAS_pn-core-image-lsb-qt3 = "OE-Core"
> +DISTRO_PN_ALIAS_pn-core-image-lsb-sdk = "OE-Core"
> DISTRO_PN_ALIAS_pn-core-image-minimal = "OE-Core"
> +DISTRO_PN_ALIAS_pn-core-image-minimal-dev = "OE-Core"
> DISTRO_PN_ALIAS_pn-core-image-minimal-directdisk = "OE-Core"
> DISTRO_PN_ALIAS_pn-core-image-minimal-initramfs = "OE-Core"
> DISTRO_PN_ALIAS_pn-core-image-minimal-live = "OE-Core"
> DISTRO_PN_ALIAS_pn-core-image-minimal-mtdutils = "OE-Core"
> +DISTRO_PN_ALIAS_pn-core-image-rt = "OE-Core"
> +DISTRO_PN_ALIAS_pn-core-image-rt-sdk = "OE-Core"
> DISTRO_PN_ALIAS_pn-core-image-sato = "OE-Core"
> +DISTRO_PN_ALIAS_pn-core-image-sato-dev = "OE-Core"
> DISTRO_PN_ALIAS_pn-core-image-sato-directdisk = "OE-Core"
> DISTRO_PN_ALIAS_pn-core-image-sato-live = "OE-Core"
> +DISTRO_PN_ALIAS_pn-core-image-sato-sdk = "OE-Core"
> DISTRO_PN_ALIAS_pn-task-core = "OE-Core"
> DISTRO_PN_ALIAS_pn-task-core-apps-x11-pimlico = "OE-Core"
> DISTRO_PN_ALIAS_pn-task-core-basic = "OE-Core"
> @@ -5485,10 +5518,14 @@ DISTRO_PN_ALIAS_pn-task-core-nfs = "OE-Core"
> DISTRO_PN_ALIAS_pn-task-core-qt = "OE-Core"
> DISTRO_PN_ALIAS_pn-task-core-sdk = "OE-Core"
> DISTRO_PN_ALIAS_pn-task-core-sdk-gmae = "OE-Core"
> +DISTRO_PN_ALIAS_pn-task-core-ssh-dropbear = "Poky"
> +DISTRO_PN_ALIAS_pn-task-core-ssh-openssh = "Poky"
> DISTRO_PN_ALIAS_pn-task-core-standalone-gmae-sdk-target = "OE-Core"
> DISTRO_PN_ALIAS_pn-task-core-standalone-sdk-target = "OE-Core"
> DISTRO_PN_ALIAS_pn-task-core-tools = "OE-Core"
> DISTRO_PN_ALIAS_pn-task-core-x11-sato = "OE-Core"
> +DISTRO_PN_ALIAS_pn-task-qt4e = "Poky"
> +DISTRO_PN_ALIAS_pn-task-qte-toolchain-host-natives = "Poky"
> DISTRO_PN_ALIAS_pn-initramfs-boot = "OE-Core"
> DISTRO_PN_ALIAS_pn-initramfs-live-boot = "OE-Core"
> DISTRO_PN_ALIAS_pn-initramfs-live-install = "OE-Core"
> @@ -5533,7 +5570,7 @@ DISTRO_PN_ALIAS_pn-xvideo-tests = "OpenedHand"
>
> RECIPE_STATUS_pn-kern-tools-native = "red"
> RECIPE_LATEST_VERSION_pn-kern-tools-native = "check"
> -DISTRO_PN_ALIAS_pn-kern-tools-native = "WindRiver"
> +DISTRO_PN_ALIAS_pn-kern-tools-native = "Windriver"
> RECIPE_LAST_UPDATE_pn-kern-tools-native = "Nov 11, 2010"
> RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield <bruce.ashfield@windriver.com>"
>
> @@ -5632,6 +5669,8 @@ RECIPE_NO_UPDATE_REASON_pn-lsb = "1.4 is fixed version of LSB Test"
>
> RECIPE_LATEST_VERSION_pn-lsbsetup = "0.9"
> RECIPE_MANUAL_CHECK_DATE_pn-lsbsetup = "Jan 17, 2011"
> +DISTRO_PN_ALIAS_pn-lsbsetup = "Windriver"
> +
> RECIPE_LATEST_VERSION_pn-libxml-simple-perl = "2.18"
> RECIPE_LATEST_VERSION_pn-talloc = "2.0.5"
> RECIPE_STATUS_pn-gthumb = "red"
> @@ -5681,6 +5720,9 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-docbook-sgml-dtd = "unknown"
> RECIPE_COMMENTS_pn-docbook-sgml-dtd = ""
> RECIPE_LAST_UPDATE_pn-docbook-sgml-dtd = "Jan 28, 2011"
> RECIPE_MAINTAINER_pn-docbook-sgml-dtd = "Scott Garman <scott.a.garman@intel.com>"
> +DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-3.1 = "Fedora=docbook-dtds Mandriva=docbook-dtd31-sgml"
> +DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-4.1 = "Fedora=docbook-dtds Mandriva=docbook-dtd41-sgml"
> +DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-4.5 = "Fedora=docbook-dtds Mandriva=docbook-dtd42-sgml"
>
> RECIPE_STATUS_pn-docbook-dsssl-stylesheet = "green"
> RECIPE_DEPENDENCY_CHECK_pn-docbook-dsssl-stylesheet = "not done"
> @@ -5691,6 +5733,8 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-docbook-dsssl-stylesheet = "unknown"
> RECIPE_COMMENTS_pn-docbook-dsssl-stylesheet = ""
> RECIPE_LAST_UPDATE_pn-docbook-dsssl-stylesheet = "Jan 26, 2011"
> RECIPE_MAINTAINER_pn-docbook-dsssl-stylesheet = "Scott Garman <scott.a.garman@intel.com>"
> +DISTRO_PN_ALIAS_pn-docbook-dsssl-stylesheet = "Fedora=docbook-style-dsssl Ubuntu=docbook-dsssl"
> +DISTRO_PN_ALIAS_pn-docbook-dsssl-stylesheet-native = "Fedora=docbook-style-dsssl Ubuntu=docbook-dsssl"
>
> RECIPE_STATUS_pn-sgmlspl = "green"
> RECIPE_DEPENDENCY_CHECK_pn-sgmlspl = "not done"
> @@ -5701,6 +5745,7 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sgmlspl = "5 days"
> RECIPE_COMMENTS_pn-sgmlspl = ""
> RECIPE_LAST_UPDATE_pn-sgmlspl = "Jan 26, 2011"
> RECIPE_MAINTAINER_pn-sgmlspl = "Scott Garman <scott.a.garman@intel.com>"
> +DISTRO_PN_ALIAS_pn-sgmlspl = "Debian=sgmlspl Ubuntu=sgmlspl"
>
> RECIPE_STATUS_pn-opensp = "green"
> RECIPE_DEPENDENCY_CHECK_pn-opensp = "not done"
> @@ -5796,6 +5841,7 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-cdrtools = "6 years 2 months"
> RECIPE_COMMENTS_pn-cdrtools = "This is the last GPL licensed version of cdrtools"
> RECIPE_LAST_UPDATE_pn-cdrtools = "Apr 25, 2011"
> RECIPE_MAINTAINER_pn-cdrtools = "Scott Garman <scott.a.garman@intel.com>"
> +DISTRO_PN_ALIAS_pn-cdrtools = "OpenSUSE=cdrtools OSPDT"
>
> RECIPE_STATUS_pn-rxvt-unicode = "green"
> RECIPE_DEPENDENCY_CHECK_pn-rxvt-unicode = "not done"
> @@ -5830,6 +5876,7 @@ RECIPE_LAST_UPDATE_pn-pseudo = "Jun 06, 2011"
> RECIPE_MAINTAINER_pn-pseudo = "Mark Hatle <mark.hatle@windriver.com>"
> RECIPE_COMMENTS_pn-pseudo = "Yocto Project maintained"
> RECIPE_MANUAL_CHECK_DATE_pn-pseudo = "Jun 06, 2011"
> +DISTRO_PN_ALIAS_pn-pseudo = "Windriver"
>
> DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs"
> DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests"
> @@ -5846,3 +5893,35 @@ DISTRO_PN_ALIAS_pn-lame = "Debian=lame Ubuntu=lame"
> DISTRO_PN_ALIAS_pn-libiconv = "Fedora=mingw-libiconv Opensuse=cross-mingw-libiconv"
> DISTRO_PN_ALIAS_pn-qt4-native = "Fedora=qt4 Debian=qt4-dev-tools"
> DISTRO_PN_ALIAS_pn-update-alternatives-dpkg = "Opensuse=update-alternatives Mandriva=update-alternatives"
> +DISTRO_PN_ALIAS_pn-emgd-driver-bin = "Intel"
> +DISTRO_PN_ALIAS_pn-external-csl-toolchain = "OE-Core"
> +DISTRO_PN_ALIAS_pn-external-poky-toolchain = "Poky"
> +DISTRO_PN_ALIAS_pn-hello-mod = "Poky"
> +DISTRO_PN_ALIAS_pn-linux-dummy = "Intel"
> +DISTRO_PN_ALIAS_pn-meta-environment-i586 = "Poky"
> +DISTRO_PN_ALIAS_pn-meta-toolchain-gmae = "Poky"
> +DISTRO_PN_ALIAS_pn-meta-toolchain-qte = "Poky"
> +DISTRO_PN_ALIAS_pn-n450-audio = "Intel"
> +DISTRO_PN_ALIAS_pn-qt-demo-init = "Poky"
> +DISTRO_PN_ALIAS_pn-qt4e-demo-image = "Poky"
> +DISTRO_PN_ALIAS_pn-xorg-cf-files = "Poky"
> +
> +DISTRO_PN_ALIAS_pn-task-core-yocto = "Poky"
> +DISTRO_PN_ALIAS_pn-yocto-image-build = "Poky"
> +DISTRO_PN_ALIAS_pn-task-core-x11 = "OE-Core"
> +DISTRO_PN_ALIAS_pn-gcc-crosssdk-initial = "OE-Core"
> +DISTRO_PN_ALIAS_pn-gcc-cross-initial = "OE-Core"
> +DISTRO_PN_ALIAS_pn-python-ZSI = "OE-Core"
> +DISTRO_PN_ALIAS_pn-swabber-native = "Poky"
> +DISTRO_PN_ALIAS_pn-opkg-nogpg = "OE-Core"
> +DISTRO_PN_ALIAS_pn-opkg-nogpg-native = "OE-Core"
> +DISTRO_PN_ALIAS_pn-opkg-nogpg-nativesdk = "OE-Core"
> +DISTRO_PN_ALIAS_pn-icecc-create-env = "OE-Core"
> +DISTRO_PN_ALIAS_pn-sysvinit-inittab = "OE-Core"
> +DISTRO_PN_ALIAS_pn-eglibc-locale = "OE-Core"
> +DISTRO_PN_ALIAS_pn-eglibc-locale-nativesdk = "OE-Core"
> +DISTRO_PN_ALIAS_pn-external-python-tarball = "OE-Core"
> +DISTRO_PN_ALIAS_pn-task-core-console = "OE-Core"
> +DISTRO_PN_ALIAS_pn-task-qte-toolchain-host-nativesdk = "OE-Core"
> +DISTRO_PN_ALIAS_pn-tar-replacement-native = "OE-Core"
> +DISTRO_PN_ALIAS_pn-task-cross-canadian-i586 = "OE-Core"
> --
> 1.7.6
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 22+ messages in thread
* [RC Fixes 08/19] avahi: Refactor recipe to move UI to avahi-ui
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
` (6 preceding siblings ...)
2011-09-21 9:39 ` [RC Fixes 07/19] distro tracking: Update Distro Aliases Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 9:39 ` [RC Fixes 09/19] rpm: add multilib prefix for archs under deploy/rpm Saul Wold
` (11 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
[YOCTO #1492]
This patch refactors avahi into a core non ui and avahi-ui, OE-Classic
has a similar factoring, and it was used as a refernce to make this
occur correctly here.
This allows the package to be built without gtk and GPLv3 issues.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb | 37 +++++++++
meta/recipes-connectivity/avahi/avahi.inc | 86 ++++++++++---------
meta/recipes-connectivity/avahi/avahi_0.6.30.bb | 6 +-
3 files changed, 87 insertions(+), 42 deletions(-)
create mode 100644 meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb
diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb
new file mode 100644
index 0000000..e0733a9
--- /dev/null
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb
@@ -0,0 +1,37 @@
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+ file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \
+ file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \
+ file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \
+ file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
+
+require avahi.inc
+
+PR = "${INC_PR}.0"
+
+DEPENDS += "avahi gtk+ libglade"
+
+AVAHI_GTK = "--enable-gtk --disable-gtk3"
+
+S = "${WORKDIR}/avahi-${PV}"
+
+PACKAGES = "${PN} ${PN}-utils ${PN}-dbg ${PN}-dev python-avahi avahi-discover avahi-discover-standalone"
+
+FILES_${PN} = "${libdir}/libavahi-ui*.so.*"
+FILES_${PN}-dbg += "${libdir}/.debug/libavah-ui*"
+FILES_${PN}-dev += "${libdir}/libavahi-ui*"
+
+FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*"
+
+FILES_python-avahi = "${PYTHON_SITEPACKAGES_DIR}/avahi/*"
+FILES_avahi-discover = "${bindir}/avahi-discover \
+ ${datadir}/applications/avahi-discover.desktop \
+ ${datadir}/avahi/interfaces/avahi-discover.glade"
+FILES_avahi-discover-standalone = "${bindir}/avahi-discover-standalone \
+ ${datadir}/avahi/interfaces/avahi-discover.glade"
+
+RDEPENDS_avahi-discover = "python-avahi python-pygtk"
+RDEPENDS_python-avahi = "python-dbus"
+
+
+SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43"
+SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f"
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 24ea458..a847394 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,8 +14,9 @@ SECTION = "network"
# python scripts are under GPLv2+
LICENSE = "GPLv2+ & LGPLv2.1+"
-X11DEPENDS = "gtk+ libglade"
-DEPENDS = "expat libcap libdaemon dbus glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
+INC_PR = "r6"
+
+DEPENDS = "expat libcap libdaemon dbus glib-2.0"
SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
file://00avahi-autoipd \
@@ -25,58 +26,38 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
inherit autotools pkgconfig update-rc.d gettext
EXTRA_OECONF = "--with-distro=debian \
+ --disable-introspection \
--with-avahi-priv-access-group=adm \
--disable-stack-protector \
--disable-gdbm \
--disable-mono \
--disable-monodoc \
- --disable-gtk3 \
- ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-gtk', '--disable-gtk', d)} \
--disable-qt3 \
--disable-qt4 \
--disable-python \
--disable-doxygen-doc \
--with-systemdsystemunitdir=${base_libdir}/systemd/system/ \
-"
-
-PACKAGES =+ "avahi-systemd avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-gobject avahi-autoipd avahi-ui-utils avahi-utils libavahi-ui libavahi-ui-dev"
+ ${AVAHI_GTK} \
+ "
-FILES_avahi-systemd = "${base_libdir}/systemd"
-RDEPENDS_avahi-systemd = "avahi-daemon"
+AVAHI_GTK ?= "--disable-gtk --disable-gtk3"
-pkg_postinst_avahi-systemd() {
- # can't do this offline
- if [ "x$D" != "x" ]; then
- exit 1
- fi
-
- systemctl enable avahi-daemon.service
-}
-
-pkg_postrm_avahi-systemd() {
- # can't do this offline
- if [ "x$D" != "x" ]; then
- exit 1
- fi
+LDFLAGS_append_libc-uclibc = " -lintl"
+LDFLAGS_append_uclinux-uclibc = " -lintl"
- systemctl disable avahi-daemon.service
+do_configure_prepend() {
+ sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i configure.ac
}
-# uclibc has no nss
-RRECOMMENDS_avahi-daemon_append_libc-glibc = "libnss-mdns"
-RRECOMMENDS_${PN}_append_libc-glibc = "libnss-mdns"
-RDEPENDS_avahi-daemon = "sysvinit-pidof"
+PACKAGES =+ "avahi-systemd avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils"
+FILES_avahi-systemd = "${base_libdir}/systemd"
FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
${sysconfdir}/avahi/avahi-autoipd.action \
${sysconfdir}/dhcp3/*/avahi-autoipd"
FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
-FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*"
-FILES_libavahi-ui-dev = "${libdir}/libavahi-ui.* \
- ${includedir}/avahi-ui/* \
- ${libdir}/pkgconfig/avahi-ui.pc"
FILES_avahi-daemon = "${sbindir}/avahi-daemon \
${sysconfdir}/avahi/avahi-daemon.conf \
${sysconfdir}/avahi/hosts \
@@ -88,16 +69,19 @@ FILES_avahi-daemon = "${sbindir}/avahi-daemon \
${datadir}/avahi/service-types \
${datadir}/dbus-1/system-services"
FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
+FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*"
FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
${sysconfdir}/avahi/avahi-dnsconfd.action \
${sysconfdir}/init.d/avahi-dnsconfd"
FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*"
FILES_avahi-utils = "${bindir}/avahi-*"
-FILES_avahi-ui-utils = "${bindir}/bssh ${bindir}/bvnc ${bindir}/bshell \
- ${bindir}/avahi-discover-standalone \
- ${datadir}/applications \
- ${datadir}/avahi/interfaces"
+
+RDEPENDS_avahi-daemon = "sysvinit-pidof"
+
+# uclibc has no nss
+RRECOMMENDS_avahi-daemon_append_libc-glibc = "libnss-mdns"
+RRECOMMENDS_${PN}_append_libc-glibc = "libnss-mdns"
RRECOMMENDS_avahi-dev = "expat-dev libcap-dev libdaemon-dev dbus-dev glib-2.0-dev update-rc.d-dev"
RRECOMMENDS_avahi-dev_append_libc-glibc = " gettext-dev"
@@ -119,6 +103,14 @@ do_install() {
# /var/run of current version is empty, so just remove it.
# if /var/run become non-empty in the future, need to install it via volatile
rm -rf ${D}/var/run
+ rm -rf ${D}${datadir}/dbus-1/interfaces
+}
+
+do_install_avahi-autoipd() {
+ autotools_do_install
+ install -d ${D}${sysconfdir}/udhcpc.d
+ install ${WORKDIR}/00avahi-autoipd ${D}${sysconfdir}/udhcpc.d
+ install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d
}
# At the time the postinst runs, dbus might not be setup so only restart if running
@@ -157,9 +149,21 @@ pkg_postrm_avahi-autoipd () {
delgroup avahi-autoipd || true
}
-do_install_avahi-autoipd() {
- autotools_do_install
- install -d ${D}${sysconfdir}/udhcpc.d
- install ${WORKDIR}/00avahi-autoipd ${D}${sysconfdir}/udhcpc.d
- install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d
+pkg_postinst_avahi-systemd() {
+ # can't do this offline
+ if [ "x$D" != "x" ]; then
+ exit 1
+ fi
+
+ systemctl enable avahi-daemon.service
}
+
+pkg_postrm_avahi-systemd() {
+ # can't do this offline
+ if [ "x$D" != "x" ]; then
+ exit 1
+ fi
+
+ systemctl disable avahi-daemon.service
+}
+
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
index 05716d0..692a5df 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
@@ -6,7 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \
file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
-PR = "r4"
+PR = "${INC_PR}.0"
+
+DEPENDS += "intltool-native"
+
+PACKAGES =+ "libavahi-gobject"
SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43"
SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f"
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* [RC Fixes 09/19] rpm: add multilib prefix for archs under deploy/rpm
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
` (7 preceding siblings ...)
2011-09-21 9:39 ` [RC Fixes 08/19] avahi: Refactor recipe to move UI to avahi-ui Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 9:39 ` [RC Fixes 10/19] multilib: install MULTILIB_IMAGE_INSTALL Saul Wold
` (10 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
Currently MACHINE_ARCH deploy folder is unique in multilib system, thus
a lib32 version of rpm package will override a normal rpm package if
its PACKAGE_ARCH is ${MACHINE_ARCH}.
Define different deploy folder for multilib architectures to avoid the
confliction.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/classes/multilib.bbclass | 5 +++++
meta/classes/rootfs_rpm.bbclass | 4 +++-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 583d76b..138dd27 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -76,4 +76,9 @@ python __anonymous () {
multilib_map_variable("PACKAGES_DYNAMIC", variant, d)
multilib_map_variable("PACKAGE_INSTALL", variant, d)
multilib_map_variable("INITSCRIPT_PACKAGES", variant, d)
+
+ package_arch = d.getVar("PACKAGE_ARCH", True)
+ machine_arch = d.getVar("MACHINE_ARCH", True)
+ if package_arch == machine_arch:
+ d.setVar("PACKAGE_ARCH", variant + "_" + package_arch)
}
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 135ca75..7936d77 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -218,7 +218,9 @@ python () {
default_tune = localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False)
if default_tune:
localdata.setVar("DEFAULTTUNE", default_tune)
- ml_package_archs += localdata.getVar("PACKAGE_ARCHS", True) or ""
+ localdata.setVar("MACHINE_ARCH", eext[1] + "_" + localdata.getVar("MACHINE_ARCH", False))
+ package_archs = localdata.getVar("PACKAGE_ARCHS", True) or ""
+ ml_package_archs += " " + package_archs
#bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides))
bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d)
}
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* [RC Fixes 10/19] multilib: install MULTILIB_IMAGE_INSTALL
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
` (8 preceding siblings ...)
2011-09-21 9:39 ` [RC Fixes 09/19] rpm: add multilib prefix for archs under deploy/rpm Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 9:39 ` [RC Fixes 11/19] Fix RPM dependencies Saul Wold
` (9 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
If user set MULTILIB_IMAGE_INSTALL, we need to install those multitlib
packages into the final image.
Also fix the logic in handling multilib prefix. For certain case like a
normal image contains several multilib libraries, the image recipe isn't
extended with MLPREFIX, therefore we need to enumerate the possible
multilib prefixes and compare them with package prefixes.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/classes/package_rpm.bbclass | 42 +++++++++++++++++++++++++------------
meta/classes/rootfs_rpm.bbclass | 4 +++
2 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 9ef1acd..4605ec8 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -166,7 +166,7 @@ package_install_internal_rpm () {
local platform="${INSTALL_PLATFORM_RPM}"
local platform_extra="${INSTALL_PLATFORM_EXTRA_RPM}"
local confbase="${INSTALL_CONFBASE_RPM}"
- local package_to_install="${INSTALL_PACKAGES_NORMAL_RPM}"
+ local package_to_install="${INSTALL_PACKAGES_NORMAL_RPM} ${INSTALL_PACKAGES_MULTILIB_RPM}"
local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_RPM}"
local package_linguas="${INSTALL_PACKAGES_LINGUAS_RPM}"
local providename="${INSTALL_PROVIDENAME_RPM}"
@@ -210,10 +210,15 @@ package_install_internal_rpm () {
echo "Processing $pkg..."
archvar=base_archs
- ml_pkg=$(echo ${pkg} | sed "s,^${MLPREFIX}\(.*\),\1,")
- if [ "${ml_pkg}" != "${pkg}" ]; then
- archvar=ml_archs
- fi
+ ml_prefix=`echo ${pkg} | cut -d'-' -f1`
+ ml_pkg=$pkg
+ for i in ${MULTILIB_PREFIX_LIST} ; do
+ if [ ${ml_prefix} == ${i} ]; then
+ ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,")
+ archvar=ml_archs
+ break
+ fi
+ done
pkg_name=$(resolve_package_rpm ${confbase}-${archvar}.conf ${ml_pkg})
if [ -z "$pkg_name" ]; then
@@ -224,16 +229,20 @@ package_install_internal_rpm () {
done
fi
fi
-
if [ ! -z "${package_to_install}" ]; then
for pkg in ${package_to_install} ; do
echo "Processing $pkg..."
archvar=base_archs
- ml_pkg=$(echo ${pkg} | sed "s,^${MLPREFIX}\(.*\),\1,")
- if [ "${ml_pkg}" != "${pkg}" ]; then
- archvar=ml_archs
- fi
+ ml_prefix=`echo ${pkg} | cut -d'-' -f1`
+ ml_pkg=$pkg
+ for i in ${MULTILIB_PREFIX_LIST} ; do
+ if [ ${ml_prefix} == ${i} ]; then
+ ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,")
+ archvar=ml_archs
+ break
+ fi
+ done
pkg_name=$(resolve_package_rpm ${confbase}-${archvar}.conf ${ml_pkg})
if [ -z "$pkg_name" ]; then
@@ -258,10 +267,15 @@ package_install_internal_rpm () {
for pkg in ${package_attemptonly} ; do
echo "Processing $pkg..."
archvar=base_archs
- ml_pkg=$(echo ${pkg} | sed "s,^${MLPREFIX}\(.*\),\1,")
- if [ "${ml_pkg}" != "${pkg}" ]; then
- archvar=ml_archs
- fi
+ ml_prefix=`echo ${pkg} | cut -d'-' -f1`
+ ml_pkg=$pkg
+ for i in ${MULTILIB_PREFIX_LIST} ; do
+ if [ ${ml_prefix} == ${i} ]; then
+ ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,")
+ archvar=ml_archs
+ break
+ fi
+ done
pkg_name=$(resolve_package_rpm ${confbase}-${archvar}.conf ${ml_pkg})
if [ -z "$pkg_name" ]; then
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 7936d77..5ac6bca 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -58,6 +58,7 @@ fakeroot rootfs_rpm_do_rootfs () {
export INSTALL_PLATFORM_RPM="${TARGET_ARCH}"
export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}"
export INSTALL_PACKAGES_NORMAL_RPM="${PACKAGE_INSTALL}"
+ export INSTALL_PACKAGES_MULTILIB_RPM="${MULTILIB_PACKAGE_INSTALL}"
export INSTALL_PACKAGES_ATTEMPTONLY_RPM="${PACKAGE_INSTALL_ATTEMPTONLY}"
export INSTALL_PACKAGES_LINGUAS_RPM="${LINGUAS_INSTALL}"
export INSTALL_PROVIDENAME_RPM=""
@@ -210,6 +211,7 @@ python () {
bb.data.setVar('RPM_POSTPROCESS_COMMANDS', '', d)
ml_package_archs = ""
+ ml_prefix_list = ""
multilibs = d.getVar('MULTILIBS', True) or ""
for ext in multilibs.split():
eext = ext.split(':')
@@ -221,6 +223,8 @@ python () {
localdata.setVar("MACHINE_ARCH", eext[1] + "_" + localdata.getVar("MACHINE_ARCH", False))
package_archs = localdata.getVar("PACKAGE_ARCHS", True) or ""
ml_package_archs += " " + package_archs
+ ml_prefix_list += " " + eext[1]
#bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides))
bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d)
+ bb.data.setVar('MULTILIB_PREFIX_LIST', ml_prefix_list, d)
}
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* [RC Fixes 11/19] Fix RPM dependencies
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
` (9 preceding siblings ...)
2011-09-21 9:39 ` [RC Fixes 10/19] multilib: install MULTILIB_IMAGE_INSTALL Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 9:39 ` [RC Fixes 12/19] Add a run-time dependency that eglibc support GNU_HASH Saul Wold
` (8 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
When packaging for RPM, dependencies were not being properly added
to the packages. Only the "providing" dependencies were added due
to a typo.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/classes/package_rpm.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 4605ec8..d822b54 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -840,7 +840,7 @@ python do_package_rpm () {
os.chmod(outdepends, 0755)
# Poky / RPM Provides
- outprovides = workdir + "/" + srcname + ".requires"
+ outprovides = workdir + "/" + srcname + ".provides"
try:
from __builtin__ import file
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* [RC Fixes 12/19] Add a run-time dependency that eglibc support GNU_HASH
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
` (10 preceding siblings ...)
2011-09-21 9:39 ` [RC Fixes 11/19] Fix RPM dependencies Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 9:39 ` [RC Fixes 13/19] Update python dependencies to be simply to "python" Saul Wold
` (7 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
RPM checks to see if binaries require GNU_HASH, if they do it adds
an automatic dependency of "rtld(GNU_HASH)". We need to satisfy
this dependency, and we do it by providing rtld(GNU_HASH) in the
package(s) that provide a runtime-linker.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-core/eglibc/eglibc-package.inc | 3 ++-
meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +-
meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 469e02d..519a49c 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -22,7 +22,8 @@ PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}"
-RPROVIDES_${PN} = "glibc${PKGSUFFIX}"
+# The ld.so in this eglibc supports the GNU_HASH
+RPROVIDES_${PN} = "glibc${PKGSUFFIX} rtld(GNU_HASH)"
RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils"
RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic"
RPROVIDES_${PN}-dev = "glibc${PKGSUFFIX}-dev"
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
index a71c4d4..a9d208b 100644
--- a/meta/recipes-core/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -1,7 +1,7 @@
require eglibc.inc
DEPENDS += "gperf-native"
-PR = "r23"
+PR = "r24"
SRCREV = "14158"
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index b2da697..b549496 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -3,7 +3,7 @@ require eglibc.inc
SRCREV = "14157"
DEPENDS += "gperf-native"
-PR = "r14"
+PR = "r15"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_13"
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* [RC Fixes 13/19] Update python dependencies to be simply to "python"
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
` (11 preceding siblings ...)
2011-09-21 9:39 ` [RC Fixes 12/19] Add a run-time dependency that eglibc support GNU_HASH Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 9:39 ` [RC Fixes 14/19] busybox: Enhance to add dynamic per-file provides Saul Wold
` (6 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Previously python dependencies were of the format "python(abi) = ..."
This format is not yet supportable within OE, so revert to a form
we know we can handle.
Introduce a change to package.bbclass that ensures it will causes the
sstate-cache's "package" to invalidate. Since pythondeps changed, the
output of rpmdeps changes, which causes the per-file dependency
information to change.... thus we need to invalidate the cache!
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/classes/package.bbclass | 6 ++++++
meta/recipes-devtools/rpm/rpm/pythondeps.sh | 16 ++++++++++++++++
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 4 +++-
3 files changed, 25 insertions(+), 1 deletions(-)
create mode 100755 meta/recipes-devtools/rpm/rpm/pythondeps.sh
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 3f5c904..e581ae2 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1,3 +1,9 @@
+# Change the following version to cause sstate to invalidate the package
+# cache. This is useful if an item this class depends on changes in a
+# way that the output of this class changes. rpmdeps is a good example
+# as any change to rpmdeps requires this to be rerun.
+PACKAGE_BBCLASS_VERSION = "r1"
+
#
# Packaging process
#
diff --git a/meta/recipes-devtools/rpm/rpm/pythondeps.sh b/meta/recipes-devtools/rpm/rpm/pythondeps.sh
new file mode 100755
index 0000000..083b174
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/pythondeps.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+[ $# -ge 1 ] || {
+ cat > /dev/null
+ exit 0
+}
+
+case $1 in
+-R|--requires)
+ shift
+ grep "/usr/\(lib[^/]*\|share\)/python[^/]*/" >/dev/null && echo "python"
+ exit 0
+ ;;
+esac
+
+exit 0
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index b805f7d..a7b360d 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
extrarpmdeps = "python perl"
extrarpmdeps_virtclass-native = ""
-PR = "r20"
+PR = "r21"
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -63,6 +63,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex
file://rpm-fileclass.patch \
file://rpm-canonarch.patch \
file://rpm-no-loopmsg.patch \
+ file://pythondeps.sh \
"
# file://rpm-autoconf.patch \
@@ -352,6 +353,7 @@ do_install_append() {
# Enable Debian style arbitrary tags...
sed -i -e 's,%_arbitrary_tags[^_].*,%_arbitrary_tags %{_arbitrary_tags_debian},' ${D}/${libdir}/rpm/macros
+ install -m 0755 ${WORKDIR}/pythondeps.sh ${D}/${libdir}/rpm/pythondeps.sh
install -m 0755 ${WORKDIR}/perfile_rpmdeps.sh ${D}/${libdir}/rpm/perfile_rpmdeps.sh
# Remove unpackaged files (based on list in rpm.spec)
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* [RC Fixes 14/19] busybox: Enhance to add dynamic per-file provides
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
` (12 preceding siblings ...)
2011-09-21 9:39 ` [RC Fixes 13/19] Update python dependencies to be simply to "python" Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 9:39 ` [RC Fixes 15/19] multilib_global.bbclass: Fix non-multilib package provides Saul Wold
` (5 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
When using the RPM package backend, we need a full list of per-file
provides (and requires). The busybox package provides a number of
command line utilities, such as /usr/bin/env. However, because
the utilities are created at post install time via scripting the
provide of each of the links was never made. So any programs,
such as python, that require /usr/bin/env were unable to resolve
the dependency and failed.
This change only affects packaging backends that use per-file
dependency data. Currently RPM is the only packaging backend
with this ability.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-core/busybox/busybox.inc | 32 +++++++++++++++++++++++++++
meta/recipes-core/busybox/busybox_1.18.5.bb | 2 +-
2 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 3f93358..acd635b 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -205,6 +205,38 @@ do_install () {
install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
}
+python package_do_filedeps_append () {
+ # We need to load the full set of busybox provides from the /etc/busybox.links
+ # The pkg_postinst_ is what creates the actual links
+
+ pkg = d.getVar('PN', True)
+ f_busybox = "/bin/busybox"
+ f_busybox_links = "/etc/busybox.links"
+
+ requires_files = []
+ provides_files = []
+
+ # Load/backup original set
+ filerprovides = d.getVar('FILERPROVIDES_%s_%s' % (f_busybox, pkg), True) or ""
+
+ dep_pipe = os.popen('sed -e "s,^,Provides: ," %s/%s%s' % (pkgdest, pkg, f_busybox_links))
+
+ process_deps(dep_pipe, pkg, "%s/%s%s" % (pkgdest, pkg, f_busybox), provides_files, requires_files)
+
+ # Add the new set
+ filerprovides += d.getVar('FILERPROVIDES_%s_%s' % (f_busybox, pkg), True) or ""
+
+ # Make sure there is an entry for this item in the FILERPROVIDESFLIST...
+ filerprovidesflist = (d.getVar('FILERPROVIDESFLIST_%s' % pkg, True) or "").split()
+ for file in provides_files:
+ if file not in filerprovidesflist:
+ filerprovidesflist.append(file)
+ d.setVar('FILERPROVIDESFLIST_%s' % pkg, " ".join(filerprovidesflist))
+
+ # Store the new provides
+ d.setVar('FILERPROVIDES_%s_%s' % (f_busybox, pkg), filerprovides)
+}
+
pkg_postinst_${PN} () {
# If we are not making an image we create links for the utilities that doesn't exist
# so the update-alternatives script will get the utilities it needs
diff --git a/meta/recipes-core/busybox/busybox_1.18.5.bb b/meta/recipes-core/busybox/busybox_1.18.5.bb
index c0dc1d4..bdafb31 100644
--- a/meta/recipes-core/busybox/busybox_1.18.5.bb
+++ b/meta/recipes-core/busybox/busybox_1.18.5.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://udhcpscript.patch \
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* [RC Fixes 15/19] multilib_global.bbclass: Fix non-multilib package provides
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
` (13 preceding siblings ...)
2011-09-21 9:39 ` [RC Fixes 14/19] busybox: Enhance to add dynamic per-file provides Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 9:39 ` [RC Fixes 16/19] Fix alsa-utils package dependencies Saul Wold
` (4 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
In non-multilib packages, configured in a multilib configuration we
need to adjust the system provides and rprovides to include the
virtual multilib variant.
This resolves a problem introduced in the
329d864f9bbf94ad3aae8df43d63fe10e4237e4f commit. Where "allarch"
packages were suddenly providing all variants of an object.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/classes/multilib_global.bbclass | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index ed14565..cd22163 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -6,16 +6,33 @@ python multilib_virtclass_handler_global () {
if isinstance(e, bb.event.RecipeParsed) and not variant:
if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data) or bb.data.inherits_class('allarch', e.data):
- origprovs = provs = e.data.getVar("PROVIDES", True)
- rprovs = e.data.getVar("RPROVIDES", True)
variants = (e.data.getVar("MULTILIB_VARIANTS", True) or "").split()
+
+ # Process PROVIDES
+ origprovs = provs = e.data.getVar("PROVIDES", True) or ""
for variant in variants:
provs = provs + " " + multilib_map_variable("PROVIDES", variant, e.data)
- for pkg in e.data.getVar("PACKAGES", True).split():
- rprovs = rprovs + " " + variant + "-" + pkg
+ # Reset to original value so next time around multilib_map_variable works properly
e.data.setVar("PROVIDES", origprovs)
e.data.setVar("PROVIDES", provs)
+
+ # Process RPROVIDES
+ origrprovs = rprovs = e.data.getVar("RPROVIDES", True) or ""
+ for variant in variants:
+ rprovs = rprovs + " " + multilib_map_variable("RPROVIDES", variant, e.data)
+ # Reset to original value so next time around multilib_map_variable works properly
+ e.data.setVar("RPROVIDES", origrprovs)
e.data.setVar("RPROVIDES", rprovs)
+
+ # Process RPROVIDES_${PN}...
+ for pkg in (e.data.getVar("PACKAGES", True) or "").split():
+ origrprovs = rprovs = e.data.getVar("RPROVIDES_%s" % pkg, True) or ""
+ for variant in variants:
+ rprovs = rprovs + " " + multilib_map_variable("RPROVIDES_%s" % pkg, variant, e.data)
+ rprovs = rprovs + " " + variant + "-" + pkg
+ # Reset to original value so next time around multilib_map_variable works properly
+ e.data.setVar("RPROVIDES_%s" % pkg, origrprovs)
+ e.data.setVar("RPROVIDES_%s" % pkg, rprovs)
}
addhandler multilib_virtclass_handler_global
@@ -35,7 +52,7 @@ def multilib_extend_name(variant, name):
def multilib_map_variable(varname, variant, d):
var = d.getVar(varname, True)
if not var:
- return
+ return ""
var = var.split()
newvar = []
for v in var:
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* [RC Fixes 16/19] Fix alsa-utils package dependencies
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
` (14 preceding siblings ...)
2011-09-21 9:39 ` [RC Fixes 15/19] multilib_global.bbclass: Fix non-multilib package provides Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 9:39 ` [RC Fixes 17/19] oprofileui: Change avahi to avahi-ui depends Saul Wold
` (3 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
From: Daniel Lazzari <dlazzari@leapfrog.com>
Make alsa-utils main package depend on all of the more specific alsa-utils packages (such as alsa-utils-alsamixer).
Signed-off-by: Daniel Lazzari Jr <dlazzari@leapfrog.com>
PR Bump
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb
index 52a7871..1b3ffe1 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
DEPENDS = "alsa-lib ncurses"
-PR = "r1"
+PR = "r2"
SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
file://ncursesfix.patch \
@@ -28,7 +28,7 @@ inherit autotools gettext
# This are all packages that we need to make. Also, the now empty alsa-utils
# ipk depends on them.
-PACKAGES += "\
+ALSA_UTILS_PKGS = "\
alsa-utils-alsamixer \
alsa-utils-midi \
alsa-utils-aplay \
@@ -44,6 +44,9 @@ PACKAGES += "\
alsa-utils-alsaucm \
"
+PACKAGES += "${ALSA_UTILS_PKGS}"
+RDEPENDS_${PN} += "${ALSA_UTILS_PKGS}"
+
# We omit alsaconf, because
# a) this is a bash script
# b) it creates config files not suitable for OE-based distros
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* [RC Fixes 17/19] oprofileui: Change avahi to avahi-ui depends
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
` (15 preceding siblings ...)
2011-09-21 9:39 ` [RC Fixes 16/19] Fix alsa-utils package dependencies Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 9:39 ` [RC Fixes 18/19] libpng: avoid dangling link in libpng package Saul Wold
` (2 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-kernel/oprofile/oprofileui.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-kernel/oprofile/oprofileui.inc b/meta/recipes-kernel/oprofile/oprofileui.inc
index 731e037..5170357 100644
--- a/meta/recipes-kernel/oprofile/oprofileui.inc
+++ b/meta/recipes-kernel/oprofile/oprofileui.inc
@@ -8,7 +8,7 @@ SECTION = "x11"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "glib-2.0 gtk+ libglade gnome-vfs libxml2 avahi gconf"
+DEPENDS = "glib-2.0 gtk+ libglade gnome-vfs libxml2 avahi-ui gconf"
inherit autotools pkgconfig gtk-icon-cache
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* [RC Fixes 18/19] libpng: avoid dangling link in libpng package
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
` (16 preceding siblings ...)
2011-09-21 9:39 ` [RC Fixes 17/19] oprofileui: Change avahi to avahi-ui depends Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 9:39 ` [RC Fixes 19/19] libpng: add libpng12-dev packages Saul Wold
2011-09-21 12:44 ` [RC Fixes 00/19] Fixes for Multi-Lib & other patches Richard Purdie
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
As for libpng recipe, the libpng.pc is a symbol link to libpng12.pc,
if packaging them into two different packages, we will get a dangling
link for libpng.pc, and when calculating rpm dependency with that file,
we will get nothing.
Only keep one version of dev package to fix the issue.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/recipes-multimedia/libpng/libpng_1.2.46.bb | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-multimedia/libpng/libpng_1.2.46.bb b/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
index 57d9037..0a28709 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
@@ -6,7 +6,7 @@ LICENSE = "Libpng"
LIC_FILES_CHKSUM = "file://LICENSE;md5=21b4b6e3523afa9f03f00b43b991dad0 \
file://png.h;startline=172;endline=261;md5=996460063a9bf2de35b2d61d2776dabc"
DEPENDS = "zlib"
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.bz2"
@@ -15,11 +15,9 @@ SRC_URI[sha256sum] = "a5e796e1802b2e221498bda09ff9850bc7ec9068b6788948cc2c42af21
inherit autotools binconfig pkgconfig
-PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev"
+PACKAGES =+ "${PN}12"
-FILES_${PN}12-dbg = "${libdir}/.debug/libpng12*"
FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}"
-FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc"
FILES_${PN} = "${libdir}/lib*${SOLIBS}"
FILES_${PN}-dev += " ${bindir} ${sbindir}"
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* [RC Fixes 19/19] libpng: add libpng12-dev packages
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
` (17 preceding siblings ...)
2011-09-21 9:39 ` [RC Fixes 18/19] libpng: avoid dangling link in libpng package Saul Wold
@ 2011-09-21 9:39 ` Saul Wold
2011-09-21 12:44 ` [RC Fixes 00/19] Fixes for Multi-Lib & other patches Richard Purdie
19 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2011-09-21 9:39 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
When build sato-sdk image, the libmatchbox-dev needs the libpng12-dev
package, thus we need it.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/recipes-multimedia/libpng/libpng_1.2.46.bb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-multimedia/libpng/libpng_1.2.46.bb b/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
index 0a28709..05d0ae4 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.2.46.bb
@@ -6,7 +6,7 @@ LICENSE = "Libpng"
LIC_FILES_CHKSUM = "file://LICENSE;md5=21b4b6e3523afa9f03f00b43b991dad0 \
file://png.h;startline=172;endline=261;md5=996460063a9bf2de35b2d61d2776dabc"
DEPENDS = "zlib"
-PR = "r1"
+PR = "r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.bz2"
@@ -15,10 +15,10 @@ SRC_URI[sha256sum] = "a5e796e1802b2e221498bda09ff9850bc7ec9068b6788948cc2c42af21
inherit autotools binconfig pkgconfig
-PACKAGES =+ "${PN}12"
+PACKAGES =+ "${PN}12 ${PN}12-dev"
FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}"
FILES_${PN} = "${libdir}/lib*${SOLIBS}"
-FILES_${PN}-dev += " ${bindir} ${sbindir}"
+FILES_${PN}12-dev += " ${bindir} ${sbindir}"
BBCLASSEXTEND = "native"
--
1.7.6
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [RC Fixes 00/19] Fixes for Multi-Lib & other patches
2011-09-21 9:39 [RC Fixes 00/19] Fixes for Multi-Lib & other patches Saul Wold
` (18 preceding siblings ...)
2011-09-21 9:39 ` [RC Fixes 19/19] libpng: add libpng12-dev packages Saul Wold
@ 2011-09-21 12:44 ` Richard Purdie
19 siblings, 0 replies; 22+ messages in thread
From: Richard Purdie @ 2011-09-21 12:44 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-09-21 at 02:39 -0700, Saul Wold wrote:
> I have build (not booted) these fixes and for the most part
> they seem to address alot of the issues we have seen. There
> is still some problems with python and gtk+ needing to be
> cleaned before do_rootfs is sucessful.
>
> This is a major step forward based on some of the issues we
> have seen and may require some additional fixes for an RC4.
>
> The following changes since commit 81274f4488fbc4d68d150870735ec0181b60b451:
>
> freetype: disable bzip2 compressed font support (2011-09-19 13:14:03 +0100)
>
> are available in the git repository at:
> git://git.yoctoproject.org/poky-contrib sgw/stage
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/stage
>
> Anders Darander (3):
> libzypp: git repo moved to github
> sat-solver: git repo moved to github
> zypper: git repo moved to github
>
> Daniel Lazzari (1):
> Fix alsa-utils package dependencies
>
> Dexuan Cui (1):
> deb packages support: switch from /var/dpkg to /var/lib/dpkg
>
> Dongxiao Xu (4):
> rpm: add multilib prefix for archs under deploy/rpm
> multilib: install MULTILIB_IMAGE_INSTALL
> libpng: avoid dangling link in libpng package
I took all the above.
> libpng: add libpng12-dev packages
I did not take this since I believe it was incorrect. Instead I've
pushed an RPROVIDES addition.
>
> Mark Hatle (5):
> Fix RPM dependencies
> Add a run-time dependency that eglibc support GNU_HASH
> Update python dependencies to be simply to "python"
This change wasn't what I meant to invalidate the sstate cache. I've
changed it to do what I was meaning.
> busybox: Enhance to add dynamic per-file provides
> multilib_global.bbclass: Fix non-multilib package provides
>
> Paul Eggleton (1):
> scripts/combo-layer: fix still overzealous regex in default hook
> script
>
> Saul Wold (4):
> distrodata: fix distro_check code
> distro tracking: Update Distro Aliases
> avahi: Refactor recipe to move UI to avahi-ui
> oprofileui: Change avahi to avahi-ui depends
and I took the rest of the above apart from the patch Koen is
questioning.
Cheers,
Richard
^ permalink raw reply [flat|nested] 22+ messages in thread