* [PATCH 01/40] resolveconf: Fix file owners
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
@ 2011-06-22 17:35 ` Mark Hatle
2011-06-23 23:30 ` Khem Raj
2011-06-22 17:35 ` [PATCH 02/40] base-passwd: Fix owners/groups Mark Hatle
` (38 subsequent siblings)
39 siblings, 1 reply; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:35 UTC (permalink / raw)
To: openembedded-core
The file ownership of various configuration files needs to be set to root:root
otherwise it inherits the user id of the build.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../resolvconf/resolvconf_1.48.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.48.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.48.bb
index cb8aaaf..507a233 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.48.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.48.bb
@@ -11,7 +11,7 @@ AUTHOR = "Thomas Hood"
HOMEPAGE = "http://packages.debian.org/resolvconf"
DEPENDS = "bash"
RDEPENDS_${PN} = "bash"
-PR = "r0"
+PR = "r1"
SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
@@ -27,6 +27,7 @@ do_install () {
install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/volatile/run/resolvconf/interface
install -d ${D}${mandir}/man8 ${D}${docdir}/${P}
cp -pPR etc/* ${D}${sysconfdir}/
+ chown -R root:root ${D}${sysconfdir}/
install -m 0755 bin/resolvconf ${D}${base_sbindir}/
install -m 0644 README ${D}${docdir}/${P}/
install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* Re: [PATCH 01/40] resolveconf: Fix file owners
2011-06-22 17:35 ` [PATCH 01/40] resolveconf: Fix file owners Mark Hatle
@ 2011-06-23 23:30 ` Khem Raj
0 siblings, 0 replies; 50+ messages in thread
From: Khem Raj @ 2011-06-23 23:30 UTC (permalink / raw)
To: openembedded-core
On 06/22/2011 10:35 AM, Mark Hatle wrote:
> The file ownership of various configuration files needs to be set to root:root
> otherwise it inherits the user id of the build.
>
> Signed-off-by: Mark Hatle<mark.hatle@windriver.com>
> ---
> .../resolvconf/resolvconf_1.48.bb | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.48.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.48.bb
> index cb8aaaf..507a233 100644
> --- a/meta/recipes-connectivity/resolvconf/resolvconf_1.48.bb
> +++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.48.bb
> @@ -11,7 +11,7 @@ AUTHOR = "Thomas Hood"
> HOMEPAGE = "http://packages.debian.org/resolvconf"
> DEPENDS = "bash"
> RDEPENDS_${PN} = "bash"
> -PR = "r0"
> +PR = "r1"
>
> SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
>
> @@ -27,6 +27,7 @@ do_install () {
> install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/volatile/run/resolvconf/interface
> install -d ${D}${mandir}/man8 ${D}${docdir}/${P}
> cp -pPR etc/* ${D}${sysconfdir}/
> + chown -R root:root ${D}${sysconfdir}/
you can also modify install command 3 lines above
--group=GROUP
--mode=MODE
--owner=OWNER
--preserve-timestamps
one of above options is what you need.
> install -m 0755 bin/resolvconf ${D}${base_sbindir}/
> install -m 0644 README ${D}${docdir}/${P}/
> install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/
^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 02/40] base-passwd: Fix owners/groups
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
2011-06-22 17:35 ` [PATCH 01/40] resolveconf: Fix file owners Mark Hatle
@ 2011-06-22 17:35 ` Mark Hatle
2011-06-22 17:35 ` [PATCH 03/40] gcc: " Mark Hatle
` (37 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:35 UTC (permalink / raw)
To: openembedded-core
Fix the owners and groups of specific files copied from the developmen tree.
This resolves an issue where those files gain the user/group id of the build
user.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../recipes-core/base-passwd/base-passwd_3.5.22.bb | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
index 3315c68..7b1fdf1 100644
--- a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
+++ b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
@@ -1,7 +1,7 @@
SUMMARY = "Base system master password/group files."
DESCRIPTION = "The master copies of the user database files (/etc/passwd and /etc/group). The update-passwd tool is also provided to keep the system databases synchronized with these master files."
SECTION = "base"
-PR = "r2"
+PR = "r3"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
@@ -21,16 +21,16 @@ SSTATEPOSTINSTFUNCS += "base_passwd_sstate_postinst"
do_install () {
install -d -m 755 ${D}${sbindir}
- install -p -m 755 update-passwd ${D}${sbindir}/
+ install -o root -g root -p -m 755 update-passwd ${D}${sbindir}/
install -d -m 755 ${D}${mandir}/man8 ${D}${mandir}/pl/man8
install -p -m 644 man/update-passwd.8 ${D}${mandir}/man8/
install -p -m 644 man/update-passwd.pl.8 \
${D}${mandir}/pl/man8/update-passwd.8
gzip -9 ${D}${mandir}/man8/* ${D}${mandir}/pl/man8/*
install -d -m 755 ${D}${datadir}/base-passwd
- install -p -m 644 passwd.master ${D}${datadir}/base-passwd/
- install -p -m 644 group.master ${D}${datadir}/base-passwd/
- install -p -m 644 ${S}/../login.defs ${D}${datadir}/base-passwd/login.defs
+ install -o root -g root -p -m 644 passwd.master ${D}${datadir}/base-passwd/
+ install -o root -g root -p -m 644 group.master ${D}${datadir}/base-passwd/
+ install -o root -g root -p -m 644 ${S}/../login.defs ${D}${datadir}/base-passwd/login.defs
install -d -m 755 ${D}${docdir}/${PN}
install -p -m 644 debian/changelog ${D}${docdir}/${PN}/
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 03/40] gcc: Fix owners/groups
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
2011-06-22 17:35 ` [PATCH 01/40] resolveconf: Fix file owners Mark Hatle
2011-06-22 17:35 ` [PATCH 02/40] base-passwd: Fix owners/groups Mark Hatle
@ 2011-06-22 17:35 ` Mark Hatle
2011-06-22 17:35 ` [PATCH 04/40] ghostscript: Fix owner/group of /etc/cups Mark Hatle
` (36 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:35 UTC (permalink / raw)
To: openembedded-core
Many of the files being generated by gcc are gaining the build uid/gid. This
is incorrect, as the files should be owned by root:root.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-devtools/gcc/gcc-4.6.0.inc | 2 +-
meta/recipes-devtools/gcc/gcc_4.5.1.bb | 7 ++++++-
meta/recipes-devtools/gcc/gcc_4.6.0.bb | 5 +++++
meta/recipes-devtools/gcc/libgcc_4.5.1.bb | 3 ++-
meta/recipes-devtools/gcc/libgcc_4.6.0.bb | 3 ++-
5 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0.inc b/meta/recipes-devtools/gcc/gcc-4.6.0.inc
index cb9eb8e..5db6fda 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.0.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.0.inc
@@ -7,7 +7,7 @@ require gcc-common.inc
require gcc-4_6-branch-backports.inc
-PR = "r3"
+PR = "r4"
DEPENDS =+ "mpfr gmp libmpc"
NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native"
diff --git a/meta/recipes-devtools/gcc/gcc_4.5.1.bb b/meta/recipes-devtools/gcc/gcc_4.5.1.bb
index e04f443..2daf7fb 100644
--- a/meta/recipes-devtools/gcc/gcc_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc_4.5.1.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
require gcc-${PV}.inc
require gcc-configure-target.inc
require gcc-package-target.inc
@@ -10,3 +10,8 @@ ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
SRC_URI[md5sum] = "48231a8e33ed6e058a341c53b819de1a"
SRC_URI[sha256sum] = "45fa81face89203ccbf3ec73f7a372769d855f3ba7446f50125b613d9c163e2c"
+
+# We need to correct the owners/groups on some of the files
+do_install_append() {
+ chown -R root:root ${D}${gcclibdir}/${TARGET_SYS}/${BINV}
+}
diff --git a/meta/recipes-devtools/gcc/gcc_4.6.0.bb b/meta/recipes-devtools/gcc/gcc_4.6.0.bb
index bfaec86..e4d6fed 100644
--- a/meta/recipes-devtools/gcc/gcc_4.6.0.bb
+++ b/meta/recipes-devtools/gcc/gcc_4.6.0.bb
@@ -5,3 +5,8 @@ require gcc-package-target.inc
SRC_URI_append = "file://fortran-cross-compile-hack.patch"
ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
+
+# We need to correct the owners/groups on some of the files
+do_install_append() {
+ chown -R root:root ${D}${gcclibdir}/${TARGET_SYS}/${BINV}
+}
diff --git a/meta/recipes-devtools/gcc/libgcc_4.5.1.bb b/meta/recipes-devtools/gcc/libgcc_4.5.1.bb
index b6cf268..ea9fd8f 100644
--- a/meta/recipes-devtools/gcc/libgcc_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/libgcc_4.5.1.bb
@@ -1,6 +1,6 @@
require gcc-${PV}.inc
-PR = "r0"
+PR = "r1"
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
@@ -28,6 +28,7 @@ do_install () {
# Install libgcc from our gcc-cross saved data
install -d ${D}${base_libdir} ${D}${libdir}
cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$target/* ${D}
+ chown -R root:root ${D}
# Move libgcc_s into /lib
mkdir -p ${D}${base_libdir}
diff --git a/meta/recipes-devtools/gcc/libgcc_4.6.0.bb b/meta/recipes-devtools/gcc/libgcc_4.6.0.bb
index b6cf268..ea9fd8f 100644
--- a/meta/recipes-devtools/gcc/libgcc_4.6.0.bb
+++ b/meta/recipes-devtools/gcc/libgcc_4.6.0.bb
@@ -1,6 +1,6 @@
require gcc-${PV}.inc
-PR = "r0"
+PR = "r1"
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
@@ -28,6 +28,7 @@ do_install () {
# Install libgcc from our gcc-cross saved data
install -d ${D}${base_libdir} ${D}${libdir}
cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$target/* ${D}
+ chown -R root:root ${D}
# Move libgcc_s into /lib
mkdir -p ${D}${base_libdir}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 04/40] ghostscript: Fix owner/group of /etc/cups
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (2 preceding siblings ...)
2011-06-22 17:35 ` [PATCH 03/40] gcc: " Mark Hatle
@ 2011-06-22 17:35 ` Mark Hatle
2011-06-22 18:49 ` Phil Blundell
2011-06-22 17:35 ` [PATCH 05/40] libtirpc: Fix owner/group of /etc/netconfig Mark Hatle
` (35 subsequent siblings)
39 siblings, 1 reply; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:35 UTC (permalink / raw)
To: openembedded-core
/etc/cups is owned by root:lp from the cups package, the associated
ghostscript was creating the /etc/cups directory as root:root. /etc/cups
is the authoritative source.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../ghostscript/ghostscript_9.02.bb | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb b/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
index 3cb5485..f8a4807 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
@@ -15,7 +15,7 @@ SECTION = "console/utils"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d151214b3131251dfc9d858593acbd24"
-PR = "r2"
+PR = "r3"
DEPENDS = "${PN}-native tiff jpeg fontconfig cups"
DEPENDS_virtclass-native = ""
@@ -53,10 +53,15 @@ do_configure () {
done
}
+FIX_OWNERS = "chown -R root:lp ${D}/etc/cups"
+FIX_OWNERS_virtclass-native = ""
+
do_install_append () {
mkdir -p ${D}${datadir}/ghostscript/${PV}/
cp -r Resource ${D}${datadir}/ghostscript/${PV}/
cp -r iccprofiles ${D}${datadir}/ghostscript/${PV}/
+
+ test -n "${FIX_OWNERS}" && eval ${FIX_OWNERS} || :
}
python do_patch_virtclass-native () {
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 05/40] libtirpc: Fix owner/group of /etc/netconfig
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (3 preceding siblings ...)
2011-06-22 17:35 ` [PATCH 04/40] ghostscript: Fix owner/group of /etc/cups Mark Hatle
@ 2011-06-22 17:35 ` Mark Hatle
2011-06-22 18:58 ` Phil Blundell
2011-06-22 17:36 ` [PATCH 06/40] tzdata: Ensure all files are owned by root:root Mark Hatle
` (34 subsequent siblings)
39 siblings, 1 reply; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:35 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/libtirpc/libtirpc_0.2.1.bb | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/libtirpc/libtirpc_0.2.1.bb b/meta/recipes-extended/libtirpc/libtirpc_0.2.1.bb
index 61dab95..9032a4b 100644
--- a/meta/recipes-extended/libtirpc/libtirpc_0.2.1.bb
+++ b/meta/recipes-extended/libtirpc/libtirpc_0.2.1.bb
@@ -7,7 +7,7 @@ BUGTRACKER = "http://sourceforge.net/tracker/?group_id=183075&atid=903784"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=1c32c8e351f97e43e1ad6cf7f62de3bf \
file://src/netname.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24"
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/libtirpc/libtirpc-${PV}.tar.bz2"
@@ -15,3 +15,7 @@ SRC_URI[md5sum] = "d77eb15f464bf9d6e66259eaf78b2a4e"
SRC_URI[sha256sum] = "ea77cadd63941fc4edbee7863d2c7094e6a18263d2a2c8922319aee91352ff41"
inherit autotools
+
+do_install_append() {
+ chown root:root ${D}/etc/netconfig
+}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 06/40] tzdata: Ensure all files are owned by root:root
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (4 preceding siblings ...)
2011-06-22 17:35 ` [PATCH 05/40] libtirpc: Fix owner/group of /etc/netconfig Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 07/40] gnome-doc-utils: Fix the owner/group on select files Mark Hatle
` (33 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/tzdata/tzdata_2011g.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/tzdata/tzdata_2011g.bb b/meta/recipes-extended/tzdata/tzdata_2011g.bb
index ed343c0..49847d3 100644
--- a/meta/recipes-extended/tzdata/tzdata_2011g.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2011g.bb
@@ -6,7 +6,7 @@ LICENSE = "PD"
LIC_FILES_CHKSUM = "file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234"
DEPENDS = "tzcode-native"
-PR = "r0"
+PR = "r1"
RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \
timezone-arctic timezone-asia timezone-atlantic \
@@ -42,7 +42,7 @@ do_install () {
# libc is removing zoneinfo files from package
cp -pP "${S}/zone.tab" ${D}${datadir}/zoneinfo
cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo
-
+ chown -R root:root ${D}
}
# Packages primarily organized by directory with a major city
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 07/40] gnome-doc-utils: Fix the owner/group on select files
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (5 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 06/40] tzdata: Ensure all files are owned by root:root Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 08/40] perf: Fix linux-tools to ensure perf is installed under "fakeroot" Mark Hatle
` (32 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
All of the files in ${datadir}/xml/gnome/xslt were being given the uid/gid
of the build user. Fix this for the target case, avoid it in the native.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-gnome/gnome/gnome-doc-utils.inc | 4 ++++
meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
index b541753..4c13626 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
@@ -6,9 +6,13 @@ inherit gnome gettext
EXTRA_OECONF = "--disable-scrollkeeper"
+FIX_OWNERS = "chown -R root:root ${D}"
+FIX_OWNERS_virtclass-native = ""
+
do_install_append() {
mkdir -p ${D}${datadir}/xml/gnome/xslt/
cp -pPr ${S}/xslt/* ${D}${datadir}/xml/gnome/xslt/
+ test -n "${FIX_OWNERS}" && eval ${FIX_OWNERS} || :
}
FILES_${PN} += "${datadir}/xml*"
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
index e7bf6e9..d85697f 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
@@ -1,7 +1,7 @@
require gnome-doc-utils.inc
LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343"
-PR = "r0"
+PR = "r1"
SRC_URI += "file://xsltproc_nonet.patch"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 08/40] perf: Fix linux-tools to ensure perf is installed under "fakeroot"
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (6 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 07/40] gnome-doc-utils: Fix the owner/group on select files Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 18:50 ` Phil Blundell
2011-06-22 17:36 ` [PATCH 09/40] kernel.bbclass: Add support for perf-dbg package Mark Hatle
` (31 subsequent siblings)
39 siblings, 1 reply; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
If perf isn't installed under "fakeroot" (pseudo) control, all of the files
are given the build user's uid/gid.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-kernel/linux/linux-tools.inc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-tools.inc b/meta/recipes-kernel/linux/linux-tools.inc
index ef81650..88a1c5b 100644
--- a/meta/recipes-kernel/linux/linux-tools.inc
+++ b/meta/recipes-kernel/linux/linux-tools.inc
@@ -6,11 +6,11 @@ do_compile_perf_libc-uclibc () {
do_install_perf_libc-uclibc () {
:
}
-do_compile_perf() {
+fakeroot do_compile_perf() {
oe_runmake -C ${S}/tools/perf CC="${CC}" LD="${LD}" prefix=${prefix} NO_NEWT=1 NO_DWARF=1
}
-do_install_perf() {
+fakeroot do_install_perf() {
oe_runmake -C ${S}/tools/perf CC="${CC}" LD="${LD}" prefix=${prefix} DESTDIR=${D} install NO_NEWT=1 NO_DWARF=1
}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* Re: [PATCH 08/40] perf: Fix linux-tools to ensure perf is installed under "fakeroot"
2011-06-22 17:36 ` [PATCH 08/40] perf: Fix linux-tools to ensure perf is installed under "fakeroot" Mark Hatle
@ 2011-06-22 18:50 ` Phil Blundell
0 siblings, 0 replies; 50+ messages in thread
From: Phil Blundell @ 2011-06-22 18:50 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-06-22 at 12:36 -0500, Mark Hatle wrote:
> If perf isn't installed under "fakeroot" (pseudo) control, all of the files
> are given the build user's uid/gid.
The bit about do_install_perf() seems reasonable, but why does
do_compile_perf() need to run under fakeroot?
> diff --git a/meta/recipes-kernel/linux/linux-tools.inc b/meta/recipes-kernel/linux/linux-tools.inc
> index ef81650..88a1c5b 100644
> --- a/meta/recipes-kernel/linux/linux-tools.inc
> +++ b/meta/recipes-kernel/linux/linux-tools.inc
> @@ -6,11 +6,11 @@ do_compile_perf_libc-uclibc () {
> do_install_perf_libc-uclibc () {
> :
> }
> -do_compile_perf() {
> +fakeroot do_compile_perf() {
> oe_runmake -C ${S}/tools/perf CC="${CC}" LD="${LD}" prefix=${prefix} NO_NEWT=1 NO_DWARF=1
> }
>
> -do_install_perf() {
> +fakeroot do_install_perf() {
> oe_runmake -C ${S}/tools/perf CC="${CC}" LD="${LD}" prefix=${prefix} DESTDIR=${D} install NO_NEWT=1 NO_DWARF=1
> }
>
p.
^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 09/40] kernel.bbclass: Add support for perf-dbg package
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (7 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 08/40] perf: Fix linux-tools to ensure perf is installed under "fakeroot" Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 10/40] sysfsutils: Fall back to default -dbg package Mark Hatle
` (30 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
The perf component is built with the kernel, so ensure that it gets the
debug information associated with it.
Also bump the PR in the linux-yocto-* to ensure they get rebuilt.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/classes/kernel.bbclass | 3 ++-
meta/recipes-kernel/linux/linux-yocto_2.6.34.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 1bb69f5..aaf341b 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -496,6 +496,7 @@ addtask deploy before do_build after do_install
EXPORT_FUNCTIONS do_deploy
# perf must be enabled in individual kernel recipes
-PACKAGES =+ "perf"
+PACKAGES =+ "perf-dbg perf"
FILES_perf = "${bindir}/* \
${libexecdir}"
+FILES_perf-dbg = "${FILES_${PN}-dbg}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.34.bb b/meta/recipes-kernel/linux/linux-yocto_2.6.34.bb
index 66991ae..4891463 100644
--- a/meta/recipes-kernel/linux/linux-yocto_2.6.34.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_2.6.34.bb
@@ -22,7 +22,7 @@ SRCREV_machine_qemux86-64 = "72ca49ab08b8eb475cec82a10049503602325791"
SRCREV_machine = "72ca49ab08b8eb475cec82a10049503602325791"
SRCREV_meta = "ec26387cb168e9e0976999b528b5a9dd62e3157a"
-PR = "r1"
+PR = "r2"
PV = "${LINUX_VERSION}+git${SRCPV}"
SRCREV_FORMAT = "meta_machine"
diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
index f6abc9e..ba85208 100644
--- a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
@@ -22,7 +22,7 @@ SRCREV_machine_qemux86-64 = "1950ea205407d8950475a37404173572d55fd27f"
SRCREV_machine = "697d84759be192403a8a87ab269196c67a0c2c88"
SRCREV_meta = "46a1be20b01e50d5d0646e5622e9dd06433238c2"
-PR = "r18"
+PR = "r19"
PV = "${LINUX_VERSION}+git${SRCPV}"
SRCREV_FORMAT = "meta_machine"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 10/40] sysfsutils: Fall back to default -dbg package
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (8 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 09/40] kernel.bbclass: Add support for perf-dbg package Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 11/40] classes/package_rpm.bbclass: Enhance diagnostic messages Mark Hatle
` (29 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
The overriden -dbg package wasn't including all of the associated sources,
fall back to the default -dbg package instead.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
index 5343f64..0b3f04a 100644
--- a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
+++ b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
@@ -8,7 +8,7 @@ LICENSE_libsysfs = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=3d06403ea54c7574a9e581c6478cc393 \
file://cmd/GPL;md5=d41d4e2e1e108554e0388ea4aecd8d27 \
file://lib/LGPL;md5=b75d069791103ffe1c0d6435deeff72e"
-PR = "r1"
+PR = "r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \
file://sysfsutils-2.0.0-class-dup.patch \
@@ -20,8 +20,6 @@ S = "${WORKDIR}/sysfsutils-${PV}"
inherit autotools
-PACKAGES_prepend = "libsysfs libsysfs-dbg libsysfs-dev "
+PACKAGES_prepend = "libsysfs libsysfs-dev "
FILES_libsysfs = "${libdir}/*.so.*"
FILES_libsysfs-dev = "${libdir}/* ${includedir}"
-FILES_libsysfs-dbg = "${libdir}/.debug"
-FILES_${PN}-dbg = "${bindir}/.debug"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 11/40] classes/package_rpm.bbclass: Enhance diagnostic messages
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (9 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 10/40] sysfsutils: Fall back to default -dbg package Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 12/40] classes/package_rpm.bbclass: Change the way the PV is transformed Mark Hatle
` (28 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
We clearly state now if we are:
* Skipping an empty package
* Creating a (full) package
* Creating an empty package
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/classes/package_rpm.bbclass | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index d8e86c5..9a854f3 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -486,7 +486,10 @@ python write_specfile () {
spec_files_top.append('%files')
spec_files_top.append('%defattr(-,-,-,-)')
if file_list:
+ bb.note("Creating RPM package for %s" % splitname)
spec_files_top.extend(file_list)
+ else:
+ bb.note("Creating EMPTY RPM Package for %s" % splitname)
spec_files_top.append('')
bb.utils.unlockfile(lf)
@@ -569,11 +572,13 @@ python write_specfile () {
if not file_list and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
bb.note("Not creating empty RPM package for %s" % splitname)
else:
- bb.note("Creating RPM package for %s" % splitname)
spec_files_bottom.append('%%files -n %s' % splitname)
spec_files_bottom.append('%defattr(-,-,-,-)')
if file_list:
+ bb.note("Creating RPM package for %s" % splitname)
spec_files_bottom.extend(file_list)
+ else:
+ bb.note("Creating EMPTY RPM Package for %s" % splitname)
spec_files_bottom.append('')
del localdata
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 12/40] classes/package_rpm.bbclass: Change the way the PV is transformed
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (10 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 11/40] classes/package_rpm.bbclass: Enhance diagnostic messages Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 13/40] python: Switch to using the default -dbg package Mark Hatle
` (27 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
There were some odd instances where the PKGV could not be loaded in the old
way. Change to verify that PKGV exists before attempting to retrieve the
value from the key.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/classes/package_rpm.bbclass | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 9a854f3..b4bd374 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -329,10 +329,11 @@ python write_specfile () {
ver = depends_dict[dep]
if dep and ver:
if '-' in ver:
- subd = oe.packagedata.read_subpkgdata_dict(dep, d)
- pv = subd['PKGV']
- reppv = pv.replace('-', '+')
- ver = ver.replace(pv, reppv)
+ subd = oe.packagedata.read_subpkgdata(dep, d)
+ if 'PKGV' in subd:
+ pv = subd['PKGV']
+ reppv = pv.replace('-', '+')
+ ver = ver.replace(pv, reppv)
newdeps_dict[dep] = ver
depends = bb.utils.join_deps(newdeps_dict)
bb.data.setVar(varname, depends.strip(), d)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 13/40] python: Switch to using the default -dbg package
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (11 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 12/40] classes/package_rpm.bbclass: Change the way the PV is transformed Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:38 ` Koen Kooi
2011-06-22 17:36 ` [PATCH 14/40] python-pyobject: Remove unnecessary -dbg setting Mark Hatle
` (26 subsequent siblings)
39 siblings, 1 reply; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Python was missing a lot of debug information. Switch to use the default
-dbg package. Also add some additional debug information to the -dbg package.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../python/python-2.6-manifest.inc | 8 ++------
meta/recipes-devtools/python/python.inc | 2 +-
meta/recipes-devtools/python/python_2.6.6.bb | 4 ++--
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-devtools/python/python-2.6-manifest.inc b/meta/recipes-devtools/python/python-2.6-manifest.inc
index e4e503c..e3ebe41 100644
--- a/meta/recipes-devtools/python/python-2.6-manifest.inc
+++ b/meta/recipes-devtools/python/python-2.6-manifest.inc
@@ -5,9 +5,9 @@
-PROVIDES+="${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-core-dbg ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib "
+PROVIDES+="${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib "
-PACKAGES="${PN}-core-dbg ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib ${PN}-modules"
+PACKAGES="${PN}-dbg ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib ${PN}-modules"
DESCRIPTION_${PN}-audio="Python Audio Handling"
RDEPENDS_${PN}-audio="${PN}-core"
@@ -37,10 +37,6 @@ DESCRIPTION_${PN}-core="Python Interpreter and core modules (needed!)"
RDEPENDS_${PN}-core=""
FILES_${PN}-core="${libdir}/python2.6/__future__.* ${libdir}/python2.6/_abcoll.* ${libdir}/python2.6/abc.* ${libdir}/python2.6/copy.* ${libdir}/python2.6/copy_reg.* ${libdir}/python2.6/ConfigParser.* ${libdir}/python2.6/genericpath.* ${libdir}/python2.6/getopt.* ${libdir}/python2.6/linecache.* ${libdir}/python2.6/new.* ${libdir}/python2.6/os.* ${libdir}/python2.6/posixpath.* ${libdir}/python2.6/struct.* ${libdir}/python2.6/warnings.* ${libdir}/python2.6/site.* ${libdir}/python2.6/stat.* ${libdir}/python2.6/UserDict.* ${libdir}/python2.6/UserList.* ${libdir}/python2.6/UserString.* ${libdir}/python2.6/lib-dynload/binascii.so ${libdir}/python2.6/lib-dynload/_struct.so ${libdir}/python2.6/lib-dynload/time.so ${libdir}/python2.6/lib-dynload/xreadlines.so ${libdir}/python2.6/types.* ${libdir}/python2.6/platform.* ${bindir}/python* "
-DESCRIPTION_${PN}-core-dbg="Python core module debug information"
-RDEPENDS_${PN}-core-dbg="${PN}-core"
-FILES_${PN}-core-dbg="${libdir}/python2.6/config/.debug ${libdir}/python2.6/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug "
-
DESCRIPTION_${PN}-crypt="Python Basic Cryptographic and Hashing Support"
RDEPENDS_${PN}-crypt="${PN}-core"
FILES_${PN}-crypt="${libdir}/python2.6/hashlib.* ${libdir}/python2.6/md5.* ${libdir}/python2.6/sha.* ${libdir}/python2.6/lib-dynload/crypt.so ${libdir}/python2.6/lib-dynload/_hashlib.so ${libdir}/python2.6/lib-dynload/_sha256.so ${libdir}/python2.6/lib-dynload/_sha512.so "
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index 3de220b..f5ebb5b 100644
--- a/meta/recipes-devtools/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
@@ -4,7 +4,7 @@ LICENSE = "PSF"
SECTION = "devel/python"
PRIORITY = "optional"
# bump this on every change in contrib/python/generate-manifest-2.6.py
-INC_PR = "nk1"
+INC_PR = "nk2"
DEFAULT_PREFERENCE = "-26"
diff --git a/meta/recipes-devtools/python/python_2.6.6.bb b/meta/recipes-devtools/python/python_2.6.6.bb
index 24f1d33..5566f9d 100644
--- a/meta/recipes-devtools/python/python_2.6.6.bb
+++ b/meta/recipes-devtools/python/python_2.6.6.bb
@@ -1,7 +1,7 @@
require python.inc
DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"
DISTRO_SRC_URI ?= "file://sitecustomize.py"
@@ -131,7 +131,7 @@ FILES_${PN}-dev = "\
"
# catch debug extensions (isn't that already in python-core-dbg?)
-FILES_${PN}-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug"
+FILES_${PN}-dbg += " ${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug"
# catch all the rest (unsorted)
PACKAGES += "${PN}-misc"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* Re: [PATCH 13/40] python: Switch to using the default -dbg package
2011-06-22 17:36 ` [PATCH 13/40] python: Switch to using the default -dbg package Mark Hatle
@ 2011-06-22 17:38 ` Koen Kooi
2011-06-22 17:50 ` Mark Hatle
0 siblings, 1 reply; 50+ messages in thread
From: Koen Kooi @ 2011-06-22 17:38 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 22 jun 2011, om 19:36 heeft Mark Hatle het volgende geschreven:
> Python was missing a lot of debug information. Switch to use the default
> -dbg package. Also add some additional debug information to the -dbg package.
>
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
> .../python/python-2.6-manifest.inc | 8 ++------
> meta/recipes-devtools/python/python.inc | 2 +-
> meta/recipes-devtools/python/python_2.6.6.bb | 4 ++--
> 3 files changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/meta/recipes-devtools/python/python-2.6-manifest.inc b/meta/recipes-devtools/python/python-2.6-manifest.inc
> index e4e503c..e3ebe41 100644
> --- a/meta/recipes-devtools/python/python-2.6-manifest.inc
> +++ b/meta/recipes-devtools/python/python-2.6-manifest.inc
> @@ -5,9 +5,9 @@
The top of this file says:
# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file.
^ permalink raw reply [flat|nested] 50+ messages in thread
* Re: [PATCH 13/40] python: Switch to using the default -dbg package
2011-06-22 17:38 ` Koen Kooi
@ 2011-06-22 17:50 ` Mark Hatle
0 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:50 UTC (permalink / raw)
To: openembedded-core
Working on fixing this. Until I do, skip this commit in any pull. Thanks!
--Mark
On 6/22/11 12:38 PM, Koen Kooi wrote:
>
> Op 22 jun 2011, om 19:36 heeft Mark Hatle het volgende geschreven:
>
>> Python was missing a lot of debug information. Switch to use the default
>> -dbg package. Also add some additional debug information to the -dbg package.
>>
>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>> ---
>> .../python/python-2.6-manifest.inc | 8 ++------
>> meta/recipes-devtools/python/python.inc | 2 +-
>> meta/recipes-devtools/python/python_2.6.6.bb | 4 ++--
>> 3 files changed, 5 insertions(+), 9 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/python/python-2.6-manifest.inc b/meta/recipes-devtools/python/python-2.6-manifest.inc
>> index e4e503c..e3ebe41 100644
>> --- a/meta/recipes-devtools/python/python-2.6-manifest.inc
>> +++ b/meta/recipes-devtools/python/python-2.6-manifest.inc
>> @@ -5,9 +5,9 @@
>
>
> The top of this file says:
>
> # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file.
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 14/40] python-pyobject: Remove unnecessary -dbg setting
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (12 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 13/40] python: Switch to using the default -dbg package Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 15/40] libxml-parser-perl: Fix debug package Mark Hatle
` (25 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../python/python-pygobject_2.27.91.bb | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/python/python-pygobject_2.27.91.bb b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
index d35f672..0160bbd 100644
--- a/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
+++ b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
DEPENDS = "python-pygobject-native-${PV} glib-2.0"
DEPENDS_virtclass-native = "glib-2.0-native"
RDEPENDS_virtclass-native = ""
-PR = "r0"
+PR = "r1"
MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
@@ -33,6 +33,5 @@ RDEPENDS_${PN} += "python-textutils"
FILES_${PN} = "${libdir}/python*"
FILES_${PN}-lib = "${libdir}/lib*.so.*"
FILES_${PN}-dev += "${bindir} ${datadir}"
-FILES_${PN}-dbg += "${libdir}/.debug"
BBCLASSEXTEND = "native"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 15/40] libxml-parser-perl: Fix debug package
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (13 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 14/40] python-pyobject: Remove unnecessary -dbg setting Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 16/40] texinfo: Change to use the standard -dbg file Mark Hatle
` (24 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Certain files were being missed in the -dbg package, fix this.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../perl/libxml-parser-perl_2.40.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.40.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.40.bb
index fac28a8..4eeb554 100644
--- a/meta/recipes-devtools/perl/libxml-parser-perl_2.40.bb
+++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.40.bb
@@ -3,7 +3,7 @@ LICENSE = "Artistic"
LIC_FILES_CHKSUM = "file://README;beginline=2;endline=6;md5=c8767d7516229f07b26e42d1cf8b51f1"
DEPENDS += "expat expat-native"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz"
@@ -16,6 +16,8 @@ EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}
inherit cpan
+FILES_${PN}-dbg += " ${libdir}/perl/vendor_perl/*/auto/XML/Parser/Expat/.debug/"
+
do_compile() {
export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')"
cpan_do_compile
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 16/40] texinfo: Change to use the standard -dbg file
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (14 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 15/40] libxml-parser-perl: Fix debug package Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 17/40] psmisc: Remove custom -dbg packages, use default Mark Hatle
` (23 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Remove the custom -dbg package and replace it the standard configuration.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/texinfo/texinfo_4.13a.bb | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-extended/texinfo/texinfo_4.13a.bb b/meta/recipes-extended/texinfo/texinfo_4.13a.bb
index ac89b66..0133eab 100644
--- a/meta/recipes-extended/texinfo/texinfo_4.13a.bb
+++ b/meta/recipes-extended/texinfo/texinfo_4.13a.bb
@@ -7,7 +7,7 @@ SECTION = "console/utils"
PRIORITY = "required"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=adefda309052235aa5d1e99ce7557010"
-PR = "r0"
+PR = "r1"
DEPENDS = "zlib"
@@ -41,14 +41,12 @@ do_install_append() {
install -p -m644 doc/texinfo.tex doc/txi-??.tex ${D}${datadir}/${tex_texinfo}
}
-PACKAGES += "info info-doc info-dbg"
+PACKAGES += "info info-doc"
FILES_info = "${bindir}/info ${bindir}/infokey ${bindir}/install-info"
FILES_info-doc = "${infodir}/info.info ${infodir}/dir ${infodir}/info-*.info \
${mandir}/man1/info.1* ${mandir}/man5/info.5* \
${mandir}/man1/infokey.1* ${mandir}/man1/install-info.1*"
-FILES_info-dbg = "${bindir}/.debug/info ${bindir}/.debug/install-info \
- ${bindir}/.debug/infokey"
FILES_${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi"
FILES_${PN}-doc = "${datadir}/texinfo ${infodir}/texinfo* \
@@ -56,6 +54,5 @@ FILES_${PN}-doc = "${datadir}/texinfo ${infodir}/texinfo* \
${mandir}/man1/makeinfo.1* ${mandir}/man5/texinfo.5* \
${mandir}/man1/texindex.1* ${mandir}/man1/texi2dvi.1* \
${mandir}/man1/texi2pdf.1* ${mandir}/man1/pdftexi2dvi.1*"
-FILES_${PN}-dbg = "${bindir}/.debug/texindex ${bindir}/.debug/makeinfo"
BBCLASSEXTEND = "native"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 17/40] psmisc: Remove custom -dbg packages, use default
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (15 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 16/40] texinfo: Change to use the standard -dbg file Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 18/40] modutils: Add in missing -dbg package Mark Hatle
` (22 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/psmisc/psmisc.inc | 8 +-------
meta/recipes-extended/psmisc/psmisc_22.13.bb | 2 +-
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc
index 8b391f4..025c223 100644
--- a/meta/recipes-extended/psmisc/psmisc.inc
+++ b/meta/recipes-extended/psmisc/psmisc.inc
@@ -18,25 +18,19 @@ inherit autotools gettext
ALLOW_EMPTY = "1"
-PACKAGES = "${PN} \
- fuser-dbg fuser fuser-doc \
- killall-dbg killall killall-doc \
- pstree-dbg pstree pstree-doc"
+PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc "
FILES_${PN} = ""
RDEPENDS_${PN} = "fuser killall pstree"
FILES_fuser = "${bindir}/fuser.${PN}"
FILES_fuser-doc = "${mandir}/man1/fuser*"
-FILES_fuser-dbg = "${bindir}/.debug/fuser"
FILES_killall = "${bindir}/killall.${PN}"
FILES_killall-doc = "${mandir}/man1/killall*"
-FILES_killall-dbg = "${bindir}/.debug/killall*"
FILES_pstree = "${bindir}/pstree"
FILES_pstree-doc = "${mandir}/man1/pstree*"
-FILES_pstree-dbg = "${bindir}/.debug/pstree"
do_install_append() {
mv ${D}${bindir}/killall ${D}${bindir}/killall.${PN}
diff --git a/meta/recipes-extended/psmisc/psmisc_22.13.bb b/meta/recipes-extended/psmisc/psmisc_22.13.bb
index 598c144..757e097 100644
--- a/meta/recipes-extended/psmisc/psmisc_22.13.bb
+++ b/meta/recipes-extended/psmisc/psmisc_22.13.bb
@@ -1,7 +1,7 @@
require psmisc.inc
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
-PR = "r0"
+PR = "r1"
SRC_URI[md5sum] = "e2c339e6b65b730042084023784a729e"
SRC_URI[sha256sum] = "06d25e8ebb4722dbcede98a787c39a9ed341f8e58fde10c0b2d6b35990b35daa"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 18/40] modutils: Add in missing -dbg package
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (16 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 17/40] psmisc: Remove custom -dbg packages, use default Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:37 ` Koen Kooi
2011-06-22 17:36 ` [PATCH 19/40] liba52: Remove custom -dbg, fall back to default Mark Hatle
` (21 subsequent siblings)
39 siblings, 1 reply; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-kernel/modutils/modutils_2.4.27.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/modutils/modutils_2.4.27.bb b/meta/recipes-kernel/modutils/modutils_2.4.27.bb
index 1ebc90c..9f2add3 100644
--- a/meta/recipes-kernel/modutils/modutils_2.4.27.bb
+++ b/meta/recipes-kernel/modutils/modutils_2.4.27.bb
@@ -5,7 +5,7 @@ manageable for all users, administrators and distribution maintainers."
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
DEPENDS = "bison-native"
-PR = "r9"
+PR = "r10"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \
file://lex.l.diff;patch=1 \
@@ -86,7 +86,7 @@ pkg_prerm_modutils-modinfo() {
update-alternatives --remove modinfo /sbin/modinfo.24
}
-PACKAGES = "modutils-depmod modutils-modinfo modutils-doc modutils"
+PACKAGES = "${PN}-dbg modutils-depmod modutils-modinfo modutils-doc modutils"
FILES_modutils-depmod = "sbin/depmod.24"
FILES_modutils-modinfo = "sbin/modinfo.24"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* Re: [PATCH 18/40] modutils: Add in missing -dbg package
2011-06-22 17:36 ` [PATCH 18/40] modutils: Add in missing -dbg package Mark Hatle
@ 2011-06-22 17:37 ` Koen Kooi
2011-06-22 17:40 ` Mark Hatle
0 siblings, 1 reply; 50+ messages in thread
From: Koen Kooi @ 2011-06-22 17:37 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 22 jun 2011, om 19:36 heeft Mark Hatle het volgende geschreven:
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
> meta/recipes-kernel/modutils/modutils_2.4.27.bb | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-kernel/modutils/modutils_2.4.27.bb b/meta/recipes-kernel/modutils/modutils_2.4.27.bb
> index 1ebc90c..9f2add3 100644
> --- a/meta/recipes-kernel/modutils/modutils_2.4.27.bb
> +++ b/meta/recipes-kernel/modutils/modutils_2.4.27.bb
> @@ -5,7 +5,7 @@ manageable for all users, administrators and distribution maintainers."
> LICENSE = "GPLv2"
> LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
> DEPENDS = "bison-native"
> -PR = "r9"
> +PR = "r10"
>
> SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \
> file://lex.l.diff;patch=1 \
> @@ -86,7 +86,7 @@ pkg_prerm_modutils-modinfo() {
> update-alternatives --remove modinfo /sbin/modinfo.24
> }
>
> -PACKAGES = "modutils-depmod modutils-modinfo modutils-doc modutils"
> +PACKAGES = "${PN}-dbg modutils-depmod modutils-modinfo modutils-doc modutils"
PACKAGES =+ "modutils-depmod modutils-modinfo" would be nice more more futureproof
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: [PATCH 18/40] modutils: Add in missing -dbg package
2011-06-22 17:37 ` Koen Kooi
@ 2011-06-22 17:40 ` Mark Hatle
0 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:40 UTC (permalink / raw)
To: openembedded-core
On 6/22/11 12:37 PM, Koen Kooi wrote:
>
> Op 22 jun 2011, om 19:36 heeft Mark Hatle het volgende geschreven:
>
>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>> ---
>> meta/recipes-kernel/modutils/modutils_2.4.27.bb | 4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-kernel/modutils/modutils_2.4.27.bb b/meta/recipes-kernel/modutils/modutils_2.4.27.bb
>> index 1ebc90c..9f2add3 100644
>> --- a/meta/recipes-kernel/modutils/modutils_2.4.27.bb
>> +++ b/meta/recipes-kernel/modutils/modutils_2.4.27.bb
>> @@ -5,7 +5,7 @@ manageable for all users, administrators and distribution maintainers."
>> LICENSE = "GPLv2"
>> LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
>> DEPENDS = "bison-native"
>> -PR = "r9"
>> +PR = "r10"
>>
>> SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \
>> file://lex.l.diff;patch=1 \
>> @@ -86,7 +86,7 @@ pkg_prerm_modutils-modinfo() {
>> update-alternatives --remove modinfo /sbin/modinfo.24
>> }
>>
>> -PACKAGES = "modutils-depmod modutils-modinfo modutils-doc modutils"
>> +PACKAGES = "${PN}-dbg modutils-depmod modutils-modinfo modutils-doc modutils"
>
> PACKAGES =+ "modutils-depmod modutils-modinfo" would be nice more more futureproof
I'm happy to make that change if requested -- but I did it with this way to
minimize change. (also for some reason, I think that there was recently a pull
request to remove modutils anyway.. so it might not be needed.)
--Mark
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 50+ messages in thread
* [PATCH 19/40] liba52: Remove custom -dbg, fall back to default
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (17 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 18/40] modutils: Add in missing -dbg package Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 20/40] python-gst: Add missing files to the -dbg package Mark Hatle
` (20 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-multimedia/liba52/liba52_0.7.4.bb | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-multimedia/liba52/liba52_0.7.4.bb b/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
index 239c30a..47a9409 100644
--- a/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
+++ b/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
file://include/a52.h;beginline=1;endline=12;md5=81152ceb3562bf20a60d1b6018175dd1"
SECTION = "libs"
PRIORITY = "optional"
-PR = "r2"
+PR = "r3"
inherit autotools
@@ -18,11 +18,9 @@ S = "${WORKDIR}/a52dec-${PV}"
EXTRA_OECONF = " --enable-shared "
-PACKAGES =+ "a52dec a52dec-dbg a52dec-doc"
+PACKAGES =+ "a52dec a52dec-doc"
FILES_${PN} = " ${libdir}/liba52.so.0 ${libdir}/liba52.so.0.0.0 "
FILES_${PN}-dev = " ${includedir}/a52dec/*.h ${libdir}/liba52.so ${libdir}/liba52.la ${libdir}/liba52.a "
-FILES_${PN}-dbg = " ${libdir}/.debug/*"
FILES_a52dec = " ${bindir}/* "
-FILES_a52dec-dbg = " ${bindir}/.debug/* "
FILES_a52dec-doc = " ${mandir}/man1/* "
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 20/40] python-gst: Add missing files to the -dbg package
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (18 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 19/40] liba52: Remove custom -dbg, fall back to default Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 21/40] mc: Add missing debug files to -dbg Mark Hatle
` (19 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-devtools/python/python-gst_0.10.21.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/python/python-gst_0.10.21.bb b/meta/recipes-devtools/python/python-gst_0.10.21.bb
index dd1ad5f..4358fc9 100644
--- a/meta/recipes-devtools/python/python-gst_0.10.21.bb
+++ b/meta/recipes-devtools/python/python-gst_0.10.21.bb
@@ -3,7 +3,7 @@ SECTION = "devel/python"
LICENSE = "LGPLv2.1"
DEPENDS = "gstreamer gst-plugins-base python-pygobject"
RDEPENDS_${PN} += "python-pygtk"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
file://python-path.patch"
@@ -20,4 +20,4 @@ EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
FILES_${PN} += "${datadir}/gst-python"
FILES_${PN}-dev += "${datadir}/gst-python/0.10/defs"
-FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/"
+FILES_${PN}-dbg += " ${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/ ${libdir}/gstreamer-0.10/.debug/"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 21/40] mc: Add missing debug files to -dbg
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (19 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 20/40] python-gst: Add missing files to the -dbg package Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 22/40] gamin: " Mark Hatle
` (18 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/mc/mc_4.7.5.2.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/mc/mc_4.7.5.2.bb b/meta/recipes-extended/mc/mc_4.7.5.2.bb
index c407b0b..8a3f145 100644
--- a/meta/recipes-extended/mc/mc_4.7.5.2.bb
+++ b/meta/recipes-extended/mc/mc_4.7.5.2.bb
@@ -6,7 +6,7 @@ SECTION = "console/utils"
DEPENDS = "ncurses glib-2.0"
RDEPENDS_${PN} = "ncurses-terminfo"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2"
@@ -16,3 +16,5 @@ SRC_URI[sha256sum] = "a68338862bb30017eb65ed569a58e80ab66ae8cef11c886440c9e9f4d1
inherit autotools gettext
EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --without-samba"
+
+FILES_${PN}-dbg += " ${libexecdir}/mc/.debug/"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 22/40] gamin: Add missing debug files to -dbg
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (20 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 21/40] mc: Add missing debug files to -dbg Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 23/40] gthumb: Add missing debug files Mark Hatle
` (17 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Add the missing files to the base -dbg package, remove the libPN-dbg as it is
non-standard.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/gamin/gamin_0.1.10.bb | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/gamin/gamin_0.1.10.bb b/meta/recipes-extended/gamin/gamin_0.1.10.bb
index b6394d2..b0531ad 100644
--- a/meta/recipes-extended/gamin/gamin_0.1.10.bb
+++ b/meta/recipes-extended/gamin/gamin_0.1.10.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=412a9be54757a155d0b997b52b519f62"
DEPENDS = "glib-2.0"
PROVIDES = "fam"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \
file://no-abstract-sockets.patch"
@@ -20,13 +20,12 @@ inherit autotools pkgconfig
EXTRA_OECONF = "--without-python"
-PACKAGES += "lib${PN} lib${PN}-dev lib${PN}-dbg"
+PACKAGES += " lib${PN} lib${PN}-dev"
FILES_${PN} = "${libexecdir}"
-FILES_${PN}-dbg = "${libexecdir}/.debug"
+FILES_${PN}-dbg += "${libexecdir}/.debug"
FILES_lib${PN} = "${libdir}/lib*.so.*"
FILES_lib${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/lib*.la \
${libdir}/lib*.a ${libdir}/lib*.so"
-FILES_lib${PN}-dbg = "${libdir}/.debug/"
RDEPENDS_lib${PN} = "${PN}"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 23/40] gthumb: Add missing debug files
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (21 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 22/40] gamin: " Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 24/40] systemtamp: " Mark Hatle
` (16 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-gnome/gthumb/gthumb_2.12.3.bb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-gnome/gthumb/gthumb_2.12.3.bb b/meta/recipes-gnome/gthumb/gthumb_2.12.3.bb
index 115a805..720cd67 100644
--- a/meta/recipes-gnome/gthumb/gthumb_2.12.3.bb
+++ b/meta/recipes-gnome/gthumb/gthumb_2.12.3.bb
@@ -3,14 +3,14 @@ SECTION = "x11/gnome"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf libpng gstreamer jpeg tiff gst-plugins-base"
-PR = "r0"
+PR = "r1"
EXTRA_OECONF = "--disable-gnome-keyring --disable-libsoup --disable-exiv2 --disable-clutter"
inherit gnome pkgconfig
-FILES_${PN} += "${datadir}/icons"
-FILES_${PN}-dbg += "${libdir}/gthumb/modules/.debug"
+FILES_${PN} += " ${datadir}/icons"
+FILES_${PN}-dbg += " ${libdir}/gthumb/modules/.debug/ ${libdir}/gthumb/extensions/.debug/"
SRC_URI[archive.md5sum] = "bfa0957a1bafc5d049292cd5fad372ce"
SRC_URI[archive.sha256sum] = "0060c05fd372c2af2048d294ab3f75c8fb02c576d3e2004e08b7d34f49da1e66"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 24/40] systemtamp: Add missing debug files
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (22 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 23/40] gthumb: Add missing debug files Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 18:54 ` Phil Blundell
2011-06-22 17:36 ` [PATCH 25/40] trace-cmd: " Mark Hatle
` (15 subsequent siblings)
39 siblings, 1 reply; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-kernel/systemtap/systemtap_git.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index e3e9264..8907985 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "elfutils"
SRCREV = "4ab3a1863bf4f472acae7a809bf2b38d91658aa8"
-PR = "r2"
+PR = "r3"
PV = "1.4+git${SRCPV}"
SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git \
@@ -29,3 +29,5 @@ COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*)-linux'
S = "${WORKDIR}/git"
inherit autotools
+
+FILES_${PN}-dbg += " ${libexecdir}/systemtap/.debug"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 25/40] trace-cmd: Add missing debug files
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (23 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 24/40] systemtamp: " Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 26/40] gstreamer: " Mark Hatle
` (14 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-kernel/trace-cmd/trace-cmd_git.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
index ba7413d..5cf433a 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e"
SRCREV = "6c696cec3f264a9399241b6e648f58bc97117d49"
-PR = r0
+PR = "r1"
PV = "1.0.5+git${SRCPV}"
inherit pkgconfig
@@ -14,6 +14,8 @@ S = "${WORKDIR}/git"
EXTRA_OEMAKE = "'prefix=${prefix}'"
+FILES_${PN}-dbg += "${datadir}/trace-cmd/plugins/.debug/"
+
do_install() {
oe_runmake prefix="${prefix}" DESTDIR="${D}" install
}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 26/40] gstreamer: Add missing debug files.
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (24 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 25/40] trace-cmd: " Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 27/40] gtk-sato-engine: " Mark Hatle
` (13 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../gstreamer/gstreamer_0.10.32.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.32.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.32.bb
index 901ade5..0957670 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.32.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.32.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4"
DEPENDS = "glib-2.0 libxml2 bison-native flex-native"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
file://check_fix.patch \
@@ -32,4 +32,4 @@ RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-raw
FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
-FILES_${PN}-dbg += " ${libdir}/gstreamer-0.10/.debug/"
+FILES_${PN}-dbg += " ${libdir}/gstreamer-0.10/.debug/ ${libexecdir}/gstreamer-0.10/.debug/"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 27/40] gtk-sato-engine: Add missing debug files
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (25 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 26/40] gstreamer: " Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 28/40] libproxy: " Mark Hatle
` (12 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-sato/gtk-engines/gtk-sato-engine.inc | 2 +-
.../gtk-engines/gtk-sato-engine_svn.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc b/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc
index a7ebddf..8472ecb 100644
--- a/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc
+++ b/meta/recipes-sato/gtk-engines/gtk-sato-engine.inc
@@ -11,7 +11,7 @@ RDEPENDS_gtk-theme-sato = "gtk-sato-engine"
PACKAGES += "gtk-theme-sato"
FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
-FILES_${PN}-dbg = "${libdir}/gtk-2.0/*/engines/.debug"
+FILES_${PN}-dbg += " ${libdir}/gtk-2.0/*/engines/.debug"
FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes"
inherit autotools pkgconfig
diff --git a/meta/recipes-sato/gtk-engines/gtk-sato-engine_svn.bb b/meta/recipes-sato/gtk-engines/gtk-sato-engine_svn.bb
index 230ccbc..6099ae4 100644
--- a/meta/recipes-sato/gtk-engines/gtk-sato-engine_svn.bb
+++ b/meta/recipes-sato/gtk-engines/gtk-sato-engine_svn.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
SRCREV = "163"
PV = "0.3.2+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=gtk-engine;proto=http"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 28/40] libproxy: Add missing debug files
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (26 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 27/40] gtk-sato-engine: " Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 29/40] wireless-tools: Avoid stripping binaries Mark Hatle
` (11 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-support/libproxy/libproxy_0.4.6.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/libproxy/libproxy_0.4.6.bb b/meta/recipes-support/libproxy/libproxy_0.4.6.bb
index 2e18065..e6ef8ff 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.6.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.6.bb
@@ -14,14 +14,14 @@ SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"
SRC_URI[md5sum] = "199c6b120baf1f7258a55f38d5ec74f5"
SRC_URI[sha256sum] = "9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30"
-PR = "r0"
+PR = "r1"
inherit cmake pkgconfig
EXTRA_OECMAKE = "-DWITH_WEBKIT=no -DWITH_GNOME=yes -DWITH_KDE4=no \
-DWITH_PYTHON=no -DWITH_PERL=no -DWITH_MOZJS=no -DWITH_NM=no"
-FILES_${PN}-dbg += "${libdir}/libproxy/${PV}/plugins/"
+FILES_${PN}-dbg += " ${libdir}/libproxy/${PV}/plugins/.debug/ ${libdir}/libproxy/${PV}/modules/.debug/"
do_configure_prepend() {
export HOST_SYS=${HOST_SYS}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 29/40] wireless-tools: Avoid stripping binaries
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (27 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 28/40] libproxy: " Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 30/40] busybox: " Mark Hatle
` (10 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../wireless-tools/avoid_strip.patch | 21 ++++++++++++++++++++
.../wireless-tools/wireless-tools_29.bb | 5 ++-
2 files changed, 24 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch b/meta/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch
new file mode 100644
index 0000000..f34e243
--- /dev/null
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch
@@ -0,0 +1,21 @@
+wireless_tools: Avoid stripping iwmulticall
+
+Upstream-Status: Inappropriate [other]
+ The removed code was from upstream.
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
+diff -ur wireless_tools.29.orig/Makefile wireless_tools.29/Makefile
+--- wireless_tools.29.orig/Makefile 2011-06-18 11:35:12.183907453 -0500
++++ wireless_tools.29/Makefile 2011-06-18 11:38:09.995907985 -0500
+@@ -135,9 +135,8 @@
+
+ macaddr: macaddr.o $(IWLIB)
+
+-# Always do symbol stripping here
+ iwmulticall: iwmulticall.o
+- $(CC) $(LDFLAGS) -Wl,-s $(XCFLAGS) -o $@ $^ $(LIBS)
++ $(CC) $(LDFLAGS) $(STRIPFLAGS) $(XCFLAGS) -o $@ $^ $(LIBS)
+
+ # It's a kind of magic...
+ wireless.h:
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
index 70bf91b..3f9f8f0 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
@@ -8,12 +8,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
SECTION = "base"
PRIORITY = "optional"
PE = "1"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz \
file://man.patch;apply=yes \
file://wireless-tools.if-pre-up \
- file://zzz-wireless.if-pre-up"
+ file://zzz-wireless.if-pre-up \
+ file://avoid_strip.patch"
SRC_URI[md5sum] = "e06c222e186f7cc013fd272d023710cb"
SRC_URI[sha256sum] = "6fb80935fe208538131ce2c4178221bab1078a1656306bce8909c19887e2e5a1"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 30/40] busybox: Avoid stripping binaries
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (28 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 29/40] wireless-tools: Avoid stripping binaries Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 31/40] tinylogin: Avoid stripped binaries Mark Hatle
` (9 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-core/busybox/busybox_1.18.4.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox_1.18.4.bb b/meta/recipes-core/busybox/busybox_1.18.4.bb
index a999490..cb41ac6 100644
--- a/meta/recipes-core/busybox/busybox_1.18.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.18.4.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = "r3"
+PR = "r4"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://udhcpscript.patch \
@@ -28,4 +28,4 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
SRC_URI[tarball.md5sum] = "b03c5b46ced732679e525a920a1a62f5"
SRC_URI[tarball.sha256sum] = "4d24d37bd6f1bd153e8cf9a984ec2f32f18464f73ca535e2cc2e8be9694097fa"
-EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
+EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 31/40] tinylogin: Avoid stripped binaries
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (29 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 30/40] busybox: " Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 32/40] quote: Avoid stripping binaries Mark Hatle
` (8 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../tinylogin/tinylogin-1.4/avoid_static.patch | 33 ++++++++++++++++++++
meta/recipes-core/tinylogin/tinylogin_1.4.bb | 7 ++--
2 files changed, 37 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-core/tinylogin/tinylogin-1.4/avoid_static.patch
diff --git a/meta/recipes-core/tinylogin/tinylogin-1.4/avoid_static.patch b/meta/recipes-core/tinylogin/tinylogin-1.4/avoid_static.patch
new file mode 100644
index 0000000..8a06af0
--- /dev/null
+++ b/meta/recipes-core/tinylogin/tinylogin-1.4/avoid_static.patch
@@ -0,0 +1,33 @@
+tinylogin: Do not link statically when building debug
+
+For some reason if DODEBUG was enabled (to prevent stripping) the binary was
+also statically linked. This patch prevents that behavior.
+
+Upstream-Status: Inappropriate [no upstream]
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
+diff -ur tinylogin-1.4.orig/Makefile tinylogin-1.4/Makefile
+--- tinylogin-1.4.orig/Makefile 2011-06-18 11:00:23.073927349 -0500
++++ tinylogin-1.4/Makefile 2011-06-18 11:03:26.394849372 -0500
+@@ -123,20 +123,6 @@
+ LDFLAGS += -s -Wl,-warn-common
+ STRIP = $(STRIPTOOL) --remove-section=.note --remove-section=.comment $(PROG)
+ endif
+-ifeq ($(strip $(DODEBUG)),true)
+- LDFLAGS += --static
+- #
+- #use '-ffunction-sections -fdata-sections' and '--gc-sections' (if they
+- # work) to try and strip out any unused junk. Doesn't do much for me,
+- # but you may want to give it a shot...
+- #
+- #ifeq ($(shell $(CC) -ffunction-sections -fdata-sections -S \
+- # -o /dev/null -xc /dev/null 2>/dev/null && $(LD) \
+- # --gc-sections -v >/dev/null && echo 1),1)
+- # CFLAGS += -ffunction-sections -fdata-sections
+- # LDFLAGS += --gc-sections
+- #endif
+-endif
+ ifeq ($(strip $(DOSTATIC)),true)
+ LDFLAGS += --static
+ #
diff --git a/meta/recipes-core/tinylogin/tinylogin_1.4.bb b/meta/recipes-core/tinylogin/tinylogin_1.4.bb
index 0b51b25..b620d45 100644
--- a/meta/recipes-core/tinylogin/tinylogin_1.4.bb
+++ b/meta/recipes-core/tinylogin/tinylogin_1.4.bb
@@ -7,7 +7,7 @@ and groups on an embedded system."
HOMEPAGE = "http://tinylogin.busybox.net/"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM="file://LICENSE;md5=f1060fa3a366f098b5b1d8c2077ba269"
-PR = "r6"
+PR = "r7"
SRC_URI = "http://tinylogin.busybox.net/downloads/tinylogin-${PV}.tar.bz2 \
file://cvs-20040608.patch;patch=1;pnum=1 \
@@ -15,7 +15,8 @@ SRC_URI = "http://tinylogin.busybox.net/downloads/tinylogin-${PV}.tar.bz2 \
file://adduser-empty_pwd.patch;patch=1 \
file://remove-index.patch;patch=1 \
file://use_O2_option.patch \
- file://passwd_rotate_check.patch"
+ file://passwd_rotate_check.patch \
+ file://avoid_static.patch"
SRC_URI[md5sum] = "44da0ff2b727455669890b24305e351d"
SRC_URI[sha256sum] = "5e542e4b7825305a3678bf73136c392feb0d44b8bbf926e8eda5453eea7ddd6b"
@@ -23,7 +24,7 @@ SRC_URI[sha256sum] = "5e542e4b7825305a3678bf73136c392feb0d44b8bbf926e8eda5453eea
EXTRA_OEMAKE = ""
do_compile () {
- oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}'
+ oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}' 'DODEBUG=true'
}
do_install () {
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 32/40] quote: Avoid stripping binaries
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (30 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 31/40] tinylogin: Avoid stripped binaries Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 33/40] sysstat: " Mark Hatle
` (7 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/quota/quota_4.00-pre1.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/quota/quota_4.00-pre1.bb b/meta/recipes-extended/quota/quota_4.00-pre1.bb
index 849315e..a5d2f5d 100644
--- a/meta/recipes-extended/quota/quota_4.00-pre1.bb
+++ b/meta/recipes-extended/quota/quota_4.00-pre1.bb
@@ -6,7 +6,7 @@ LICENSE = "BSD & GPLv2+ & LGPLv2.1+"
LIC_FILES_CHKSUM = "file://quota.c;beginline=1;endline=33;md5=331c7d77744bfe0ad24027f0651028ec \
file://rquota_server.c;beginline=1;endline=20;md5=d509328bb71c3438b9c737774b4132a2 \
file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb"
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz"
@@ -17,6 +17,8 @@ S = ${WORKDIR}/quota-tools
inherit autotools
+EXTRA_OEMAKE += ' STRIP=""'
+
do_install() {
oe_runmake prefix=${D}${prefix} install
}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 33/40] sysstat: Avoid stripping binaries
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (31 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 32/40] quote: Avoid stripping binaries Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 34/40] db: " Mark Hatle
` (6 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/sysstat/sysstat.inc | 5 ++++-
meta/recipes-extended/sysstat/sysstat_10.0.0.bb | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
index 4756016..ed124ba 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -9,6 +9,8 @@ SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \
inherit autotools gettext
+EXTRA_OEMAKE += ' LFLAGS=""'
+
do_install() {
autotools_do_install
@@ -24,7 +26,8 @@ pkg_postinst_${PN} () {
}
-FILES_${PN} += "${libdir}/sa"
+FILES_${PN} += " ${libdir}/sa"
+FILES_${PN}-dbg += " ${libdir}/sa/.debug/"
TARGET_CC_ARCH += "${LDFLAGS}"
LDFLAGS_append_libc-uclibc = " -lintl"
diff --git a/meta/recipes-extended/sysstat/sysstat_10.0.0.bb b/meta/recipes-extended/sysstat/sysstat_10.0.0.bb
index fd003d9..2faac32 100644
--- a/meta/recipes-extended/sysstat/sysstat_10.0.0.bb
+++ b/meta/recipes-extended/sysstat/sysstat_10.0.0.bb
@@ -2,7 +2,7 @@ require sysstat.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-PR = "r1"
+PR = "r2"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 34/40] db: Avoid stripping binaries
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (32 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 33/40] sysstat: " Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 35/40] db: Fix file ownership Mark Hatle
` (5 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-support/db/db_5.1.19.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/db/db_5.1.19.bb b/meta/recipes-support/db/db_5.1.19.bb
index 98b23b1..fc87c31 100644
--- a/meta/recipes-support/db/db_5.1.19.bb
+++ b/meta/recipes-support/db/db_5.1.19.bb
@@ -14,7 +14,7 @@ HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
LICENSE = "Sleepycat"
VIRTUAL_NAME ?= "virtual/db"
CONFLICTS = "db3"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.."
@@ -76,6 +76,7 @@ EXTRA_OECONF += "${MUTEX}"
# configure.
CONFIG_SITE = ""
do_configure() {
+ export STRIP="true"
oe_runconf
}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 35/40] db: Fix file ownership
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (33 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 34/40] db: " Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 36/40] unzip: Avoid stripping binaries Mark Hatle
` (4 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-support/db/db_5.1.19.bb | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-support/db/db_5.1.19.bb b/meta/recipes-support/db/db_5.1.19.bb
index fc87c31..c5047b6 100644
--- a/meta/recipes-support/db/db_5.1.19.bb
+++ b/meta/recipes-support/db/db_5.1.19.bb
@@ -80,6 +80,10 @@ do_configure() {
oe_runconf
}
+FIX_OWNERS = "chown -R root:root ${D}"
+FIX_OWNERS_virtclass-native = ""
+FIX_OWNERS_virtclass-nativesdk = ""
+
do_install_append() {
mkdir -p ${D}/${includedir}/db51
#mv ${D}/${includedir}/db_185.h ${D}/${includedir}/db51/.
@@ -98,6 +102,8 @@ do_install_append() {
test ! -d "${D}/${docdir}" || rm -rf "${D}/${docdir}"
mv "${D}/${prefix}/docs" "${D}/${docdir}"
fi
+
+ test -n "${FIX_OWNERS}" && eval ${FIX_OWNERS} || :
}
BBCLASSEXTEND = "native nativesdk"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 36/40] unzip: Avoid stripping binaries
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (34 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 35/40] db: Fix file ownership Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 37/40] dropbear: Don't patch in configure Mark Hatle
` (3 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
Not only do we have to override things on the make line, but we
need to hack on configure as well to avoid certain behavior.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../recipes-extended/unzip/unzip/avoid-strip.patch | 48 ++++++++++++++++++++
meta/recipes-extended/unzip/unzip_6.0.bb | 7 ++-
2 files changed, 53 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-extended/unzip/unzip/avoid-strip.patch
diff --git a/meta/recipes-extended/unzip/unzip/avoid-strip.patch b/meta/recipes-extended/unzip/unzip/avoid-strip.patch
new file mode 100644
index 0000000..0ef6363
--- /dev/null
+++ b/meta/recipes-extended/unzip/unzip/avoid-strip.patch
@@ -0,0 +1,48 @@
+unix/Makefile: remove hard coded strip commands
+
+Remove the hard coded strip commands, both LF2 (used in linking) and
+STRIP used alone.
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
+diff -ur unzip60.orig/unix/configure unzip60/unix/configure
+--- unzip60.orig/unix/configure 2009-04-16 14:25:12.000000000 -0500
++++ unzip60/unix/configure 2011-06-21 11:23:36.822849960 -0500
+@@ -17,7 +17,7 @@
+ IZ_BZIP2=${3}
+ CFLAGS="${CFLAGS} -I. -DUNIX"
+ LFLAGS1=""
+-LFLAGS2="-s"
++LFLAGS2=""
+ LN="ln -s"
+
+ CFLAGS_OPT=''
+diff -ur unzip60.orig/unix/Makefile unzip60/unix/Makefile
+--- unzip60.orig/unix/Makefile 2009-01-18 16:41:18.000000000 -0600
++++ unzip60/unix/Makefile 2011-06-21 11:12:22.900003388 -0500
+@@ -52,7 +52,7 @@
+ CF = $(CFLAGS) $(CF_NOOPT)
+ LFLAGS1 =
+ LF = -o unzip$E $(LFLAGS1)
+-LF2 = -s
++LF2 =
+
+ # UnZipSFX flags
+ SL = -o unzipsfx$E $(LFLAGS1)
+@@ -70,7 +70,7 @@
+ CHMOD = chmod
+ BINPERMS = 755
+ MANPERMS = 644
+-STRIP = strip
++STRIP =
+ E =
+ O = .o
+ M = unix
+@@ -776,7 +776,6 @@
+ #
+ gcc: unix_make
+ $(MAKE) unzips CC=gcc LD=gcc CFLAGS="-O3" LF2=""
+- $(STRIP) $(UNZIPS)
+
+ # Heurikon HK68 (68010), UniPlus+ System V 5.0, Green Hills C-68000
+ hk68: unix_make
diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb
index ccdd372..6fcebc2 100644
--- a/meta/recipes-extended/unzip/unzip_6.0.bb
+++ b/meta/recipes-extended/unzip/unzip_6.0.bb
@@ -4,14 +4,17 @@ SECTION = "console/utils"
LICENSE = "Info-ZIP"
LIC_FILES_CHKSUM = "file://LICENSE;md5=94caec5a51ef55ef711ee4e8b1c69e29"
PE = "1"
-PR = "r0"
+PR = "r1"
-SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/unzip60.tgz"
+SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/unzip60.tgz \
+ file://avoid-strip.patch"
SRC_URI[md5sum] = "62b490407489521db863b523a7f86375"
SRC_URI[sha256sum] = "036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37"
S = "${WORKDIR}/unzip60"
+EXTRA_OEMAKE += " STRIP=true LF2=''"
+
export LD = "${CC}"
LD_virtclass-native = "${CC}"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 37/40] dropbear: Don't patch in configure
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (35 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 36/40] unzip: Avoid stripping binaries Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 38/40] nasm: Fix aclocal Mark Hatle
` (2 subsequent siblings)
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
We need to avoid applying a patch in configure, because a rebuild could
trigger this, without triggering do_patch.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-core/dropbear/dropbear.inc | 4 +++-
meta/recipes-core/dropbear/dropbear_0.52.bb | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index e9290ff..c9c41d2 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -32,13 +32,15 @@ EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
DISTRO_TYPE = "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
-do_configure_prepend() {
+do_debug_patch() {
if [ "${DISTRO_TYPE}" = "debug" ]; then
bbnote "WARNING: applying allow-nopw.patch which allows password-less logins!"
patch -p1 < ${WORKDIR}/allow-nopw.patch
fi
}
+addtask do_debug_patch after do_patch before do_configure
+
do_install() {
install -d ${D}${sysconfdir} \
${D}${sysconfdir}/init.d \
diff --git a/meta/recipes-core/dropbear/dropbear_0.52.bb b/meta/recipes-core/dropbear/dropbear_0.52.bb
index 912054c..78d6cf1 100644
--- a/meta/recipes-core/dropbear/dropbear_0.52.bb
+++ b/meta/recipes-core/dropbear/dropbear_0.52.bb
@@ -3,4 +3,4 @@ require dropbear.inc
SRC_URI[md5sum] = "1c69ec674481d7745452f68f2ea5597e"
SRC_URI[sha256sum] = "e3a2ca49ed85ce562240c0ac06e2f72826d7e52a83e80d91c067c8b97bf5c108"
-PR = "r1"
+PR = "r2"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 38/40] nasm: Fix aclocal
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (36 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 37/40] dropbear: Don't patch in configure Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 39/40] python: Add python to the dependencies of python modules Mark Hatle
2011-06-22 17:36 ` [PATCH 40/40] boost: Move the do_configure_prepend to a seperate task Mark Hatle
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
The mv of aclocal.m4 can only occur once, or it will fail. On a re-run of
configure this will fail.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-devtools/nasm/nasm_2.07.bb | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/nasm/nasm_2.07.bb b/meta/recipes-devtools/nasm/nasm_2.07.bb
index 69e3b7b..9b75496 100644
--- a/meta/recipes-devtools/nasm/nasm_2.07.bb
+++ b/meta/recipes-devtools/nasm/nasm_2.07.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d89d124974e487e5d64da6f1cd8acfbb"
COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)'
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/nasm/nasm-${PV}.tar.bz2 "
@@ -13,10 +13,12 @@ SRC_URI[sha256sum] = "ac70ee451c73d742c9ff830502e5f8b1f648b2abffa8fd00944243283b
inherit autotools
-do_configure_prepend () {
+do_patch_fixaclocal () {
mv aclocal.m4 acinclude.m4
}
+addtask do_patch_fixaclocal after do_patch before do_configure
+
do_install() {
install -d ${D}${bindir}
install -d ${D}${mandir}/man1
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 39/40] python: Add python to the dependencies of python modules
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (37 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 38/40] nasm: Fix aclocal Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
2011-06-22 17:36 ` [PATCH 40/40] boost: Move the do_configure_prepend to a seperate task Mark Hatle
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
If python failed to build for some reason, python-gst and python-pygobject
may still try to build, add python as a dependency to avoid this.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-devtools/python/python-gst_0.10.21.bb | 4 ++--
.../python/python-pygobject_2.27.91.bb | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/python/python-gst_0.10.21.bb b/meta/recipes-devtools/python/python-gst_0.10.21.bb
index 4358fc9..7de6b74 100644
--- a/meta/recipes-devtools/python/python-gst_0.10.21.bb
+++ b/meta/recipes-devtools/python/python-gst_0.10.21.bb
@@ -1,9 +1,9 @@
DESCRIPTION = "Python Gstreamer bindings"
SECTION = "devel/python"
LICENSE = "LGPLv2.1"
-DEPENDS = "gstreamer gst-plugins-base python-pygobject"
+DEPENDS = "gstreamer gst-plugins-base python-pygobject python"
RDEPENDS_${PN} += "python-pygtk"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
file://python-path.patch"
diff --git a/meta/recipes-devtools/python/python-pygobject_2.27.91.bb b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
index 0160bbd..9ff2fe7 100644
--- a/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
+++ b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "Python GObject bindings"
SECTION = "devel/python"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
-DEPENDS = "python-pygobject-native-${PV} glib-2.0"
+DEPENDS = "python python-pygobject-native-${PV} glib-2.0"
DEPENDS_virtclass-native = "glib-2.0-native"
RDEPENDS_virtclass-native = ""
-PR = "r1"
+PR = "r2"
MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread* [PATCH 40/40] boost: Move the do_configure_prepend to a seperate task
2011-06-22 17:35 [PATCH 00/40] Various recipe fixes Mark Hatle
` (38 preceding siblings ...)
2011-06-22 17:36 ` [PATCH 39/40] python: Add python to the dependencies of python modules Mark Hatle
@ 2011-06-22 17:36 ` Mark Hatle
39 siblings, 0 replies; 50+ messages in thread
From: Mark Hatle @ 2011-06-22 17:36 UTC (permalink / raw)
To: openembedded-core
We need to perform those actions after patch, and before configure.
Otherwise a rebuild starting with configure will fail.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-support/boost/boost-36.inc | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/boost/boost-36.inc b/meta/recipes-support/boost/boost-36.inc
index 3adc3ed..bc4e750 100644
--- a/meta/recipes-support/boost/boost-36.inc
+++ b/meta/recipes-support/boost/boost-36.inc
@@ -9,7 +9,7 @@ SECTION = "libs"
DEPENDS = "boost-jam-native zlib"
PRIORITY = "optional"
LICENSE = "Boost"
-PR = "r3"
+PR = "r4"
ARM_INSTRUCTION_SET = "arm"
BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
@@ -126,12 +126,14 @@ BJAM_OPTS = '${BJAM_TOOLS} \
${BJAM_EXTRA}'
-do_configure_prepend() {
+do_boostconfig() {
cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp
echo 'using gcc : 4.3.1 : ${CXX} : compileflags -DBOOST_SP_USE_PTHREADS -I${includedir} linkflags -L${libdir} ;' >> ${S}/tools/build/v2/user-config.jam
}
+addtask do_boostconfig after do_patch before do_configure
+
do_compile() {
set -ex
bjam ${BJAM_OPTS} --prefix=${prefix} \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 50+ messages in thread