[OE-core] [PATCH 27/40] gtk-sato-engine: Add missing debug files
Signed-off-by: Mark Hatle
---
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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 30/40] busybox: Avoid stripping binaries
Signed-off-by: Mark Hatle
---
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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 31/40] tinylogin: Avoid stripped binaries
Signed-off-by: Mark Hatle
---
.../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 000..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
+
+diff -ur tinylogin-1.4.orig/Makefile tinylogin-1.4/Makefile
+--- tinylogin-1.4.orig/Makefile2011-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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 28/40] libproxy: Add missing debug files
Signed-off-by: Mark Hatle
---
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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 32/40] quote: Avoid stripping binaries
Signed-off-by: Mark Hatle
---
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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 33/40] sysstat: Avoid stripping binaries
Signed-off-by: Mark Hatle
---
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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 36/40] unzip: Avoid stripping binaries
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
---
.../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 000..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
+
+diff -ur unzip60.orig/unix/configure unzip60/unix/configure
+--- unzip60.orig/unix/configure2009-04-16 14:25:12.0 -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.0 -0600
unzip60/unix/Makefile 2011-06-21 11:12:22.93388 -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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 38/40] nasm: Fix aclocal
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
---
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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 37/40] dropbear: Don't patch in configure
We need to avoid applying a patch in configure, because a rebuild could
trigger this, without triggering do_patch.
Signed-off-by: Mark Hatle
---
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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 39/40] python: Add python to the dependencies of python modules
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
---
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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 40/40] boost: Move the do_configure_prepend to a seperate task
We need to perform those actions after patch, and before configure.
Otherwise a rebuild starting with configure will fail.
Signed-off-by: Mark Hatle
---
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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 34/40] db: Avoid stripping binaries
Signed-off-by: Mark Hatle
---
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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 29/40] wireless-tools: Avoid stripping binaries
Signed-off-by: Mark Hatle --- .../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 000..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 + +diff -ur wireless_tools.29.orig/Makefile wireless_tools.29/Makefile +--- wireless_tools.29.orig/Makefile2011-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 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 35/40] db: Fix file ownership
Signed-off-by: Mark Hatle
---
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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 24/40] systemtamp: Add missing debug files
Signed-off-by: Mark Hatle
---
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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 18/40] modutils: Add in missing -dbg package
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
>> ---
>> 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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 13/40] python: Switch to using the default -dbg package
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 >> --- >> .../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 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/40] Various Recipe Fixes (v2)
V2 only includes a change to patch 13, to resolve the issues mentioned by Koen. --- original comments below --- While working on the permissions and umask code, I found a number of random issues with various packages in the system. Most of these problems revolve around: * directory and file permissions, and ownership * -dbg package not being produced correctly * stripped binaries * packages that couldn't rebuild due to dependency or other issues Note, this doesn't solve the permissions and ownership issues that will come in a future patch set devoted to umask and fixing up of the permissions. The following changes since commit 17d5422460bf9074223475b15d128171d12b170a: qt4-tools-nativesdk: fix compile failure in src/dbus (2011-06-22 17:41:39 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib mhatle/recipe-fixup http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/recipe-fixup Mark Hatle (40): resolveconf: Fix file owners base-passwd: Fix owners/groups gcc: Fix owners/groups ghostscript: Fix owner/group of /etc/cups libtirpc: Fix owner/group of /etc/netconfig tzdata: Ensure all files are owned by root:root gnome-doc-utils: Fix the owner/group on select files perf: Fix linux-tools to ensure perf is installed under "fakeroot" kernel.bbclass: Add support for perf-dbg package sysfsutils: Fall back to default -dbg package classes/package_rpm.bbclass: Enhance diagnostic messages classes/package_rpm.bbclass: Change the way the PV is transformed python: Switch to using the default -dbg package python-pyobject: Remove unnecessary -dbg setting libxml-parser-perl: Fix debug package texinfo: Change to use the standard -dbg file psmisc: Remove custom -dbg packages, use default modutils: Add in missing -dbg package liba52: Remove custom -dbg, fall back to default python-gst: Add missing files to the -dbg package mc: Add missing debug files to -dbg gamin: Add missing debug files to -dbg gthumb: Add missing debug files systemtamp: Add missing debug files trace-cmd: Add missing debug files gstreamer: Add missing debug files. gtk-sato-engine: Add missing debug files libproxy: Add missing debug files wireless-tools: Avoid stripping binaries busybox: Avoid stripping binaries tinylogin: Avoid stripped binaries quote: Avoid stripping binaries sysstat: Avoid stripping binaries db: Avoid stripping binaries db: Fix file ownership unzip: Avoid stripping binaries dropbear: Don't patch in configure nasm: Fix aclocal python: Add python to the dependencies of python modules boost: Move the do_configure_prepend to a seperate task meta/classes/kernel.bbclass|3 +- meta/classes/package_rpm.bbclass | 16 +-- .../resolvconf/resolvconf_1.48.bb |3 +- .../wireless-tools/avoid_strip.patch | 21 + .../wireless-tools/wireless-tools_29.bb|5 +- .../recipes-core/base-passwd/base-passwd_3.5.22.bb | 10 ++-- meta/recipes-core/busybox/busybox_1.18.4.bb|4 +- meta/recipes-core/dropbear/dropbear.inc|4 +- meta/recipes-core/dropbear/dropbear_0.52.bb|2 +- meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb |6 +-- .../tinylogin/tinylogin-1.4/avoid_static.patch | 33 + meta/recipes-core/tinylogin/tinylogin_1.4.bb |7 ++- 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 +- meta/recipes-devtools/nasm/nasm_2.07.bb|6 ++- .../perl/libxml-parser-perl_2.40.bb|4 +- .../python/python-2.6-manifest.inc |8 +--- meta/recipes-devtools/python/python-gst_0.10.21.bb |6 +- .../python/python-pygobject_2.27.91.bb |5 +- meta/recipes-devtools/python/python.inc|2 +- meta/recipes-devtools/python/python_2.6.6.bb |4 +- meta/recipes-extended/gamin/gamin_0.1.10.bb|7 +-- .../ghostscript/ghostscript_9.02.bb|7 +++- meta/recipes-extended/libtirpc/libtirpc_0.2.1.bb |6 ++- meta/recipes-extended/mc/mc_4.7.5.2.bb |4 +- meta/recipes-extended/psmisc/psmisc.inc|8 +--- meta/recipes-extended/psmisc/psmisc_22.13.bb |2 +- meta/recipes-extended/quota/quota_4.00-pre1.bb |4 +- meta/recipes-extended/sysstat/sysstat.inc |5 ++- meta/recipes-extended/sysstat/sysstat_10.0.0.bb|2 +- meta/recipes-extended/texinfo/texinfo_4.13a.bb |7 +-- meta/recipes-extended/tzdata/tzdata_2011g.bb |4 +- .../recipes-extended/unzip/unzip/avoid-strip.patch | 48 ++
[OE-core] [PATCH 13/40] python: Switch to using the default -dbg package (v2)
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
---
.../python/python-2.6-manifest.inc |8 ++--
meta/recipes-devtools/python/python.inc|2 +-
meta/recipes-devtools/python/python_2.6.6.bb |4 ++--
scripts/contrib/python/generate-manifest-2.6.py| 16 +---
4 files changed, 14 insertions(+), 16 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.*
Re: [OE-core] [PATCH 0/4] eglibc 2.14 upgrade
Since applying this update, I'm not longer getting an rpc/rpc.h file, which breaks various things like busybox mount. Is anyone else seeing this behavior? --Mark On 6/22/11 10:57 AM, Richard Purdie wrote: > On Tue, 2011-06-21 at 18:43 -0700, Khem Raj wrote: >> This patchset upgrades eglibc 2.13 -> 2.14 >> >> Needed a binutils fix for x86_64 >> >> Package sotruss which is new in eglibc 2.14 >> >> The following changes since commit 78de64f58b98101f5be5778e9ecbdaae5ba32997: >> >> binutils_2.21.bb: Fix ld segfault exposed by eglibc 2.14 on x86_64 >> (2011-06-21 17:58:06 -0700) >> >> are available in the git repository at: >> git://git.openembedded.org/openembedded-core-contrib kraj/eglibc-2.14 >> >> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/eglibc-2.14 >> >> Khem Raj (4): >> eglibc: Upgrade recipes from 2.13 -> 2.14 >> eglibc-package.inc: Package newly added sotruss and supporting >> libraries >> binutils_2.21.bb: Fix ld segfault exposed by eglibc 2.14 on x86_64 >> tcmode-default.inc: Bump EGLIBCVERSION to 2.14 > > Merged to master, thanks. > > Richard > > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/40] libtirpc: Fix owner/group of /etc/netconfig (v3)
Signed-off-by: Mark Hatle
---
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..6170e65 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}${sysconfdir}/netconfig
+}
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 21/40] mc: Add missing debug files to -dbg (v3)
Signed-off-by: Mark Hatle
---
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..6b03be7 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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/40] ghostscript: Fix owner/group of /etc/cups (v3)
/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
---
.../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..ea1235a 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}${sysconfdir}/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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/40] Various Recipe Fixes (v3)
V3 includes fixes to issues noticed by Phil Blundell --- version 2 below --- V2 only includes a change to patch 13, to resolve the issues mentioned by Koen. --- original comments below --- While working on the permissions and umask code, I found a number of random issues with various packages in the system. Most of these problems revolve around: * directory and file permissions, and ownership * -dbg package not being produced correctly * stripped binaries * packages that couldn't rebuild due to dependency or other issues Note, this doesn't solve the permissions and ownership issues that will come in a future patch set devoted to umask and fixing up of the permissions. The following changes since commit 17d5422460bf9074223475b15d128171d12b170a: qt4-tools-nativesdk: fix compile failure in src/dbus (2011-06-22 17:41:39 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib mhatle/recipe-fixup http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/recipe-fixup Mark Hatle (40): resolveconf: Fix file owners base-passwd: Fix owners/groups gcc: Fix owners/groups ghostscript: Fix owner/group of /etc/cups libtirpc: Fix owner/group of /etc/netconfig tzdata: Ensure all files are owned by root:root gnome-doc-utils: Fix the owner/group on select files perf: Fix linux-tools to ensure perf is installed under "fakeroot" kernel.bbclass: Add support for perf-dbg package sysfsutils: Fall back to default -dbg package classes/package_rpm.bbclass: Enhance diagnostic messages classes/package_rpm.bbclass: Change the way the PV is transformed python: Switch to using the default -dbg package python-pyobject: Remove unnecessary -dbg setting libxml-parser-perl: Fix debug package texinfo: Change to use the standard -dbg file psmisc: Remove custom -dbg packages, use default modutils: Add in missing -dbg package liba52: Remove custom -dbg, fall back to default python-gst: Add missing files to the -dbg package mc: Add missing debug files to -dbg gamin: Add missing debug files to -dbg gthumb: Add missing debug files systemtamp: Add missing debug files trace-cmd: Add missing debug files gstreamer: Add missing debug files. gtk-sato-engine: Add missing debug files libproxy: Add missing debug files wireless-tools: Avoid stripping binaries busybox: Avoid stripping binaries tinylogin: Avoid stripped binaries quote: Avoid stripping binaries sysstat: Avoid stripping binaries db: Avoid stripping binaries db: Fix file ownership unzip: Avoid stripping binaries dropbear: Don't patch in configure nasm: Fix aclocal python: Add python to the dependencies of python modules boost: Move the do_configure_prepend to a seperate task meta/classes/kernel.bbclass|3 +- meta/classes/package_rpm.bbclass | 16 +-- .../resolvconf/resolvconf_1.48.bb |3 +- .../wireless-tools/avoid_strip.patch | 21 + .../wireless-tools/wireless-tools_29.bb|5 +- .../recipes-core/base-passwd/base-passwd_3.5.22.bb | 10 ++-- meta/recipes-core/busybox/busybox_1.18.4.bb|4 +- meta/recipes-core/dropbear/dropbear.inc|4 +- meta/recipes-core/dropbear/dropbear_0.52.bb|2 +- meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb |6 +-- .../tinylogin/tinylogin-1.4/avoid_static.patch | 33 + meta/recipes-core/tinylogin/tinylogin_1.4.bb |7 ++- 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 +- meta/recipes-devtools/nasm/nasm_2.07.bb|6 ++- .../perl/libxml-parser-perl_2.40.bb|4 +- .../python/python-2.6-manifest.inc |8 +--- meta/recipes-devtools/python/python-gst_0.10.21.bb |6 +- .../python/python-pygobject_2.27.91.bb |5 +- meta/recipes-devtools/python/python.inc|2 +- meta/recipes-devtools/python/python_2.6.6.bb |4 +- meta/recipes-extended/gamin/gamin_0.1.10.bb|7 +-- .../ghostscript/ghostscript_9.02.bb|7 +++- meta/recipes-extended/libtirpc/libtirpc_0.2.1.bb |6 ++- meta/recipes-extended/mc/mc_4.7.5.2.bb |4 +- meta/recipes-extended/psmisc/psmisc.inc|8 +--- meta/recipes-extended/psmisc/psmisc_22.13.bb |2 +- meta/recipes-extended/quota/quota_4.00-pre1.bb |4 +- meta/recipes-extended/sysstat/sysstat.inc |5 ++- meta/recipes-extended/sysstat/sysstat_10.0.0.bb|2 +- meta/recipes-extended/texinfo/texinfo_4.13a.bb |7 +-- meta/recipes-extended/tzdata/tzdata_2011g.bb |4 +- .
[OE-core] [PATCH 23/40] gthumb: Add missing debug files (v3)
Signed-off-by: Mark Hatle
---
meta/recipes-gnome/gthumb/gthumb_2.12.3.bb |4 ++--
1 files changed, 2 insertions(+), 2 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..7fb8a94 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}-dbg += "${libdir}/gthumb/modules/.debug/
${libdir}/gthumb/extensions/.debug/"
SRC_URI[archive.md5sum] = "bfa0957a1bafc5d049292cd5fad372ce"
SRC_URI[archive.sha256sum] =
"0060c05fd372c2af2048d294ab3f75c8fb02c576d3e2004e08b7d34f49da1e66"
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/40] perf: Fix linux-tools to ensure perf is installed under "fakeroot" (v3)
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
---
meta/recipes-kernel/linux/linux-tools.inc |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-tools.inc
b/meta/recipes-kernel/linux/linux-tools.inc
index ef81650..e4740d7 100644
--- a/meta/recipes-kernel/linux/linux-tools.inc
+++ b/meta/recipes-kernel/linux/linux-tools.inc
@@ -10,7 +10,7 @@ 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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 20/40] python-gst: Add missing files to the -dbg package (v3)
Signed-off-by: Mark Hatle
---
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..888002c 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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 22/40] gamin: Add missing debug files to -dbg (v3)
Add the missing files to the base -dbg package, remove the libPN-dbg as it is
non-standard.
Signed-off-by: Mark Hatle
---
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..81b27c0 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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 28/40] libproxy: Add missing debug files (v3)
Signed-off-by: Mark Hatle
---
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..b24e8ba 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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 15/40] libxml-parser-perl: Fix debug package (v3)
Certain files were being missed in the -dbg package, fix this.
Signed-off-by: Mark Hatle
---
.../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..3c8f1c9 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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 24/40] systemtamp: Add missing debug files (v3)
Signed-off-by: Mark Hatle
---
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..aeb87c8 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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 36/40] unzip: Avoid stripping binaries (v3)
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
---
.../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 000..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
+
+diff -ur unzip60.orig/unix/configure unzip60/unix/configure
+--- unzip60.orig/unix/configure2009-04-16 14:25:12.0 -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.0 -0600
unzip60/unix/Makefile 2011-06-21 11:12:22.93388 -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..b9eff43 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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 13/40] python: Switch to using the default -dbg package (v3)
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
---
.../python/python-2.6-manifest.inc |8 ++--
meta/recipes-devtools/python/python.inc|2 +-
meta/recipes-devtools/python/python_2.6.6.bb |2 +-
scripts/contrib/python/generate-manifest-2.6.py| 16 +---
4 files changed, 13 insertions(+), 15 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}/p
[OE-core] [PATCH 33/40] sysstat: Avoid stripping binaries (v3)
Signed-off-by: Mark Hatle
---
meta/recipes-extended/sysstat/sysstat.inc |3 +++
meta/recipes-extended/sysstat/sysstat_10.0.0.bb |2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/sysstat/sysstat.inc
b/meta/recipes-extended/sysstat/sysstat.inc
index 4756016..2936f96 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
@@ -25,6 +27,7 @@ pkg_postinst_${PN} () {
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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 39/40] python: Add python to the dependencies of python modules (v3)
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
---
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 888002c..ed89090 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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/4] eglibc 2.14 upgrade
On 6/22/11 1:35 PM, Mark Hatle wrote: > Since applying this update, I'm not longer getting an rpc/rpc.h file, which > breaks various things like busybox mount. > > Is anyone else seeing this behavior? Reverting: 2a68cf4d315cdd18766de0c75928ff17846a6cd7 and 190a946e9a4213944e3ee675c4b3e18701698e87 fixed the problem for me. So there is definitely a problems in the upgrade. --Mark > --Mark > > On 6/22/11 10:57 AM, Richard Purdie wrote: >> On Tue, 2011-06-21 at 18:43 -0700, Khem Raj wrote: >>> This patchset upgrades eglibc 2.13 -> 2.14 >>> >>> Needed a binutils fix for x86_64 >>> >>> Package sotruss which is new in eglibc 2.14 >>> >>> The following changes since commit 78de64f58b98101f5be5778e9ecbdaae5ba32997: >>> >>> binutils_2.21.bb: Fix ld segfault exposed by eglibc 2.14 on x86_64 >>> (2011-06-21 17:58:06 -0700) >>> >>> are available in the git repository at: >>> git://git.openembedded.org/openembedded-core-contrib kraj/eglibc-2.14 >>> >>> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/eglibc-2.14 >>> >>> Khem Raj (4): >>> eglibc: Upgrade recipes from 2.13 -> 2.14 >>> eglibc-package.inc: Package newly added sotruss and supporting >>> libraries >>> binutils_2.21.bb: Fix ld segfault exposed by eglibc 2.14 on x86_64 >>> tcmode-default.inc: Bump EGLIBCVERSION to 2.14 >> >> Merged to master, thanks. >> >> Richard >> >> >> ___ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/4] eglibc 2.14 upgrade
On 6/22/11 5:31 PM, Khem Raj wrote: > On Wed, Jun 22, 2011 at 1:28 PM, Mark Hatle wrote: >> On 6/22/11 1:35 PM, Mark Hatle wrote: >>> Since applying this update, I'm not longer getting an rpc/rpc.h file, which >>> breaks various things like busybox mount. >>> >>> Is anyone else seeing this behavior? >> >> Reverting: >> >> 2a68cf4d315cdd18766de0c75928ff17846a6cd7 and >> 190a946e9a4213944e3ee675c4b3e18701698e87 >> >> fixed the problem for me. So there is definitely a problems in the upgrade. >> > > onward looking rpc is now maintained with libtirpc starting glibc 2.14 rpc is > not to be used from bundled code in glibc. If we dont have recipes for > libtirpc > then I will add that. There is a libtirpc recipe. It looks like we may have to audit the system looking for users and get that fixed. busybox is definitely something that tries to use rpc in mount. --Mark >> --Mark >> >>> --Mark >>> >>> On 6/22/11 10:57 AM, Richard Purdie wrote: >>>> On Tue, 2011-06-21 at 18:43 -0700, Khem Raj wrote: >>>>> This patchset upgrades eglibc 2.13 -> 2.14 >>>>> Needed a binutils fix for x86_64 >>>>> Package sotruss which is new in eglibc 2.14 >>>>> >>>>> The following changes since commit >>>>> 78de64f58b98101f5be5778e9ecbdaae5ba32997: >>>>> >>>>> binutils_2.21.bb: Fix ld segfault exposed by eglibc 2.14 on x86_64 >>>>> (2011-06-21 17:58:06 -0700) >>>>> >>>>> are available in the git repository at: >>>>> git://git.openembedded.org/openembedded-core-contrib kraj/eglibc-2.14 >>>>> >>>>> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/eglibc-2.14 >>>>> >>>>> Khem Raj (4): >>>>> eglibc: Upgrade recipes from 2.13 -> 2.14 >>>>> eglibc-package.inc: Package newly added sotruss and supporting >>>>> libraries >>>>> binutils_2.21.bb: Fix ld segfault exposed by eglibc 2.14 on x86_64 >>>>> tcmode-default.inc: Bump EGLIBCVERSION to 2.14 >>>> >>>> Merged to master, thanks. >>>> >>>> Richard >>>> >>>> >>>> ___ >>>> Openembedded-core mailing list >>>> Openembedded-core@lists.openembedded.org >>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >>> >>> >>> ___ >>> Openembedded-core mailing list >>> Openembedded-core@lists.openembedded.org >>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >> >> >> ___ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >> > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] classes/package.bbclass: Add fixup_perms
Add a new function that is responsible for fixing directory and file
permissions, owners and groups during the packaging process. This will fix
various issues where two packages may create the same directory and end up
with different permissions, owner and/or group.
The issue being resolved is that if two packages conflict in their ownership
of a directory, the first installed into the rootfs sets the permissions.
This leads to a least potentially non-deterministic filesystems, at worst
security defects.
The user can specify their own settings via the configuration files
specified in FILESYSTEM_PERMS_TABLES. If this is not defined, it will
fall back to loading files/fs-perms.txt from BBPATH. The format of this
file is documented within the file.
By default all of the system directories, specified in bitbake.conf, will
be fixed to be 0755, root, root.
The fs-perms.txt contains a few default entries to correct documentation,
locale, headers and debug sources. It was discovered these are often
incorrect due to being directly copied from the build user environment.
Also tweak a couple of warnings to provide more diagnostic information.
Signed-off-by: Mark Hatle
---
meta/classes/package.bbclass | 168 +++---
meta/files/fs-perms.txt | 39 ++
2 files changed, 197 insertions(+), 10 deletions(-)
create mode 100644 meta/files/fs-perms.txt
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 8f91c95..3727868 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -16,24 +16,26 @@
# d) split_and_strip_files - split the files into runtime and debug and strip
them.
#Debug files include debug info split, and associated sources that end up
in -dbg packages
#
-# e) populate_packages - Split the files in PKGD into separate packages in
PKGDEST/
+# e) fixup_perms - Fix up permissions in the package before we split it.
+#
+# f) populate_packages - Split the files in PKGD into separate packages in
PKGDEST/
#Also triggers the binary stripping code to put files in -dbg packages.
#
-# f) package_do_filedeps - Collect perfile run-time dependency metadata
+# g) package_do_filedeps - Collect perfile run-time dependency metadata
#The data is stores in FILER{PROVIDES,DEPENDS}_file_pkg variables with
#a list of affected files in FILER{PROVIDES,DEPENDS}FLIST_pkg
#
-# g) package_do_shlibs - Look at the shared libraries generated and
autotmatically add any
+# h) package_do_shlibs - Look at the shared libraries generated and
autotmatically add any
#depenedencies found. Also stores the package name so anyone else using
this library
#knows which package to depend on.
#
-# h) package_do_pkgconfig - Keep track of which packages need and provide
which .pc files
+# i) package_do_pkgconfig - Keep track of which packages need and provide
which .pc files
#
-# i) read_shlibdeps - Reads the stored shlibs information into the metadata
+# j) read_shlibdeps - Reads the stored shlibs information into the metadata
#
-# j) package_depchains - Adds automatic dependencies to -dbg and -dev packages
+# k) package_depchains - Adds automatic dependencies to -dbg and -dev packages
#
-# k) emit_pkgdata - saves the packaging data into PKGDATA_DIR for use in later
+# l) emit_pkgdata - saves the packaging data into PKGDATA_DIR for use in later
#packaging steps
inherit packagedata
@@ -237,7 +239,7 @@ def splitfile2(debugsrcdir, d):
# We need to ignore files that are not actually ours
# we do this by only paying attention to items from this package
processdebugsrc += "fgrep -z '%s' | "
- processdebugsrc += "(cd '%s' ; cpio -pd0mL '%s%s' 2>/dev/null)"
+ processdebugsrc += "(cd '%s' ; cpio -pd0mL --no-preserve-owner '%s%s'
2>/dev/null)"
os.system(processdebugsrc % (sourcefile, workbasedir, workparentdir,
dvar, debugsrcdir))
@@ -410,10 +412,154 @@ python perform_packagecopy () {
os.system('tar -cf - -C %s -ps . | tar -xf - -C %s' % (dest, dvar))
}
+# We generate a master list of directories to process, we start by
+# seeding this list with reasonable defaults, then load from
+# the fs-perms.txt files
+python fixup_perms () {
+ import stat, pwd, grp
+
+ def get_fs_perms_list(d):
+ str = ""
+ fs_perms_tables = bb.data.getVar('FILESYSTEM_PERMS_TABLES', d,
True)
+ if not fs_perms_tables:
+ fs_perms_tables = 'files/fs-perms.txt'
+ for fs_perms_table in fs_perms_tables.split():
+ str += " %s" % bb.which(bb.data.getVar('BBPATH', d,
True), fs_perms_table)
+ return str
+
+ def set_fs_perms_table(line, d):
+ line = bb.data.expand(line, d)
+
[OE-core] [PATCH 3/4] Add umask task control
Bitbake now allows the umask to be specified per task. The
following tasks will have a umask of 022 set by default:
do_configure
do_compile
do_install
do_package
do_populate_sysroot
do_rootfs
do_configure and do_compile need a umask of 022 set because -many- recipes
directly copy generated files out of recipe's build directory. Instead of
fixing each existing and future recipe, it was shown to be much easier to
just set the umask.
Signed-off-by: Mark Hatle
---
meta/classes/base.bbclass |4
meta/classes/image.bbclass |2 ++
meta/classes/staging.bbclass |1 +
.../installer/adt-installer_1.0.bb |2 ++
meta/recipes-kernel/linux/linux-tools.inc |2 ++
5 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 119b052..9a07f49 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -262,14 +262,18 @@ python () {
# If we're building a target package we need to use fakeroot (pseudo)
# in order to capture permissions, owners, groups and special files
if not bb.data.inherits_class('native', d) and not
bb.data.inherits_class('cross', d):
+bb.data.setVarFlag('do_configure', 'umask', 022, d)
+bb.data.setVarFlag('do_compile', 'umask', 022, d)
deps = (bb.data.getVarFlag('do_install', 'depends', d) or "").split()
deps.append('virtual/fakeroot-native:do_populate_sysroot')
bb.data.setVarFlag('do_install', 'depends', " ".join(deps),d)
bb.data.setVarFlag('do_install', 'fakeroot', 1, d)
+bb.data.setVarFlag('do_install', 'umask', 022, d)
deps = (bb.data.getVarFlag('do_package', 'depends', d) or "").split()
deps.append('virtual/fakeroot-native:do_populate_sysroot')
bb.data.setVarFlag('do_package', 'depends', " ".join(deps),d)
bb.data.setVarFlag('do_package', 'fakeroot', 1, d)
+bb.data.setVarFlag('do_package', 'umask', 022, d)
bb.data.setVarFlag('do_package_setscene', 'fakeroot', 1, d)
source_mirror_fetch = bb.data.getVar('SOURCE_MIRROR_FETCH', d, 0)
if not source_mirror_fetch:
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 2469442..e77ec42 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -83,6 +83,8 @@ do_build[nostamp] = "1"
# Must call real_do_rootfs() from inside here, rather than as a separate
# task, so that we have a single fakeroot context for the whole process.
+do_rootfs[umask] = 022
+
fakeroot do_rootfs () {
#set -x
rm -rf ${IMAGE_ROOTFS}
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index fef6457..04d51ed 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -58,6 +58,7 @@ sysroot_stage_all() {
}
do_populate_sysroot[dirs] = "${SYSROOT_DESTDIR}"
+do_populate_sysroot[umask] = 022
addtask populate_sysroot after do_install
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb
b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index 8f6e91f..0537440 100644
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -54,6 +54,8 @@ SRC_URI =
"svn://opkg.googlecode.com/svn;module=trunk;proto=http \
file://opkg/conf/opkg-sdk-i686.conf \
"
+do_deploy[umask] = 022
+
fakeroot do_deploy () {
cd ${WORKDIR}
mkdir -p ${ADT_DEPLOY}
diff --git a/meta/recipes-kernel/linux/linux-tools.inc
b/meta/recipes-kernel/linux/linux-tools.inc
index e4740d7..729e912 100644
--- a/meta/recipes-kernel/linux/linux-tools.inc
+++ b/meta/recipes-kernel/linux/linux-tools.inc
@@ -19,6 +19,8 @@ fakeroot do_install_perf() {
addtask compile_perf after do_compile before do_install
addtask install_perf after do_install before do_package
+do_compile_perf[umask] = 022
+do_install_perf[umask] = 022
PERFDEPENDS = "virtual/libc:do_populate_sysroot elfutils:do_populate_sysroot"
PERFDEPENDS_libc-uclibc = ""
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] Revert "classes/base.bbclass: Add umask"
This reverts commit d8470b6a8efdbba04cef5d4dc1ce12720fe83621.
Signed-off-by: Mark Hatle
---
meta/classes/base.bbclass | 10 --
meta/classes/sanity.bbclass |5 +
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 11ff0e0..119b052 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -13,16 +13,6 @@ inherit logging
OE_IMPORTS += "os sys time oe.path oe.utils oe.data oe.packagegroup"
OE_IMPORTS[type] = "list"
-# There are a few key items we need to setup in the environment
-# in order to get consistent builds. Do them here.
-python oe_setup_env () {
-if isinstance(e, bb.event.ConfigParsed) and
bb.data.getVar("BB_WORKERCONTEXT", e.data, True) != "1":
- import os
- os.umask(0022)
-}
-
-addhandler oe_setup_env
-
def oe_import(d):
import os, sys
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index cd883be..fc005aa 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -224,6 +224,11 @@ def check_sanity(e):
if os.path.basename(os.readlink('/bin/sh')) == 'dash':
messages = messages + "Using dash as /bin/sh causes various subtle
build problems, please use bash instead (e.g. 'dpkg-reconfigure dash' on an
Ubuntu system.\n"
+omask = os.umask(022)
+if omask & 0755:
+messages = messages + "Please use a umask which allows a+rx and
u+rwx\n"
+os.umask(omask)
+
oes_bb_conf = data.getVar( 'OES_BITBAKE_CONF', e.data, True )
if not oes_bb_conf:
messages = messages + 'You do not include OpenEmbeddeds version of
conf/bitbake.conf. This means your environment is misconfigured, in particular
check BBPATH.\n'
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] Ensure a reasonable umask, and fix up permissions
A fairly global problem was discovered that depending on the build users umask, the directories and files being generated ended up with different permissions. This lead to situations where the first package to be installed setup the permissions and could have lead to bugs and security issues. This patch set resolves the problem in two ways. First it sets the umask to a sane value for distribution creation, 022. Note: I intentionally left the patches and reverted global umask in this patch set. Without the corresponding changes to bitbake the "Add umask task control" won't do anything. The package.bbclass change is described within that specific commit. Note there is still one outstanding issue when one package uses a directory and another defines the item in terms of a symlink. I intend to enhance the code to deal with that situation in a future commit. The following changes since commit f40f936b3ba00e31cae49c22b2633d4deb825533: Revert "eglibc: Upgrade recipes from 2.13 -> 2.14" (2011-06-22 16:52:11 -0500) are available in the git repository at: git://git.pokylinux.org/poky-contrib mhatle/perms http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/perms Mark Hatle (4): classes/base.bbclass: Add umask Revert "classes/base.bbclass: Add umask" Add umask task control classes/package.bbclass: Add fixup_perms meta/classes/base.bbclass |4 + meta/classes/image.bbclass |2 + meta/classes/package.bbclass | 168 ++-- meta/classes/staging.bbclass |1 + meta/files/fs-perms.txt| 39 + .../installer/adt-installer_1.0.bb |2 + meta/recipes-kernel/linux/linux-tools.inc |2 + 7 files changed, 208 insertions(+), 10 deletions(-) create mode 100644 meta/files/fs-perms.txt -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] classes/base.bbclass: Add umask
In order for the build system to consistently create directories and files
with reasonable default permissions, we need to set the umask to a known
value, 022.
Prior to this patch we used the users umask and just verified it was
"compatible" with 022...
Note, this patch sets the umask -once- in the main bb thread.
Also remove the sanity check, as it's no longer needed.
Signed-off-by: Mark Hatle
---
meta/classes/base.bbclass | 10 ++
meta/classes/sanity.bbclass |5 -
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 119b052..11ff0e0 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -13,6 +13,16 @@ inherit logging
OE_IMPORTS += "os sys time oe.path oe.utils oe.data oe.packagegroup"
OE_IMPORTS[type] = "list"
+# There are a few key items we need to setup in the environment
+# in order to get consistent builds. Do them here.
+python oe_setup_env () {
+if isinstance(e, bb.event.ConfigParsed) and
bb.data.getVar("BB_WORKERCONTEXT", e.data, True) != "1":
+ import os
+ os.umask(0022)
+}
+
+addhandler oe_setup_env
+
def oe_import(d):
import os, sys
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index fc005aa..cd883be 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -224,11 +224,6 @@ def check_sanity(e):
if os.path.basename(os.readlink('/bin/sh')) == 'dash':
messages = messages + "Using dash as /bin/sh causes various subtle
build problems, please use bash instead (e.g. 'dpkg-reconfigure dash' on an
Ubuntu system.\n"
-omask = os.umask(022)
-if omask & 0755:
-messages = messages + "Please use a umask which allows a+rx and
u+rwx\n"
-os.umask(omask)
-
oes_bb_conf = data.getVar( 'OES_BITBAKE_CONF', e.data, True )
if not oes_bb_conf:
messages = messages + 'You do not include OpenEmbeddeds version of
conf/bitbake.conf. This means your environment is misconfigured, in particular
check BBPATH.\n'
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/9] base-passwd: Fix owners/groups
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
---
.../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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 9/9] python: Add python to the dependency to pygobject
pygobject requires both python and pygobject-native for compilation. Without
python pygobject may fail to compile.. and items that depend on pygobject will
fail to compile.
Signed-off-by: Mark Hatle
---
.../python/python-pygobject_2.27.91.bb |4 ++--
1 files changed, 2 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 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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/9] ghostscript: Fix owner/group of /etc/cups
/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
---
.../ghostscript/ghostscript_9.02.bb|4 +++-
1 files changed, 3 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..02038ea 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 = ""
@@ -57,6 +57,8 @@ do_install_append () {
mkdir -p ${D}${datadir}/ghostscript/${PV}/
cp -r Resource ${D}${datadir}/ghostscript/${PV}/
cp -r iccprofiles ${D}${datadir}/ghostscript/${PV}/
+
+chown -R root:lp ${D}${sysconfdir}/cups
}
python do_patch_virtclass-native () {
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/9] gnome-doc-utils: Fix the owner/group on select files
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
---
meta/recipes-gnome/gnome/gnome-doc-utils.inc |3 +++
meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb |2 +-
2 files changed, 4 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..62893ea 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
@@ -9,6 +9,9 @@ EXTRA_OECONF = "--disable-scrollkeeper"
do_install_append() {
mkdir -p ${D}${datadir}/xml/gnome/xslt/
cp -pPr ${S}/xslt/* ${D}${datadir}/xml/gnome/xslt/
+
+ echo ${PATH}
+ chown -R root:root ${D}
}
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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/9] db: Fix file ownership
Signed-off-by: Mark Hatle
---
meta/recipes-support/db/db_5.1.19.bb |2 ++
1 files changed, 2 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..a8ae1bd 100644
--- a/meta/recipes-support/db/db_5.1.19.bb
+++ b/meta/recipes-support/db/db_5.1.19.bb
@@ -98,6 +98,8 @@ do_install_append() {
test ! -d "${D}/${docdir}" || rm -rf "${D}/${docdir}"
mv "${D}/${prefix}/docs" "${D}/${docdir}"
fi
+
+ chown -R root:root ${D}
}
BBCLASSEXTEND = "native nativesdk"
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/9] resolveconf: Fix file owners
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
---
.../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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/9] tzdata: Ensure all files are owned by root:root
Signed-off-by: Mark Hatle
---
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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/9] native/nativesdk: Add a simple chown intercept command
During native and nativesdk package we want to intercept any calls to chown
and do nothing. This prevents errors and allows the same recipes to be
used for both native and target recipes.
Signed-off-by: Mark Hatle
---
meta/classes/native.bbclass|2 ++
meta/classes/nativesdk.bbclass |2 ++
scripts/native-intercept/chown |2 ++
3 files changed, 6 insertions(+), 0 deletions(-)
create mode 100755 scripts/native-intercept/chown
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 90fcd13..11ec6dc 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -85,6 +85,8 @@ EXTRA_NATIVE_PKGCONFIG_PATH ?= ""
PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}"
PKG_CONFIG_SYSROOT_DIR = ""
+PATH =. "${COREBASE}/scripts/native-intercept:"
+
python native_virtclass_handler () {
if not isinstance(e, bb.event.RecipePreFinalise):
return
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index 3fe4bf9..a0302b9 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -54,6 +54,8 @@ FILES_${PN}-dbg += "${prefix}/.debug \
export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig"
export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
+PATH =. "${COREBASE}/scripts/native-intercept:"
+
python nativesdk_virtclass_handler () {
if not isinstance(e, bb.event.RecipePreFinalise):
return
diff --git a/scripts/native-intercept/chown b/scripts/native-intercept/chown
new file mode 100755
index 000..4f43271
--- /dev/null
+++ b/scripts/native-intercept/chown
@@ -0,0 +1,2 @@
+#! /bin/sh
+echo "Intercept $0: $@ -- do nothing"
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/9] libtirpc: Fix owner/group of /etc/netconfig
Signed-off-by: Mark Hatle
---
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..6170e65 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}${sysconfdir}/netconfig
+}
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/9] Revised patch set for fixing owners/groups
This is a revised patch set for fixing the owners/groups. It adds a local intercrepter routine for "chown" that runs only with native and nativesdk packages. Also update the rejected python patch to fix only the gobject item. The following changes since commit ad098e40e8c57727892819e131bf18308bf244d2: packagedata.py: Fix read_subpkgdata_dict() (2011-06-23 16:01:20 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib mhatle/recipe-fixup http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/perms Mark Hatle (9): native/nativesdk: Add a simple chown intercept command resolveconf: Fix file owners base-passwd: Fix owners/groups ghostscript: Fix owner/group of /etc/cups libtirpc: Fix owner/group of /etc/netconfig tzdata: Ensure all files are owned by root:root gnome-doc-utils: Fix the owner/group on select files db: Fix file ownership python: Add python to the dependency to pygobject meta/classes/native.bbclass|2 ++ meta/classes/nativesdk.bbclass |2 ++ .../resolvconf/resolvconf_1.48.bb |3 ++- .../recipes-core/base-passwd/base-passwd_3.5.22.bb | 10 +- .../python/python-pygobject_2.27.91.bb |4 ++-- .../ghostscript/ghostscript_9.02.bb|4 +++- meta/recipes-extended/libtirpc/libtirpc_0.2.1.bb |6 +- meta/recipes-extended/tzdata/tzdata_2011g.bb |4 ++-- meta/recipes-gnome/gnome/gnome-doc-utils.inc |3 +++ meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb |2 +- meta/recipes-support/db/db_5.1.19.bb |2 ++ scripts/native-intercept/chown |2 ++ 12 files changed, 31 insertions(+), 13 deletions(-) create mode 100755 scripts/native-intercept/chown -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/9] native.bbclass: Add a simple chown intercept command (v2)
During native recipe processing we want to intercept any calls to chown
and do nothing. This prevents errors and allows the same recipes to be
used for both native and target recipes.
Signed-off-by: Mark Hatle
---
meta/classes/native.bbclass|2 ++
scripts/native-intercept/chown |2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
create mode 100755 scripts/native-intercept/chown
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 90fcd13..11ec6dc 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -85,6 +85,8 @@ EXTRA_NATIVE_PKGCONFIG_PATH ?= ""
PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}"
PKG_CONFIG_SYSROOT_DIR = ""
+PATH =. "${COREBASE}/scripts/native-intercept:"
+
python native_virtclass_handler () {
if not isinstance(e, bb.event.RecipePreFinalise):
return
diff --git a/scripts/native-intercept/chown b/scripts/native-intercept/chown
new file mode 100755
index 000..4f43271
--- /dev/null
+++ b/scripts/native-intercept/chown
@@ -0,0 +1,2 @@
+#! /bin/sh
+echo "Intercept $0: $@ -- do nothing"
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/9] gnome-doc-utils: Fix the owner/group on select files (v2)
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
---
meta/recipes-gnome/gnome/gnome-doc-utils.inc |2 ++
meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb |2 +-
2 files changed, 3 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..32fcf7a 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
@@ -9,6 +9,8 @@ EXTRA_OECONF = "--disable-scrollkeeper"
do_install_append() {
mkdir -p ${D}${datadir}/xml/gnome/xslt/
cp -pPr ${S}/xslt/* ${D}${datadir}/xml/gnome/xslt/
+
+ chown -R root:root ${D}
}
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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/9] Revised patch set for fixing owners/groups (V2)
Misunderstood nativesdk. I thought it was not running under fakeroot control. No reason to intercept chown for nativesdk, revert that hunt. Also removed an errant debug statement. --- This is a revised patch set for fixing the owners/groups. It adds a local intercrepter routine for "chown" that runs only with native and nativesdk packages. Also update the rejected python patch to fix only the gobject item. The following changes since commit ad098e40e8c57727892819e131bf18308bf244d2: packagedata.py: Fix read_subpkgdata_dict() (2011-06-23 16:01:20 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib mhatle/recipe-fixup http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/recipe-fixup Mark Hatle (9): native.bbclass: Add a simple chown intercept command resolveconf: Fix file owners base-passwd: Fix owners/groups ghostscript: Fix owner/group of /etc/cups libtirpc: Fix owner/group of /etc/netconfig tzdata: Ensure all files are owned by root:root gnome-doc-utils: Fix the owner/group on select files db: Fix file ownership python: Add python to the dependency to pygobject meta/classes/native.bbclass|2 ++ .../resolvconf/resolvconf_1.48.bb |3 ++- .../recipes-core/base-passwd/base-passwd_3.5.22.bb | 10 +- .../python/python-pygobject_2.27.91.bb |4 ++-- .../ghostscript/ghostscript_9.02.bb|4 +++- meta/recipes-extended/libtirpc/libtirpc_0.2.1.bb |6 +- meta/recipes-extended/tzdata/tzdata_2011g.bb |4 ++-- meta/recipes-gnome/gnome/gnome-doc-utils.inc |2 ++ meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb |2 +- meta/recipes-support/db/db_5.1.19.bb |2 ++ scripts/native-intercept/chown |2 ++ 11 files changed, 28 insertions(+), 13 deletions(-) create mode 100755 scripts/native-intercept/chown -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Tune files and knobs to turn
A few, what I suspect are corrections. (I'm going to be a bit pedantic here.) On 6/24/11 6:54 AM, Koen Kooi wrote: > Hi, > > We discussed tune files a bit during last nights TSC meeting and Khem had > expressed the need before, so I'd like to get this discussion started by > using armv7a as an example. > > For armv7a capable cores we have the following hardware features: > > * armv7a instruction set > * thumb1 instruction set > * thumb2 instruction set > * VFP coprocessor > * optional NEON coprocessor > > For the ABI we can choose the following: > > * softtp without hw support (e.g. no VFP instructions emitted, slow) > * softfp with hw support (e.g. VFP and/or NEON instructions emitted, fast) > * hardfp, emits VFP and/or NEON instructions, slightly faster than softfp/hw, > incompatible with everything else Actually on ARM there are three ABIs possible but those are not it. OABI - softfp OABI - hardfp EABI As far as I know nobody uses OABI anymore, and I doubt we should support it. The above are really instructions used within the ABI. > And the extra knobs: > > * pure thumb1, no arm instructions (limited use) > * thumb1/arm interworking > * pure thumb2, no arm instructions > * thumb2 interworking (not sure if that's actually usefull, thumb2 has > complete coverage) > > In OE .dev we have the following vars: > > TARGET_FPU: switches between hw float and sw float, no reflection in package > arch > ARM_FP_ABI: switches between softfp and hardfp, will create 'armv7a' or > 'armv7a-hardfp' as package arch > ARM_INSTRUCTION_SET: switches between arm and thumb1, no reflection in > package arch > THUMB_INTERWORK: turns on interworking, no reflection in package arch > > (side note, oe-core/distroless and meta-yocto/poky don't turn set TARGET_FPU > for armv7a and will generate slow code, angstrom does turn it on) > > Khem and I would like to start building armv7a (and armv6) in pure thumb2 > mode but we want to have the variables to turn those knobs make sense and be > consistent. RP has expressed his desire to sort this all out before merging > multilib. I'm sure x86/mips/ppc/etc have a similar need, so let's get this > discussion started. Below is a quick step to capture what all I know of for various architectures, inluding ARM. Note the "tunings" are where I'm a bit sketchy on some architectures. (I think below also point out why I think this needs to be hierarchical.. so it's really easy to inherit common stuff, and override only the pieces you need to.. specifically the tunings.) Arch Family: ARM ABI: - EABI little endian - EABI big endian - canonical os=linux-eabi - library directory is "lib" CPU/ISA: - all use EABI - traditional arm instructions - thumb1, no arm instructions - thumb1/arm, interworking - thumb2, no arm instructions - thumb2, interworking (note, our customers do use this.. I'm not sure how much though) Tunings: - armv4 (both big & little endian) - armv5 (both big & little endian) - armv5 + vfp - armv6 + vfp - armv7a + vfp + neon (supports thumb) (little endian) - armv7a + be8 (supports thumb) (big endian) --- Arch Family: IA32 ABI: - x86_32 - There is a soft-fp variant but it's not really used anymore - hardfp - defined as an LSB standard - library directory is "lib" - x86_64 - hardfp only - defined as an LSB standard - library directory is "lib64" - (x32) - new experimental ABI - library directory is "libx32" CPU/ISA: - x86_32 - all use x86_32 - i586 -> core2 -> corei7 - x86_64 - only 64-bit chips supported - x32 - only 64-bit chips supported Tunings: - i586, i686, core2, etc.. - MMX, MMX2, AVX, etc.. --- Arch Family: MIPS ABI: - MIPS o32 - soft float - big endian - MIPS o32 - hard float - big endian - MIPS o32 - soft float - little endian - MIPS o32 - hard float - little endian - old 32-bit mips library - library path is "lib" - MIPS n32 - soft float - big endian - MIPS n32 - hard float - big endian - MIPS n32 - soft float - little endian - MIPS n32 - hard float - little endian - new 32-bit MIPS64 library - library path is "lib32" - MIPS n64 - soft float - big endian - MIPS n64 - hard float - big endian - MIPS n64 - soft float - little endian - MIPS n64 - hard float - big endian - new 64-bit MIPS64 library - library path is "lib64" CPU/ISA: - MIPS32 - Various - MIPS64 - Various Tunings: - MIPS32 - Various - MIPS64 - Various --- Arch Family: Power ABI: - ppc32 - hard float - ABI defined by LSB - library path is "lib" - ppc32 - soft float - ppc32 - e500v1 (soft-float variant -- likely not needed) - ppc32 - e500v2 (soft-float variant) - library path is "lib" - ppc64 - hard float - library path is "lib64" - ABI defined by LSB CPU/ISA: - ppc32 - hard float - ppc603e - ppc32 - soft float - ppc603ec - ppc32 - e500v1 (soft-float variant) - -mfloat-gprs=single -mspe=yes -mabi=spe - ppc32 - e500v2 (soft-float variant) - -mfloat-gprs=double -mspe=yes -mabi=spe - ppc64 -
Re: [OE-core] Tune files and knobs to turn
On 6/24/11 9:01 AM, Richard Purdie wrote: > On Fri, 2011-06-24 at 13:54 +0200, Koen Kooi wrote: >> We discussed tune files a bit during last nights TSC meeting and Khem >> had expressed the need before, so I'd like to get this discussion >> started by using armv7a as an example. >> >> For armv7a capable cores we have the following hardware features: >> >> * armv7a instruction set >> * thumb1 instruction set >> * thumb2 instruction set >> * VFP coprocessor >> * optional NEON coprocessor >> >> For the ABI we can choose the following: >> >> * softtp without hw support (e.g. no VFP instructions emitted, slow) >> * softfp with hw support (e.g. VFP and/or NEON instructions emitted, fast) >> * hardfp, emits VFP and/or NEON instructions, slightly faster than >> softfp/hw, incompatible with everything else >> >> And the extra knobs: >> >> * pure thumb1, no arm instructions (limited use) >> * thumb1/arm interworking >> * pure thumb2, no arm instructions >> * thumb2 interworking (not sure if that's actually usefull, thumb2 has >> complete coverage) >> >> In OE .dev we have the following vars: >> >> TARGET_FPU: switches between hw float and sw float, no reflection in package >> arch >> ARM_FP_ABI: switches between softfp and hardfp, will create 'armv7a' or >> 'armv7a-hardfp' as package arch >> ARM_INSTRUCTION_SET: switches between arm and thumb1, no reflection in >> package arch >> THUMB_INTERWORK: turns on interworking, no reflection in package arch > > I suspect having a variable per tune feature is going to be a recipe for > disaster. Selecting the tune options is something a machine is likely > going to want a good default of but some distros are going to want to > take control over in some cases too. We've broken the problem down to set of key variables [note these are used in our build system, which is not derived from bitbake/OE.. so the names may clash with current usage.. but I think it's a good example] Arch file: TARGET_TOOLCHAIN_ARCH -- arch family ["arm", "ia32", "power", "mips"] ABI file: TARGET_ARCH - minimal gnu canonical arch - arch component TARGET_OS="linux-gnu" or "linux-eabi" [arm] [used in a gnu canonical arch] TARGET_FUNDAMENTAL_ASFLAGS - minimum flags required by AS to assemble for this ABI TARGET_FUNDAMENTAL_CFLAGS - minimum cflags required by CC to compile for this ABI TARGET_FUNDAMENTAL_LDFLAGS - minimum ldflags required by LD to compile for this ABI TARGET_LIB_DIR="lib64" - library directory for this ABI TARGET_USERSPACE_BITS - bitsize for this ABI TARGET_ENDIAN - endian for this ABI CPU/ISA file & Tuning file: (we combine this in our implementation) TARGET_ARCH -- more descriptive canonical arch for tunings + abi TARGET_COMMON_ASFLAGS - optional assembly flags -- tunings TARGET_COMMON_CFLAGS - optional cflags -- tunings TARGET_COMMON_LDFLAGS - optional ldflags -- tunings > Given the n^2 problem we have with scale it starts to look like we'd > need something like TUNE_FEATURES which I don't feel brilliant about but > it likely could work well. > > I'd also like to look at this from the other direction. What information > do we need from the tune config? Its one thing to set the controls but > we also need to consider what uses the end result and how. Currently the > tune files should really be responsible for: > > TARGET_ARCH > TARGET_FPU > TARGET_CC_ARCH > PACKAGE_ARCH > BASE_PACKAGE_ARCH > PACKAGE_EXTRA_ARCHS > FEED_ARCH > > of which there is some duplication of data. Also, the distro config > typically sets some of this. What we really need is the following: > > * Overall compiler architecture > * Extra libc config data (softfloat?) > * Compiler optimisation flags > * Name of the package "architecture" to use for the config > * List of compatible package "architectures" > > These map to: > > * TARGET_ARCH > * TARGET_FPU > * TARGET_CC_ARCH > * BASE_PACKAGE_ARCH > * PACKAGE_EXTRA_ARCHS > > but we do have issues of these names needing to be overridden so putting > then in some TUNE* namespace variables initially would help clean up the > core significantly. I think it's key to namespace all of these things in a multilib design. That way it's easy to switch between them as we process the individual files. We have another variable (not listed above) called "VARIANT". The variant is what is suffixed to each variable and works very much like the current overrides in OE. > Adding multlilib into the mix doesn't actually make the problem that > much more complex if we followed the simple rule of making the tune > config name an override. This would make the tune files follow the form: > > TARGET_CC_ARCH_tune-armv7a = "xxx" > BASE_PACKAGE_ARCH_tune-armv7a = "xxx" > > and then we'd add tune-xxx to OVERRIDES to select a given tuning for a > given multlilib. Agreed.. our name space is something equivalent to: variable_arch- variable_abi- variable_tune- The arch, abi and tune are selected via a series of included files.. and references. So at each step of proces
[OE-core] [PATCH 2/4] rpm: Change config option
For some reason --without-xz doesn't work the same as --with-xz=none.
We need this set to none, or configure will attempt to find an lzma
header which we might or might not have.
Signed-off-by: Mark Hatle
---
meta/recipes-devtools/rpm/rpm_5.4.0.bb |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index 0c88f91..91089d2 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -84,7 +84,7 @@ rpm_macros_virtclass-native =
"%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{
# Configure values taken from rpm.spec
WITH_BZIP2 = "--with-bzip2"
-WITH_XZ = "--without-xz"
+WITH_XZ = "--with-xz=none"
WITH_Z = "--with-zlib $WITH_BZIP2 $WITH_XZ"
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] gcc: Fix file ownership
Most of the files that end up in the gcc include dir and other
misc files scattered throughout the install get the build users
uid and gid.
Signed-off-by: Mark Hatle
---
.../recipes-devtools/gcc/gcc-configure-runtime.inc |1 +
meta/recipes-devtools/gcc/gcc-package-sdk.inc |2 ++
meta/recipes-devtools/gcc/gcc-package-target.inc |2 ++
meta/recipes-devtools/gcc/libgcc_4.5.1.bb |2 ++
meta/recipes-devtools/gcc/libgcc_4.6.bb|2 ++
5 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
index 339a3c8..34bfaeb 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
@@ -37,6 +37,7 @@ do_install () {
cd ${B}/$d/
oe_runmake 'DESTDIR=${D}' install
done
+ chown -R root:root ${D}
}
INHIBIT_DEFAULT_DEPS = "1"
diff --git a/meta/recipes-devtools/gcc/gcc-package-sdk.inc
b/meta/recipes-devtools/gcc/gcc-package-sdk.inc
index 23b9a48..7db7c52 100644
--- a/meta/recipes-devtools/gcc/gcc-package-sdk.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-sdk.inc
@@ -48,5 +48,7 @@ do_install () {
for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran;
do
ln -sf ${bindir}/${TARGET_PREFIX}$t $dest$t
done
+
+ chown -R root:root ${D}
}
diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc
b/meta/recipes-devtools/gcc/gcc-package-target.inc
index afbcf0d..43e2bd5 100644
--- a/meta/recipes-devtools/gcc/gcc-package-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
@@ -101,4 +101,6 @@ do_install () {
ln -sf g++ c++
ln -sf gcc cc
ln -sf ${bindir}/${TARGET_PREFIX}cpp ${D}${bindir}/cpp
+
+ chown -R root:root ${D}
}
diff --git a/meta/recipes-devtools/gcc/libgcc_4.5.1.bb
b/meta/recipes-devtools/gcc/libgcc_4.5.1.bb
index b6cf268..b0523c7 100644
--- a/meta/recipes-devtools/gcc/libgcc_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/libgcc_4.5.1.bb
@@ -36,6 +36,8 @@ do_install () {
else
mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
fi
+
+ chown -R root:root ${D}
}
do_package_write_ipk[depends] += "virtual/libc:do_package"
diff --git a/meta/recipes-devtools/gcc/libgcc_4.6.bb
b/meta/recipes-devtools/gcc/libgcc_4.6.bb
index b6cf268..b0523c7 100644
--- a/meta/recipes-devtools/gcc/libgcc_4.6.bb
+++ b/meta/recipes-devtools/gcc/libgcc_4.6.bb
@@ -36,6 +36,8 @@ do_install () {
else
mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
fi
+
+ chown -R root:root ${D}
}
do_package_write_ipk[depends] += "virtual/libc:do_package"
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] A few misc recipe fixed
The problems with these recipes were detected over the course of a few make -k world builds.. This allows make world to complete. The following changes since commit 3aec2fa2df9aaa883feda0d7aed85e63d01398b9: qemuimagetest: update cvs and iptables to newer version for toolchain test (2011-06-24 11:28:28 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib mhatle/fix-recipe http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/fix-recipe Mark Hatle (4): gcc: Fix file ownership rpm: Change config option msmtp: Disable gnome keyring linux-firmware: Fix file permissions .../recipes-devtools/gcc/gcc-configure-runtime.inc |1 + meta/recipes-devtools/gcc/gcc-package-sdk.inc |2 ++ meta/recipes-devtools/gcc/gcc-package-target.inc |2 ++ meta/recipes-devtools/gcc/libgcc_4.5.1.bb |2 ++ meta/recipes-devtools/gcc/libgcc_4.6.bb|2 ++ meta/recipes-devtools/rpm/rpm_5.4.0.bb |2 +- meta/recipes-extended/msmtp/msmtp_1.4.24.bb|4 +++- .../linux-firmware/linux-firmware_git.bb |6 +++--- 8 files changed, 16 insertions(+), 5 deletions(-) -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] linux-firmware: Fix file permissions
The firmware was installed 0666 which could have been a security
issue.
Signed-off-by: Mark Hatle
---
.../linux-firmware/linux-firmware_git.bb |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 3d822c5..29f1e78 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -32,9 +32,9 @@ do_compile() {
do_install() {
install -d ${D}/lib/firmware/
# Libertas sd8686
- install -m 0666 libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin
- install -m 0666 libertas/sd8686_v9_helper.bin
${D}/lib/firmware/sd8686_helper.bin
- install -m 0666 LICENCE.libertas ${D}/lib/firmware/
+ install -m 0644 libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin
+ install -m 0644 libertas/sd8686_v9_helper.bin
${D}/lib/firmware/sd8686_helper.bin
+ install -m 0644 LICENCE.libertas ${D}/lib/firmware/
}
PACKAGES = "${PN}-sd8686"
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] msmtp: Disable gnome keyring
Unless we explicitly disable the gnome keyring support, the system
will attemp to discover if it's available which changes the package
output.
Signed-off-by: Mark Hatle
---
meta/recipes-extended/msmtp/msmtp_1.4.24.bb |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/msmtp/msmtp_1.4.24.bb
b/meta/recipes-extended/msmtp/msmtp_1.4.24.bb
index 39a7eea..7f646f8 100644
--- a/meta/recipes-extended/msmtp/msmtp_1.4.24.bb
+++ b/meta/recipes-extended/msmtp/msmtp_1.4.24.bb
@@ -6,7 +6,7 @@ SECTION = "console/network"
PRIORITY = "required"
LICENSE = "GPLv3"
DEPENDS = "zlib gnutls"
-PR = "r1"
+PR = "r2"
#COPYING or Licence
@@ -20,6 +20,8 @@ SRC_URI[sha256sum] =
"f19f3fcc67da448420b3adbd5add09f8fe110664dd64f3c2cd693ef0cb
inherit gettext autotools update-alternatives
+EXTRA_OECONF += "--without-gnome-keyring"
+
ALTERNATIVE_NAME = "sendmail"
ALTERNATIVE_PATH = "${bindir}/msmtp"
ALTERNATIVE_LINK = "${sbindir}/sendmail"
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Uprev prelink
Uprev prelink and fix a couple of issues noticed during the process. The following changes since commit 3aec2fa2df9aaa883feda0d7aed85e63d01398b9: qemuimagetest: update cvs and iptables to newer version for toolchain test (2011-06-24 11:28:28 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib mhatle/prelink http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/prelink Mark Hatle (1): prelink: Uprev prelink to latest version meta/recipes-devtools/prelink/prelink_git.bb | 18 +- 1 files changed, 13 insertions(+), 5 deletions(-) -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] prelink: Uprev prelink to latest version
The latest cross-prelink version tracks the prelink r190 SVN.
Fix two minor issues as well. If we remove the package, we would
unprelink the filesystem after the rm was finished. This is
incorrect.. we need to do this prerm.
Also disable the cron configuration file. This isn't appropriate
for embedded systems, but someone might still find it useful.
Signed-off-by: Mark Hatle
---
meta/recipes-devtools/prelink/prelink_git.bb | 18 +-
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb
b/meta/recipes-devtools/prelink/prelink_git.bb
index 1eea30a..044cb6b 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -8,9 +8,9 @@ and executables, so that far fewer relocations need to be
resolved at \
runtime and thus programs come up faster."
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
-SRCREV = "909470ee441237563d6236c505cb2d02ddc48704"
+SRCREV = "ac461e73b17253a4da25c5aafeac7193b553156c"
PV = "1.0+git${SRCPV}"
-PR = "r2"
+PR = "r3"
SRC_URI = "git://git.yoctoproject.org/prelink-cross.git;protocol=git \
file://prelink.conf \
@@ -35,11 +35,15 @@ do_configure_prepend () {
echo "all:" > ${S}/doc/Makefile.am
}
+# Disabled the cron and cron configuration file, isn't appropriate for
+# embedded systems. (The script re-prelinks the system daily -- on
+# systems where users are adding applications, this might be reasonable
+# but for embedded, we should be re-running prelink -a after an update.)
do_install_append () {
install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default
${D}${sysconfdir}/rpm
install -m 0644 ${WORKDIR}/prelink.conf ${D}${sysconfdir}/prelink.conf
- install -m 0644 ${WORKDIR}/prelink.cron.daily
${D}${sysconfdir}/cron.daily/prelink
- install -m 0644 ${WORKDIR}/prelink.default
${D}${sysconfdir}/default/prelink
+# install -m 0644 ${WORKDIR}/prelink.cron.daily
${D}${sysconfdir}/cron.daily/prelink
+# install -m 0644 ${WORKDIR}/prelink.default
${D}${sysconfdir}/default/prelink
install -m 0644 ${WORKDIR}/macros.prelink
${D}${sysconfdir}/rpm/macros.prelink
}
@@ -53,9 +57,13 @@ fi
prelink -a
}
-pkg_postrm_prelink() {
+pkg_prerm_prelink() {
#!/bin/sh
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
prelink -au
}
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] prelink: Uprev prelink to latest version
On 6/24/11 2:18 PM, Koen Kooi wrote:
>
> Op 24 jun 2011, om 21:10 heeft Mark Hatle het volgende geschreven:
>
>> The latest cross-prelink version tracks the prelink r190 SVN.
>>
>> Fix two minor issues as well. If we remove the package, we would
>> unprelink the filesystem after the rm was finished. This is
>> incorrect.. we need to do this prerm.
>>
>> Also disable the cron configuration file. This isn't appropriate
>> for embedded systems, but someone might still find it useful.
>>
>> Signed-off-by: Mark Hatle
>> ---
>> meta/recipes-devtools/prelink/prelink_git.bb | 18 +-
>> 1 files changed, 13 insertions(+), 5 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/prelink/prelink_git.bb
>> b/meta/recipes-devtools/prelink/prelink_git.bb
>> index 1eea30a..044cb6b 100644
>> --- a/meta/recipes-devtools/prelink/prelink_git.bb
>> +++ b/meta/recipes-devtools/prelink/prelink_git.bb
>> @@ -8,9 +8,9 @@ and executables, so that far fewer relocations need to be
>> resolved at \
>> runtime and thus programs come up faster."
>> LICENSE = "GPLv2"
>> LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
>> -SRCREV = "909470ee441237563d6236c505cb2d02ddc48704"
>> +SRCREV = "ac461e73b17253a4da25c5aafeac7193b553156c"
>> PV = "1.0+git${SRCPV}"
>> -PR = "r2"
>> +PR = "r3"
>>
>> SRC_URI = "git://git.yoctoproject.org/prelink-cross.git;protocol=git \
>>file://prelink.conf \
>> @@ -35,11 +35,15 @@ do_configure_prepend () {
>> echo "all:" > ${S}/doc/Makefile.am
>> }
>>
>> +# Disabled the cron and cron configuration file, isn't appropriate for
>> +# embedded systems. (The script re-prelinks the system daily -- on
>> +# systems where users are adding applications, this might be reasonable
>> +# but for embedded, we should be re-running prelink -a after an update.)
>> do_install_append () {
>> install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default
>> ${D}${sysconfdir}/rpm
>> install -m 0644 ${WORKDIR}/prelink.conf ${D}${sysconfdir}/prelink.conf
>> -install -m 0644 ${WORKDIR}/prelink.cron.daily
>> ${D}${sysconfdir}/cron.daily/prelink
>> -install -m 0644 ${WORKDIR}/prelink.default
>> ${D}${sysconfdir}/default/prelink
>> +# install -m 0644 ${WORKDIR}/prelink.cron.daily
>> ${D}${sysconfdir}/cron.daily/prelink
>> +# install -m 0644 ${WORKDIR}/prelink.default
>> ${D}${sysconfdir}/default/prelink
>> install -m 0644 ${WORKDIR}/macros.prelink
>> ${D}${sysconfdir}/rpm/macros.prelink
>
> How about PACKAGES += prelink-cron, FILES_prelink-cron =
> "{sysconfdir}/cron.dailly" ,etc ,etc ?
I thought about that, but I'm still not sure the stuff is useful.. The default
configuration actually disables prelink and on the next run of cron will
un-prelink your system.
So it's really not useful from what I can tell. Of course we could easily
change the default to "on" instead of off... or change the prelink.bbclass to
enable the cron prelink script if it exists but as it stands it looks more
broken then useful.
--Mark
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Uprev prelink (v2)
Updated the prelink to latest version. Also split out the cron configuration, change the configuration so it's enabled by default. The following changes since commit 3aec2fa2df9aaa883feda0d7aed85e63d01398b9: qemuimagetest: update cvs and iptables to newer version for toolchain test (2011-06-24 11:28:28 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib mhatle/prelink http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/prelink Mark Hatle (1): prelink: Uprev prelink to latest version .../prelink/prelink/prelink.default|2 +- meta/recipes-devtools/prelink/prelink_git.bb | 25 +-- 2 files changed, 23 insertions(+), 4 deletions(-) -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] prelink: Uprev prelink to latest version (V2)
The latest cross-prelink version tracks the prelink r190 SVN.
Fix two minor issues as well. If we remove the package, we would
unprelink the filesystem after the rm was finished. This is
incorrect.. we need to do this prerm.
Move the cron and cron configuration file to a new package split.
This item is not valid for most embedded users.
Signed-off-by: Mark Hatle
---
.../prelink/prelink/prelink.default|2 +-
meta/recipes-devtools/prelink/prelink_git.bb | 25 +--
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/prelink/prelink/prelink.default
b/meta/recipes-devtools/prelink/prelink/prelink.default
index 901258e..d8802f8 100644
--- a/meta/recipes-devtools/prelink/prelink/prelink.default
+++ b/meta/recipes-devtools/prelink/prelink/prelink.default
@@ -2,7 +2,7 @@
# or to yes to enable it.
# (if you change this from yes to no prelink -ua
# will be run next night to undo prelinking)
-PRELINKING=unknown
+PRELINKING=yes
# Options to pass to prelink
# -m Try to conserve virtual memory by allowing overlapping
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb
b/meta/recipes-devtools/prelink/prelink_git.bb
index 1eea30a..b57c145 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -8,9 +8,24 @@ and executables, so that far fewer relocations need to be
resolved at \
runtime and thus programs come up faster."
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
-SRCREV = "909470ee441237563d6236c505cb2d02ddc48704"
+SRCREV = "ac461e73b17253a4da25c5aafeac7193b553156c"
PV = "1.0+git${SRCPV}"
-PR = "r2"
+PR = "r3"
+
+#
+# The cron script attempts to re-prelink the system daily -- on
+# systems where users are adding applications, this might be reasonable
+# but for embedded, we should be re-running prelink -a after an update.
+#
+# Default is prelinking is enabled.
+#
+SUMMARY_${PN}-cron = "Cron scripts to control automatic prelinking"
+DESCRIPTION_${PN}-cron = "Cron scripts to control automatic prelinking. \
+See: ${sysconfdir}/cron.daily/prelink for configuration information."
+
+FILES_${PN}-cron = "${sysconfdir}/cron.daily ${sysconfdir}/default"
+
+PACKAGES =+ "${PN}-cron"
SRC_URI = "git://git.yoctoproject.org/prelink-cross.git;protocol=git \
file://prelink.conf \
@@ -53,9 +68,13 @@ fi
prelink -a
}
-pkg_postrm_prelink() {
+pkg_prerm_prelink() {
#!/bin/sh
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
prelink -au
}
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] prelink: Uprev prelink to latest version (V2)
On 6/24/11 3:51 PM, Khem Raj wrote: > On (24/06/11 14:42), Mark Hatle wrote: >> The latest cross-prelink version tracks the prelink r190 SVN. >> >> Fix two minor issues as well. If we remove the package, we would >> unprelink the filesystem after the rm was finished. This is >> incorrect.. we need to do this prerm. >> >> Move the cron and cron configuration file to a new package split. >> This item is not valid for most embedded users. >> >> Signed-off-by: Mark Hatle >> --- >> .../prelink/prelink/prelink.default|2 +- >> meta/recipes-devtools/prelink/prelink_git.bb | 25 >> +-- >> 2 files changed, 23 insertions(+), 4 deletions(-) >> >> diff --git a/meta/recipes-devtools/prelink/prelink/prelink.default >> b/meta/recipes-devtools/prelink/prelink/prelink.default >> index 901258e..d8802f8 100644 >> --- a/meta/recipes-devtools/prelink/prelink/prelink.default >> +++ b/meta/recipes-devtools/prelink/prelink/prelink.default >> @@ -2,7 +2,7 @@ >> # or to yes to enable it. >> # (if you change this from yes to no prelink -ua >> # will be run next night to undo prelinking) >> -PRELINKING=unknown >> +PRELINKING=yes >> > > this is a functionality change. Will it have system wide effects ? If the user previously had the prelinker installed onto the target, and had the cron system installed to run the daily scripts, and never bothered to configure prelink before.. whenever the script ran it would undo any prelinking that had occurred. After the change, it's now optional to install the cron scripts. If they are installed, they default to -on- which means that if cron runs the script it will attempt to update the prelinking on the system. This does not affect the build-time prelinking in any way. For many systems there is no reason to have the prelinker on the target, it's only needed for field upgrades. So, I consider this an enhancement (splitting the script out to make it optional), and a bug-fix -- enabling re-prelink functionality if the script is installed -- vs the previous "un-prelink" being the default. --Mark > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Ensure a reasonable umask, and fix up permissions (V2)
Revised the fixup_perms function in package.bbclass. Change to using a class based approach for the individual permissions entries. Add support for directory linkages. Add entries to match base-files recipe in the fs-perms.txt. (umask commit is unchanged, resending due to time since last sent) V1 log below Add a new function that is responsible for fixing directory and file permissions, owners and groups during the packaging process. This will fix various issues where two packages may create the same directory and end up with different permissions, owner and/or group. The issue being resolved is that if two packages conflict in their ownership of a directory, the first installed into the rootfs sets the permissions. This leads to a least potentially non-deterministic filesystems, at worst security defects. The user can specify their own settings via the configuration files specified in FILESYSTEM_PERMS_TABLES. If this is not defined, it will fall back to loading files/fs-perms.txt from BBPATH. The format of this file is documented within the file. By default all of the system directories, specified in bitbake.conf, will be fixed to be 0755, root, root. The fs-perms.txt contains a few default entries to correct documentation, locale, headers and debug sources. It was discovered these are often incorrect due to being directly copied from the build user environment. Also tweak a couple of warnings to provide more diagnostic information. The following changes since commit 0009fa951d45c742963279b0d9740c1209b46456: linux-firmware: Fix file permissions (2011-06-24 13:32:21 -0500) are available in the git repository at: git://git.pokylinux.org/poky-contrib mhatle/perms http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/perms Mark Hatle (3): Add umask task control classes/package.bbclass: Add fixup_perms meta/classes/base.bbclass |4 + meta/classes/image.bbclass |2 + meta/classes/package.bbclass | 253 +++- meta/classes/staging.bbclass |1 + meta/files/fs-perms.txt| 69 ++ .../installer/adt-installer_1.0.bb |2 + meta/recipes-kernel/linux/linux-tools.inc |2 + 7 files changed, 346 insertions(+), 14 deletions(-) create mode 100644 meta/files/fs-perms.txt -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] Add umask task control
Bitbake now allows the umask to be specified per task. The
following tasks will have a umask of 022 set by default:
do_configure
do_compile
do_install
do_package
do_populate_sysroot
do_rootfs
do_configure and do_compile need a umask of 022 set because -many- recipes
directly copy generated files out of recipe's build directory. Instead of
fixing each existing and future recipe, it was shown to be much easier to
just set the umask.
Signed-off-by: Mark Hatle
---
meta/classes/base.bbclass |4
meta/classes/image.bbclass |2 ++
meta/classes/staging.bbclass |1 +
.../installer/adt-installer_1.0.bb |2 ++
meta/recipes-kernel/linux/linux-tools.inc |2 ++
5 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 119b052..9a07f49 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -262,14 +262,18 @@ python () {
# If we're building a target package we need to use fakeroot (pseudo)
# in order to capture permissions, owners, groups and special files
if not bb.data.inherits_class('native', d) and not
bb.data.inherits_class('cross', d):
+bb.data.setVarFlag('do_configure', 'umask', 022, d)
+bb.data.setVarFlag('do_compile', 'umask', 022, d)
deps = (bb.data.getVarFlag('do_install', 'depends', d) or "").split()
deps.append('virtual/fakeroot-native:do_populate_sysroot')
bb.data.setVarFlag('do_install', 'depends', " ".join(deps),d)
bb.data.setVarFlag('do_install', 'fakeroot', 1, d)
+bb.data.setVarFlag('do_install', 'umask', 022, d)
deps = (bb.data.getVarFlag('do_package', 'depends', d) or "").split()
deps.append('virtual/fakeroot-native:do_populate_sysroot')
bb.data.setVarFlag('do_package', 'depends', " ".join(deps),d)
bb.data.setVarFlag('do_package', 'fakeroot', 1, d)
+bb.data.setVarFlag('do_package', 'umask', 022, d)
bb.data.setVarFlag('do_package_setscene', 'fakeroot', 1, d)
source_mirror_fetch = bb.data.getVar('SOURCE_MIRROR_FETCH', d, 0)
if not source_mirror_fetch:
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 2469442..e77ec42 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -83,6 +83,8 @@ do_build[nostamp] = "1"
# Must call real_do_rootfs() from inside here, rather than as a separate
# task, so that we have a single fakeroot context for the whole process.
+do_rootfs[umask] = 022
+
fakeroot do_rootfs () {
#set -x
rm -rf ${IMAGE_ROOTFS}
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index fef6457..04d51ed 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -58,6 +58,7 @@ sysroot_stage_all() {
}
do_populate_sysroot[dirs] = "${SYSROOT_DESTDIR}"
+do_populate_sysroot[umask] = 022
addtask populate_sysroot after do_install
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb
b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index 8f6e91f..0537440 100644
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -54,6 +54,8 @@ SRC_URI =
"svn://opkg.googlecode.com/svn;module=trunk;proto=http \
file://opkg/conf/opkg-sdk-i686.conf \
"
+do_deploy[umask] = 022
+
fakeroot do_deploy () {
cd ${WORKDIR}
mkdir -p ${ADT_DEPLOY}
diff --git a/meta/recipes-kernel/linux/linux-tools.inc
b/meta/recipes-kernel/linux/linux-tools.inc
index e4740d7..729e912 100644
--- a/meta/recipes-kernel/linux/linux-tools.inc
+++ b/meta/recipes-kernel/linux/linux-tools.inc
@@ -19,6 +19,8 @@ fakeroot do_install_perf() {
addtask compile_perf after do_compile before do_install
addtask install_perf after do_install before do_package
+do_compile_perf[umask] = 022
+do_install_perf[umask] = 022
PERFDEPENDS = "virtual/libc:do_populate_sysroot elfutils:do_populate_sysroot"
PERFDEPENDS_libc-uclibc = ""
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] classes/package.bbclass: Add fixup_perms (V2)
Add a new function that is responsible for fixing directory and file
permissions, owners and groups during the packaging process. This will fix
various issues where two packages may create the same directory and end up
with different permissions, owner and/or group.
The issue being resolved is that if two packages conflict in their ownership
of a directory, the first installed into the rootfs sets the permissions.
This leads to a least potentially non-deterministic filesystems, at worst
security defects.
The user can specify their own settings via the configuration files
specified in FILESYSTEM_PERMS_TABLES. If this is not defined, it will
fall back to loading files/fs-perms.txt from BBPATH. The format of this
file is documented within the file.
By default all of the system directories, specified in bitbake.conf, will
be fixed to be 0755, root, root.
The fs-perms.txt contains a few default entries to correct documentation,
locale, headers and debug sources. It was discovered these are often
incorrect due to being directly copied from the build user environment.
The entries needed to match the base-files package have also been added.
Also tweak a couple of warnings to provide more diagnostic information.
Signed-off-by: Mark Hatle
---
meta/classes/package.bbclass | 253 --
meta/files/fs-perms.txt | 69
2 files changed, 312 insertions(+), 10 deletions(-)
create mode 100644 meta/files/fs-perms.txt
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 8f91c95..0161c68 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -16,24 +16,26 @@
# d) split_and_strip_files - split the files into runtime and debug and strip
them.
#Debug files include debug info split, and associated sources that end up
in -dbg packages
#
-# e) populate_packages - Split the files in PKGD into separate packages in
PKGDEST/
+# e) fixup_perms - Fix up permissions in the package before we split it.
+#
+# f) populate_packages - Split the files in PKGD into separate packages in
PKGDEST/
#Also triggers the binary stripping code to put files in -dbg packages.
#
-# f) package_do_filedeps - Collect perfile run-time dependency metadata
+# g) package_do_filedeps - Collect perfile run-time dependency metadata
#The data is stores in FILER{PROVIDES,DEPENDS}_file_pkg variables with
#a list of affected files in FILER{PROVIDES,DEPENDS}FLIST_pkg
#
-# g) package_do_shlibs - Look at the shared libraries generated and
autotmatically add any
+# h) package_do_shlibs - Look at the shared libraries generated and
autotmatically add any
#depenedencies found. Also stores the package name so anyone else using
this library
#knows which package to depend on.
#
-# h) package_do_pkgconfig - Keep track of which packages need and provide
which .pc files
+# i) package_do_pkgconfig - Keep track of which packages need and provide
which .pc files
#
-# i) read_shlibdeps - Reads the stored shlibs information into the metadata
+# j) read_shlibdeps - Reads the stored shlibs information into the metadata
#
-# j) package_depchains - Adds automatic dependencies to -dbg and -dev packages
+# k) package_depchains - Adds automatic dependencies to -dbg and -dev packages
#
-# k) emit_pkgdata - saves the packaging data into PKGDATA_DIR for use in later
+# l) emit_pkgdata - saves the packaging data into PKGDATA_DIR for use in later
#packaging steps
inherit packagedata
@@ -237,7 +239,7 @@ def splitfile2(debugsrcdir, d):
# We need to ignore files that are not actually ours
# we do this by only paying attention to items from this package
processdebugsrc += "fgrep -z '%s' | "
- processdebugsrc += "(cd '%s' ; cpio -pd0mL '%s%s' 2>/dev/null)"
+ processdebugsrc += "(cd '%s' ; cpio -pd0mL --no-preserve-owner '%s%s'
2>/dev/null)"
os.system(processdebugsrc % (sourcefile, workbasedir, workparentdir,
dvar, debugsrcdir))
@@ -410,10 +412,239 @@ python perform_packagecopy () {
os.system('tar -cf - -C %s -ps . | tar -xf - -C %s' % (dest, dvar))
}
+# We generate a master list of directories to process, we start by
+# seeding this list with reasonable defaults, then load from
+# the fs-perms.txt files
+python fixup_perms () {
+ import os, pwd, grp
+
+ # init using a string with the same format as a line as documented in
+ # the fs-perms.txt file
+ #
+ # link
+ #
+ # __str__ can be used to print out an entry in the input format
+ #
+ # if fs_perms_entry.path is None:
+ # an error occured
+ # if fs_perms_entry.link, you can retrieve:
+ # fs_perms_entry.path = path
+ # fs_perms_entry.link = target of link
+ # if not fs_perms_entry.link, you can retrieve:
+ #
Re: [OE-core] [PATCH 0/2] Ensure a reasonable umask, and fix up permissions (V2)
On 6/27/11 10:31 AM, Koen Kooi wrote: > > Op 27 jun 2011, om 17:26 heeft Mark Hatle het volgende geschreven: > >> Revised the fixup_perms function in package.bbclass. Change to using a >> class based approach for the individual permissions entries. >> >> Add support for directory linkages. >> >> Add entries to match base-files recipe in the fs-perms.txt. >> >> (umask commit is unchanged, resending due to time since last sent) >> >> >> >> V1 log below >> >> Add a new function that is responsible for fixing directory and file >> permissions, owners and groups during the packaging process. This will fix >> various issues where two packages may create the same directory and end up >> with different permissions, owner and/or group. >> >> The issue being resolved is that if two packages conflict in their ownership >> of a directory, the first installed into the rootfs sets the permissions. >> This leads to a least potentially non-deterministic filesystems, at worst >> security defects. >> >> The user can specify their own settings via the configuration files >> specified in FILESYSTEM_PERMS_TABLES. If this is not defined, it will >> fall back to loading files/fs-perms.txt from BBPATH. The format of this >> file is documented within the file. >> >> By default all of the system directories, specified in bitbake.conf, will >> be fixed to be 0755, root, root. >> >> The fs-perms.txt contains a few default entries to correct documentation, >> locale, headers and debug sources. It was discovered these are often >> incorrect due to being directly copied from the build user environment. >> >> Also tweak a couple of warnings to provide more diagnostic information. > > Does this rely on the umask feature in bitbake master? If so, we should check > the minumum bitbake requirements again It relies upon it, however no failures will occur if bitbake master doesn't support the umask control. (Of course then the user's umask is inherited.) --Mark > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [Draft design][RFC] Running postinst at rootfs generation time
On 6/27/11 9:09 PM, Cui, Dexuan wrote: > Hi all, below is an initial investigation about the task and we'll continue > to further look into it. > > In poky we have 2 types of postinst scripts: one (type-1) can be (and has > already been) run at rootfs generation time and the other (type-2) has to be > delayed to the first-boot of target device. Type-2 makes target device's > first-boot slow and it would be great if we can fix it and convert it to > type-1. > > We can instrument a first-boot with minimal/sato first to see which > postinstalls take the most time and then prioritise those ones to fix. > > I figurerd out a list of 33 recipes in total(recipes with the same name but > with different versions are counted once) we possibly need to fix. > For the recipes, we need try to find recipe-specific ways(use appropriately > modified native utilities to generate caches, files, etc as necessary on the > target filesystem). > ... > 1 recipe: prelink: we could propablly fix it, but I'm not sure yet. > meta/recipes-devtools/prelink/prelink_git.bb There is nothing to do for the prelinker. The "image-prelink.bbclass" handles everything needed to prelink during image creation. The script is only there for on-target field upgrades. So you can remove this from your list. --Mark ... > > Thanks, > -- Dexuan > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info
On 6/28/11 1:45 AM, Koen Kooi wrote:
>
> Op 28 jun 2011, om 07:37 heeft Dexuan Cui het volgende geschreven:
>
>> Signed-off-by: Dexuan Cui
>> ---
>> meta/classes/base.bbclass | 14 +-
>> 1 files changed, 13 insertions(+), 1 deletions(-)
>>
>> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
>> index 119b052..4766c77 100644
>> --- a/meta/classes/base.bbclass
>> +++ b/meta/classes/base.bbclass
>> @@ -165,9 +165,21 @@ python base_eventhandler() {
>> note(msg)
>>
>> if name.startswith("BuildStarted"):
>> +corebase = data.getVar("COREBASE", e.data, 1)
>> +corelayers = [corebase + "/meta", corebase + "/meta-yocto"]
>> +layers = (data.getVar("BBLAYERS", e.data, 1) or "").split()
>> +layers = [i for i in layers if i not in corelayers]
>> +fmt_str = "%-27s = \"%s\""
>> +layer_branches = [fmt_str % (os.path.basename(i)+"_BRANCH", \
>> +base_get_metadata_git_branch(i, None).strip()) for i in
>> layers]
>> +layer_revisions = [fmt_str % (os.path.basename(i)+"_REVISION", \
>> +base_get_metadata_git_revision(i, None)) for i in
>> layers]
>> bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
>> statusvars = ['BB_VERSION', 'METADATA_BRANCH',
>> 'METADATA_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO',
>> 'DISTRO_VERSION','TARGET_FPU']
>> -statuslines = ["%-17s = \"%s\"" % (i, bb.data.getVar(i, e.data,
>> 1) or '') for i in statusvars]
>> +statuslines = [fmt_str % (i, bb.data.getVar(i, e.data, 1) or
>> '') for i in statusvars]
>> +for i in range(len(layer_branches)):
>> +statuslines.insert(3+2*i, layer_branches[i])
>> +statuslines.insert(3+2*i+1, layer_revisions[i])
>> statusmsg = "\nOE Build Configuration:\n%s\n" %
>> '\n'.join(statuslines)
>> print statusmsg
>
> I tried this patch and I get:
>
> OE Build Configuration:
> BB_VERSION = "1.13.1"
> METADATA_BRANCH = "master"
> METADATA_REVISION = "364ca0d2d0399c8cc6d3b3fc28308e1e14673544"
> meta-angstrom_BRANCH= "master"
> meta-angstrom_REVISION = "c19c342c62416752117c2dce4696840bc864f647"
...
> TARGET_ARCH = "arm"
> TARGET_OS = "linux-gnueabi"
> MACHINE = "beagleboard"
> DISTRO = "angstrom"
> DISTRO_VERSION = "v2011.06-core"
> TARGET_FPU = "hard"
>
> So it works as expected, but the output is a bit confusing. I have a few
> (conflicting) suggestions:
>
> 1) replace _BRANCH and _REVISION with ' branch' and ' revision', e.g.:
>
> meta-archos branch = "master"
> meta-archos revision= "413933fb5f62574e38a9a1e38905ba6e9c1be4ad"
>
> 2) for the extra layers put branch and revision on a single line:
>
> meta-archos = "master/413933fb5f62574e38a9a1e38905ba6e9c1be4ad"
>
> 3) Move the revision info down, e..g
>
> OE Build Configuration:
> BB_VERSION = "1.13.1"
> TARGET_ARCH = "arm"
> TARGET_OS = "linux-gnueabi"
> MACHINE = "beagleboard"
> DISTRO = "angstrom"
> DISTRO_VERSION = "v2011.06-core"
> TARGET_FPU = "hard"
> METADATA_BRANCH = "master"
> METADATA_REVISION = "364ca0d2d0399c8cc6d3b3fc28308e1e14673544"
> meta-angstrom_BRANCH= "master"
> meta-angstrom_REVISION = "c19c342c62416752117c2dce4696840bc864f647"
>
> etc.
>
> What do you think about that?
I think my preference is either 3 or a combination of 2 & 3.
To me the important bits are the configuration settings, followed by the
components that are being used as a secondary concern. It will all help in
debugging and issue, but if the target/distro isn't correct then it doesn't
matter what the rest is.
--Mark
> regards,
>
> Koen
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/7] useradd.bbclass: new class for managing user/group permissions
On 6/28/11 8:04 AM, Richard Purdie wrote:
> Hi Scott,
>
> Sorry its taken me a while to get to this. Some comments below.
I think I know the answer to a few of the issues mentioned below. Scott can
correct me if I'm wrong.
> On Thu, 2011-06-02 at 16:50 -0700, Scott Garman wrote:
>> This class is to be used by recipes that need to set up specific
>> user/group accounts and set custom file/directory permissions.
>>
>> Signed-off-by: Scott Garman
>> ---
>> meta/classes/useradd.bbclass | 163
>> ++
>> 1 files changed, 163 insertions(+), 0 deletions(-)
>> create mode 100644 meta/classes/useradd.bbclass
>>
>> diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
>> new file mode 100644
>> index 000..3f07e5e
>> --- /dev/null
>> +++ b/meta/classes/useradd.bbclass
>> @@ -0,0 +1,163 @@
>> +USERADDPN ?= "${PN}"
>> +
>> +# base-passwd-cross provides the default passwd and group files in the
>> +# target sysroot, and shadow-native provides the utilities needed to
>> +# add and modify user and group accounts
>> +DEPENDS_append = " base-passwd shadow-native"
>> +RDEPENDS_${USERADDPN}_append = " base-passwd shadow"
>> +
>> +PSEUDO="${STAGING_DIR_NATIVE}/usr/bin/pseudo"
>> +export PSEUDO
>
> For reference this can be done with:
>
> export PSEUDO = "${STAGING_DIR_NATIVE}/usr/bin/pseudo"
>
>> +PSEUDO_LOCALSTATEDIR="${STAGING_DIR_TARGET}/var/pseudo"
>> +export PSEUDO_LOCALSTATEDIR
>
> I'm a little bit puzzled at this point. This is changing the default
> PSEUDO state directory to be one shared by many other users rather than
> the default of the one in workdir. Is that really what you intend here?
>
> I guess the question is whether we need to preserve these users in the
> sysroot or whether preserving them for the install/package/package_write
> cycle is enough.
If we're populating the sysroot, we need to have a pseudo directory setup for it
so that we can run the adduser/group items. The new adduser/group require the
ability to "chroot" into a (pseudo) root. The above should only kick in while
working with sysroots.
> Since tasks don't share the same pseudo context by default, I suspect
> we're not preserving users for the sysroot anyhow?
Users are added/preserved within the sysroot /etc/passwd,group in the code.
There is a separate section that runs at sysroot population time that adds the
necessary users/groups... but as mentioned we need the chroot functionality to
do the settings. (The uid/gid of the files themselves doesn't matter in the
sysroot.)
>> +PSEUDO_PASSWD = "${STAGING_DIR_TARGET}"
>> +export PSEUDO_PASSWD
>
> Should we set this by default as part of the pseudo options in
> bitbake.conf?
Yes, this likely should go into the bitbake.conf now. I believe it is in here
though for the same reason that the above was. It's needed during the sysroot
configuration and the way the utilities work when chrooted.
>> +useradd_preinst () {
>> +OPT=""
>> +SYSROOT=""
>> +
>> +if test "x$D" != "x"; then
>> +# Installing into a sysroot
>> +SYSROOT="${STAGING_DIR_TARGET}"
>> +OPT="--root ${STAGING_DIR_TARGET}"
>> +
>> +# Add groups and users defined for all recipe packages
>> +GROUPADD_PARAM="${@get_all_cmd_params(d, 'group')}"
>> +USERADD_PARAM="${@get_all_cmd_params(d, 'user')}"
>> +else
>> +# Installing onto a target
>> +PSEUDO=""
>> +
>> +# Add groups and users defined only for this package
>> +GROUPADD_PARAM="${GROUPADD_PARAM}"
>> +USERADD_PARAM="${USERADD_PARAM}"
>> +fi
>> +
>> +# Perform group additions first, since user additions may depend
>> +# on these groups existing
>> +if test "x$GROUPADD_PARAM" != "x"; then
>> +echo "Running groupadd commands..."
>> +# Invoke multiple instances of groupadd for parameter lists
>> +# separated by ';'
>> +opts=`echo "$GROUPADD_PARAM" | cut -d ';' -f 1`
>> +remaining=`echo "$GROUPADD_PARAM" | cut -d ';' -f 2-`
>> +while test "x$opts" != "x"; do
>> +eval $PSEUDO groupadd -f $OPT $opts
>
> If this task is already running under pseudo, do we specifically need to
> run under pseudo here? Is it not already running under pseudo when
> needed?
See answer below...
>> +if test "x$opts" = "x$remaining"; then
>> +break
>> +fi
>> +opts=`echo "$remaining" | cut -d ';' -f 1`
>> +remaining=`echo "$remaining" | cut -d ';' -f 2-`
>> +done
>> +fi
>> +
>> +if test "x$USERADD_PARAM" != "x"; then
>> +echo "Running useradd commands..."
>> +# Invoke multiple instances of useradd for parameter lists
>> +# separated by ';'
>> +opts=`echo "$USERADD_PARAM" | cut -d ';' -f 1`
>> +remaining=`echo "$USERADD_PARAM" | cut -d ';' -f 2-`
>> +while test "x$opts" != "x"; do
>> +# useradd does not have a -f option, so we have to check if the
>> +# username already exists manually
>> +username=`echo "$opts" | awk '{ print $N
Re: [OE-core] [Draft design][RFC] Running postinst at rootfs generation time
On 6/28/11 8:15 AM, Richard Purdie wrote: > On Mon, 2011-06-27 at 23:11 -0500, Mark Hatle wrote: >> On 6/27/11 9:09 PM, Cui, Dexuan wrote: >>> Hi all, below is an initial investigation about the task and we'll continue >>> to further look into it. >>> >>> In poky we have 2 types of postinst scripts: one (type-1) can be (and has >>> already been) run at rootfs generation time and the other (type-2) has to >>> be delayed to the first-boot of target device. Type-2 makes target device's >>> first-boot slow and it would be great if we can fix it and convert it to >>> type-1. >>> >>> We can instrument a first-boot with minimal/sato first to see which >>> postinstalls take the most time and then prioritise those ones to fix. >>> >>> I figurerd out a list of 33 recipes in total(recipes with the same name but >>> with different versions are counted once) we possibly need to fix. >>> For the recipes, we need try to find recipe-specific ways(use appropriately >>> modified native utilities to generate caches, files, etc as necessary on >>> the target filesystem). >>> >> >> ... >> >>> 1 recipe: prelink: we could propablly fix it, but I'm not sure yet. >>> meta/recipes-devtools/prelink/prelink_git.bb >> >> There is nothing to do for the prelinker. The "image-prelink.bbclass" >> handles >> everything needed to prelink during image creation. The script is only there >> for on-target field upgrades. So you can remove this from your list. > > Mark, are you 100% sure about this? > > It looks like if we install prelink into an image it adds a post install > which runs "prelink -a" on the target device at first boot. > > This would happen regardless of whether the cross prelinker did or did > not prelink the image :/. That is certainly not the intention of this code. If it does, it should be a fairly quick bug to fix -- and improve boot-time. (Of course, this only should be skipped if we've done image-prelink.bbclass.) I'll attempt to look into this shortly --Mark > Cheers, > > Richard > > > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info
On 6/28/11 10:21 AM, Cui, Dexuan wrote: > Koen Kooi wrote: >> Op 28 jun 2011, om 16:52 heeft Cui, Dexuan het volgende geschreven: >> >>> Hi, thank you very much for the suggestions! >>> I worked out a vesion 2 patch that combines 2 and 3: >>> http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/commit/?h=dcui/banner_v2&id=2c2d9d7c0e942b6748bc8bd7d5980113bae9a836 >> >> Could you in the future please base them on oe-core instead of poky? >> I just did 'git merge 2c2d9d7c0e942b6748bc8bd7d5980113bae9a836' and >> git blew up. > Sorry... but to basing them on oe-core, do I need the permission to push my > commits to my own branch in > git://git.openembedded.org/openembedded-core-contrib? I suppose so and I > should put my public key somewhere into the server? You can push oe-core (based) changes to the poky-contrib tree. Many of us do this regularly. I base my changes usually on oe-core, unless they contain poky specific code.. I push both types to the same poky-contrib repository (in different branches of course). (I also always avoid "merge", and always use cherry-pick when pulling code from someone else's branches into my own..) --Mark > Thanks, > -- Dexuan > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Fix prelink to avoid first boot script
In most cases the user will have the image-prelink enabled, which will prelink the target image at image creation time. If this is enabled we want to avoid prelinking at first boot. We do this by setting the script exit status to '0' if we detect we're on the host. Also fixes a small bug found in sstate.bbclass: do_cleansstate The following changes since commit 8a5c20417d4d6bee6dd0bcdbeb8d4f9e0696a216: [PATCH] u-boot-mkimage: bump version to 2011.03 (2011-06-28 17:13:12 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib mhatle/prelink http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/prelink Mark Hatle (2): sstate.bbclass: Fix an issue if the config changes prelink_git.bb: Only block the postinst script when no image-prelink meta/classes/sstate.bbclass |2 ++ meta/recipes-devtools/prelink/prelink_git.bb |6 -- 2 files changed, 6 insertions(+), 2 deletions(-) -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] sstate.bbclass: Fix an issue if the config changes
We need to check if we know of the task type, before we attempt
to process it. In order to reproduce the problem build with:
PACKAGE_CLASSES = "package_ipk"
Then change it to:
PACKAGE_CLASSES = "package_rpm"
Build again -- and then try bitbake -c cleansstate
Signed-off-by: Mark Hatle
---
meta/classes/sstate.bbclass |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 14c90ec..0daaf48 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -273,6 +273,8 @@ python sstate_cleanall() {
name = manifest.replace(manifest_pattern[:-1], "")
namemap = d.getVar('SSTATETASKNAMES', True).split()
tasks = d.getVar('SSTATETASKS', True).split()
+ if name not in namemap:
+ continue
taskname = tasks[namemap.index(name)]
shared_state = sstate_state_fromvars(d, taskname[3:])
sstate_clean(shared_state, d)
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] prelink_git.bb: Only block the postinst script when no image-prelink
If image-prelink is being used, the system will automatically prelink
the target image. This avoids the need to run the postinst prelink
script at first boot. However, if the user has not enabled image
prelinking -- then we do enable the script to run on first boot.
Signed-off-by: Mark Hatle
---
meta/recipes-devtools/prelink/prelink_git.bb |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb
b/meta/recipes-devtools/prelink/prelink_git.bb
index b57c145..1b34e59 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -10,7 +10,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
SRCREV = "ac461e73b17253a4da25c5aafeac7193b553156c"
PV = "1.0+git${SRCPV}"
-PR = "r3"
+PR = "r4"
#
# The cron script attempts to re-prelink the system daily -- on
@@ -58,11 +58,13 @@ do_install_append () {
install -m 0644 ${WORKDIR}/macros.prelink
${D}${sysconfdir}/rpm/macros.prelink
}
+# If we're using mklibs-prelink, we want to skip this on the host side
+# but still do it if the package is installed on the target...
pkg_postinst_prelink() {
#!/bin/sh
if [ "x$D" != "x" ]; then
- exit 1
+ ${@base_contains('USER_CLASSES', 'image-prelink', 'exit 0', 'exit 1', d)}
fi
prelink -a
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] prelink_git.bb: Only block the postinst script when no image-prelink (v2)
[V2 - fix a small typo in the comment]
If image-prelink is being used, the system will automatically prelink
the target image. This avoids the need to run the postinst prelink
script at first boot. However, if the user has not enabled image
prelinking -- then we do enable the script to run on first boot.
Signed-off-by: Mark Hatle
---
meta/recipes-devtools/prelink/prelink_git.bb |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb
b/meta/recipes-devtools/prelink/prelink_git.bb
index b57c145..c653d4d 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -10,7 +10,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
SRCREV = "ac461e73b17253a4da25c5aafeac7193b553156c"
PV = "1.0+git${SRCPV}"
-PR = "r3"
+PR = "r4"
#
# The cron script attempts to re-prelink the system daily -- on
@@ -58,11 +58,13 @@ do_install_append () {
install -m 0644 ${WORKDIR}/macros.prelink
${D}${sysconfdir}/rpm/macros.prelink
}
+# If we're using image-prelink, we want to skip this on the host side
+# but still do it if the package is installed on the target...
pkg_postinst_prelink() {
#!/bin/sh
if [ "x$D" != "x" ]; then
- exit 1
+ ${@base_contains('USER_CLASSES', 'image-prelink', 'exit 0', 'exit 1', d)}
fi
prelink -a
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] prelink_git.bb: Only block the postinst script when no image-prelink (v2)
On 6/29/11 9:42 AM, Phil Blundell wrote: > On Wed, 2011-06-29 at 22:39 +0800, Cui, Dexuan wrote: >> Even if without the patch, we still skip this on the host side -- previously >> we skipped with "exit 1", and with the patch now we skip with "exit 1" or >> "exit 0". >> So IMHO looks the patch doesn't actually help? :-) > > If the script exits with 0 in offline mode then it won't get rerun at > first boot on the target. If it exits with 1 then it will. Yes. Since we've already run the equivalent of the script in the image-prelink, we can safely exit with a '0' telling the "image" preinst code that this was successfully run and to ignore it at first boot. --Mark > p. > > > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] How to reuse code in oe-core environment
On 6/29/11 6:59 PM, Chris Larson wrote:
> On Wed, Jun 29, 2011 at 4:02 PM, Andreas Mueller wrote:
>> foo() {
>># code to reuse
>> }
>>
>> and called foo from several recipes. In oe-core the run.* scripts are much
>> more
>> stripped of unnecessary. All the code included by 'require' seems to miss,
>> so
>> the function foo() will not be found.
>>
>> My searches for examples did not lead to a hook so what is the suggested
>> solution for reusing code for multiple recipes in oe-core?
>
> The require doesn't have to do with anything. bitbake emits only the
> functions which get called somewhere from the task being run. It
> tracks what variables reference what other variables. If you call a
> shell function from another shell function, it tracks this, and
> realizes that both need to be emitted. Either you're doing something
> wrong, or you're doing something in a way that bitbake can't track.
> There's a variable flag you can set to explicitly add variable
> dependencies.
There is an example of how to work around this in the rootfs_rpm.bbclass.. It's
a bit odd, but it has to do with the way the function is called:
# Workaround so the parser knows we need the resolve_package function!
if false ; then
resolve_package_rpm foo ${RPMCONF_TARGET_BASE}.conf || true
fi
pkg_name=$(resolve_package_rpm $pkg-locale-$lang
${RPMCONF_TARGET_BASE}.conf)
So if the function is called within a subshell, the parser doesn't appear to
know it's there.. so you have to reference it in the function somewhere (the if
false works well for this) in order for it to be available to call.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] insane bbclass: turn fatal errors back into fatal errors
On 6/30/11 10:58 AM, Tom Rini wrote: > On 06/30/2011 08:11 AM, Koen Kooi wrote: >> These were turned off by: >> >> commit fae8d5e985e9b05ce90f1eca434ad4dbf2259725 >> Author: Richard Purdie >> Date: Thu Jul 8 23:51:06 2010 +0100 >> >> insane.bbclass: Relax fatal errors for now until we get have >> time to work through the backlog >> >> The current metadata triggers so many of these that they need to be made >> fatal so people will actually fix them. >> >> Signed-off-by: Koen Kooi > > Given that a number of them can probably just be pulled from oe.dev as > fixes too: > > Acked-by: Tom Rini I'm really worried about the current warnings/QA issues that keep coming up.. so I agree we really need to do this.. (note, we also really need to tell people to expect some breakage as we go and fix the mess!) Acked-by: Mark Hatle >> --- >> meta/classes/insane.bbclass |1 - >> 1 files changed, 0 insertions(+), 1 deletions(-) >> >> diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass >> index f7e5524..e06d2b2 100644 >> --- a/meta/classes/insane.bbclass >> +++ b/meta/classes/insane.bbclass >> @@ -115,7 +115,6 @@ def package_qa_make_fatal_error(error_class, name, >> path,d): >> >> TODO: Load a whitelist of known errors >> """ >> -return False >> return not error_class in [0, 5, 7, 8, 9] >> >> def package_qa_write_error(error_class, name, path, d): > > ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] insane bbclass: turn fatal errors back into fatal errors
On 7/1/11 12:16 PM, Khem Raj wrote:
> On 07/01/2011 10:12 AM, Richard Purdie wrote:
>> gcc-4.6.0+svnr175150, non dev contains .so, gcc,
>> /work/i586-poky-linux/gcc-4.6.0+svnr175150-r4/packages-split/gcc/usr/libexec/gcc/i586-poky-linux/4.6.1/liblto_plugin.so
>>>
>
> This should be packages with gcc itself. May be adding to FILES will get
> rid of this warning
The warning above indicates that it -is- being packaged in the 'gcc' package.
The check verified that no files of the name .so exit and they are not symlinks:
if not name.endswith("-dev") and not name.endswith("-dbg") and
path.endswith(".so") and os.path.islink(path):
In this case, I believe that the file is likely supposed to be there. Is there
a way to selectively disable insane checks on a per-recipe basis when we know
they are wrong?
--Mark
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PROPOSAL] Package feature switches, redux.
On 7/4/11 11:44 AM, Graeme Gregory wrote: > On 07/04/2011 05:12 PM, Chris Elston wrote: >>> Hi, with my Angstrom cap on I like this syntax and I think it will be >>> really useful. >>> >>> A second level concern I have is about conflicting features, its not >>> something we will come across probably in DISTRO land as we are sensible >>> enough not to select them. But users could select them in local.conf. >>> >>> Graeme >> As a new developer, I've discovered that there are plenty of things that >> you can set in local.conf which break things :D >> >> Could you please give an example of conflicting features that could >> cause problems, I'm not experienced enough with OE to have encountered >> that problem yet. >> >> > Cant think of a solid one off the top of my head, but I mean the cases where > > --enable-feature means that --disable-another-feature is done. > > This is why I listed it as a secondary issue. I remember seeing similar issues as well. I really like this syntax described for the options. If there is some way to list a conflicting option -- or even simple some python syntax useful within a recipe itself to say "hey you can't specify these two things and use this recipe", that would be all that I think is needed. I rarely find packages where it's likely someone will try to configure a conflicting option set, but it does happen.. if we find it.. we should be able to note it within the recipe and have it flag the user before do_configure is run. (Preferably even before that!) --Mark > Graeme > > > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [Draft design][RFC] Running postinst at rootfs generation time
On 7/5/11 5:06 AM, Hauser, Wolfgang (external) wrote: > To build a read-only image, we have to set up an extra layer where we > modified all packages they cause a runtime modification. > > Especially we have to cover some adduser/addgroup issues, modify the volatile > file handling for our needs, and for omap3 graphics the handling of the GLES > version. > A failed offline postinst causing a runtime configuration. So the image > generation log has to be checked for such failing scripts. Just an FYI, with the new adduser/group code.. that should no longer be one of the contributing factors.. we can now add users and groups during recipe / rootfs construction. > Some of the packages (e.g. dropbear) are prepared for supporting read-only > filesystems. Most packages are not. > > The problem with the alphabetic order of the postinst scripts we managed by > renaming some of the packages to fit the needed order. An ugly solution, but > in case of missing python skills, the easiest. Ya, this one bothers me slightly... and I'm not really sure how to solve it... --Mark > Nice to see someone having the same needs we have to fit. > > Regards > Wolfgang Hauser > > -Ursprüngliche Nachricht- > Von: Tom Parkin [mailto:tom.par...@gmail.com] > Gesendet: Dienstag, 5. Juli 2011 10:42 > An: Patches and discussions about the oe-core layer > Cc: Hauser, Wolfgang (external) > Betreff: Re: [OE-core] [Draft design][RFC] Running postinst at rootfs > generation time > > I'm interested to read about this initiative as we've recently > stumbled over the issue of postinst scripts in trying to port our > build to OE. > > So far it seems the primary concern is about the boot-time impact of > postinst on the target. But for the use-cases I'm interested in, we > need to capture all install processes as a part of the build in order > to output a fully-provisioned read-only rootfs image (e.g. squashfs). > Our boxes don't typically modify their filesystems at runtime, other > than to take full updates (completely new rootfs images). > > I think the reduction, or even elimination, of target-run postinst > scripts would help a lot with the read-only rootfs case. > > Tom > > On 4 July 2011 01:23, Cui, Dexuan wrote: >> Hauser, Wolfgang (external) wrote: >>> Beside the discussed changes, the postinst scripts should be executed >>> in the dependency order. >>> At the time, the scripts are executed in alphabetic order, which >>> breaks the image generation if depended packages are not in >>> alphabetic order. >>> >>> e.g. busybox and busybox subpackages (busybox-mdev). >>> >>> Regards >>> Wolfgang Hauser >>> >> >> Thank all for the suggestions! >> I created a wiki page to summarize the mail threads: >> https://wiki.yoctoproject.org/wiki/Run_postinst_during_rootfs_generation >> >> Thanks, >> -- Dexuan >> >> ___ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >> > > > ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/3] siteinfo.bbclass re-merge
On 7/13/11 2:05 PM, Tom Rini wrote:
> Hey all,
>
> This is the second of two pull requests. This doesn't depend on the first
> request, it's just splitting changes up. There's three changes here. First,
> site/ix86-common was setting the wrong value for unsigned int. Second,
> change perl to use SITEINFO variables rather than functions. Third, bring
> in the various changes in siteinfo.bbclass that have been in oe.dev. This
> last part will, I hope, also make dealing with multilib-specific siteinfo
> stuff easier (also alternative ABIs like x32).
Note, this is NOT an objection to the changes. However, one thing to keep in
mind.
(In fact I like the changes being suggested)
We have a dynamic site-configuation mechanism already in place. So it's
important that we don't duplicate things within the site/* files.
Currently the recipes: glibc, zlib, eglibc, and uclibc contain dynamic
site_config files. (See ./recipes-core/glibc/site_config/* for an example)
The output of these files get placed into a target arch specific site config
directory: ${STAGING_DATADIR}/${TARGET_SYS}_config_site.d
These are automatically loaded as well as the predefined "common" items. By
using the dynamically generated versions we can change the configuration options
for glibc, uclibc, etc and the site config will automatically get updated based
on the existing checks.
So instead of updating the various site/* files, if the value can be discovered
-- or is defined by a given package.. we should be using the dynamic method as
it'll be safer over the long-haul. Someone might need to go over the existing
ones and see if there is anything that falls under this.
BTW, I did notice that ncurses is supposed to have a dynamic site_config, but it
somehow got checked into the wrong location. I'll submit a pull request for
that shortly.
--Mark
> My next step is to work on merging and verifying as much as possible
> the site files in oe-core and oe.dev.
>
> The following changes since commit e66c2999afa2b3efbce8bb46c89f9db5e15f35c7:
> Saul Wold (1):
> libx11: ensure nativesdk uses correct DEPENDS and XCB flags
>
> are available in the git repository at:
>
> git://git.openembedded.org/openembedded-core-contrib trini/update-siteinfo
>
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=trini/update-siteinfo
>
> Tom Rini (3):
> site/ix86-common: Fix ac_cv_sizeof_unsigned_char definition
> perl: Use SITEINFO variables not functions
> siteinfo.bbclass: Port over oe.dev logic for site files
>
> meta/classes/autotools.bbclass |2 +-
> meta/classes/siteinfo.bbclass | 202
> +---
> meta/classes/toolchain-scripts.bbclass |2 +-
> meta/recipes-core/meta/meta-environment.bb |2 +-
> meta/recipes-core/meta/meta-toolchain.bb |2 +-
> meta/recipes-devtools/perl/perl_5.12.3.bb |4 +-
> meta/site/ix86-common |2 +-
> 7 files changed, 103 insertions(+), 113 deletions(-)
> create mode 100644 meta/site/common-linux
>
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Fix incorrect site_config for ncurses
The following changes since commit de4dc5f0741533529789a6094721f708728af386:
eglibc: fix runtime assertion failure (2011-07-13 12:34:23 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/ncurses
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/ncurses
Mark Hatle (1):
ncurses: Fix site_config
.../recipes-core/{ => ncurses}/site_config/headers |0
1 files changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-core/{ => ncurses}/site_config/headers (100%)
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] ncurses: Fix site_config
The site_config directory should have been attached to ncurses.
Signed-off-by: Mark Hatle
---
.../recipes-core/{ => ncurses}/site_config/headers |0
1 files changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-core/{ => ncurses}/site_config/headers (100%)
diff --git a/meta/recipes-core/site_config/headers
b/meta/recipes-core/ncurses/site_config/headers
similarity index 100%
rename from meta/recipes-core/site_config/headers
rename to meta/recipes-core/ncurses/site_config/headers
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] siteinfo for recipes oe-core lacks?
On 7/13/11 5:14 PM, Tom Rini wrote: > Hey all, > > Do we have an opinion on siteinfo for recipes that oe-core lacks? I > have two easy examples: > - mono: neither meta-oe nor oe-core have a recipe, we have siteinfo > stuff specific to it. Ignore it? drop it? update it with what meta-oe has? > - postgresql: meta-oe has it, oe-core lacks it. Keep in meta-oe only? > For both of them, I'd keep them as local to the recipe as possible.. no recipe, no siteinfo listed. --Mark ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] siteinfo for recipes oe-core lacks?
On 7/13/11 8:44 PM, Tom Rini wrote: > On 07/13/2011 06:20 PM, Mark Hatle wrote: >> On 7/13/11 5:14 PM, Tom Rini wrote: >>> Hey all, >>> >>> Do we have an opinion on siteinfo for recipes that oe-core lacks? I >>> have two easy examples: >>> - mono: neither meta-oe nor oe-core have a recipe, we have siteinfo >>> stuff specific to it. Ignore it? drop it? update it with what meta-oe has? >>> - postgresql: meta-oe has it, oe-core lacks it. Keep in meta-oe only? >>> >> >> For both of them, I'd keep them as local to the recipe as possible.. no >> recipe, >> no siteinfo listed. > > Well, I think we're missing the forest for the trees. But that's not > really a workable idea since it's sizeof this and that stuff. > > To give you a third example, I've ported this commit over to oe-core: > http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=bb12cd9c0a757e6ef696d57923821829f00ace79 > I think I wasn't clear. What I meant was that the siteinfo stuff should be as close to the recipe as possible. But that doesn't preclude it from being in a layer specific siteinfo file. For the samba example, it makes sense to me if we could put these values local to the recipe -- this assumes nothing else is known to use those configuration settings. Once we have multiple packages using the configuration settings they move up to the layer site file... once recipes move into the oe-core layer then the siteinfo moves with them. Keeping the information as local to recipe as possible helps with maintenance IMHO. There is nothing worse then after a few years looking over a siteinfo file and seeing 100 entries and having no idea if they are still relevant, or how someone came to specific results. --Mark ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] siteinfo for recipes oe-core lacks?
On 7/13/11 9:07 PM, Tom Rini wrote:
> On 07/13/2011 07:01 PM, Mark Hatle wrote:
>> On 7/13/11 8:44 PM, Tom Rini wrote:
>>> On 07/13/2011 06:20 PM, Mark Hatle wrote:
>>>> On 7/13/11 5:14 PM, Tom Rini wrote:
>>>>> Hey all,
>>>>>
>>>>> Do we have an opinion on siteinfo for recipes that oe-core lacks? I
>>>>> have two easy examples:
>>>>> - mono: neither meta-oe nor oe-core have a recipe, we have siteinfo
>>>>> stuff specific to it. Ignore it? drop it? update it with what meta-oe
>>>>> has?
>>>>> - postgresql: meta-oe has it, oe-core lacks it. Keep in meta-oe only?
>>>>>
>>>>
>>>> For both of them, I'd keep them as local to the recipe as possible.. no
>>>> recipe,
>>>> no siteinfo listed.
>>>
>>> Well, I think we're missing the forest for the trees. But that's not
>>> really a workable idea since it's sizeof this and that stuff.
>>>
>>> To give you a third example, I've ported this commit over to oe-core:
>>> http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=bb12cd9c0a757e6ef696d57923821829f00ace79
>>>
>>
>> I think I wasn't clear. What I meant was that the siteinfo stuff should be
>> as
>> close to the recipe as possible. But that doesn't preclude it from being in
>> a
>> layer specific siteinfo file.
>
> When you say close do you mean layer/site/ or
> layer/recipes-foo/app/something/ ? I saw oe-core had some sort of hook
> for site files in yet another place but I also couldn't find anything
> using it (in addition to the sitecache stuff).
I've seen three examples in the system.
meta/recipes-ncurses/ncurses.inc:
CONFIG_SITE =+ "${WORKDIR}/config.cache
which is referring to:
meta/recipes-core/ncurses/ncurses-5.9/config.cache
This is what I consider the recipe level. The items here should ONLY exist if
it's specific to the one package.. (In the ncurses case, I think that may not be
true, so this example itself might be an example of what not to do.)
and then the fall back is layers/site/. Each layer should be allowed to have a
set of site files.. the only tricky bit is when there are collisions with
conflicting values.. generally I'd say the last layer included wins.. but I'm
not sure if that is the right answer.
The third level is whats -provided- by (e)glibc, uclibc, ncurses, and zlib. For
packages that provide functionality, that other items in the system heavily rely
on. They should be responsible for providing their own site config files to the
system. The third level (looking at eglibc) works by including a directory
called "site_config" within a recipe. If that directory exists there is code in
siteconfig.bbclass that will automatically generate a configure script. Run it
against the current state of the sysroot, and provide those results to be used
for future recipes.
Inside of the site_config directory are three files. "funcs", "headers" and
"types". These contains references to function calls, headers and types that we
should be generating the autoconf for so we can pre-populate the cache. Note,
as currently implemented the items here expect a working autoconf script. So
this is not a way to provide known values for things that can't be discovered.
There really should be a fourth file here with is known-values. Then the
contents could be provided in the existing siteinfo format to allow a program to
statically provide configuration information. This can be used for things like
the mktemp, mkstemp, etc behaviors that programs try to discover but can't due
to being unable to run programs.
The initial purpose of this third type is performance over hard coding values..
prepopulating libc, ncurses, and zlib values made a sizeable configure
performance difference in testing we did a while back. But the items needed to
be dynamic due to variations in libc configuration, and even ABI configuration
(such as MIPS64 n32 where the void and long sizes don't match either MIPS or
MIPS64.)
Adding the known values would give it the ability to also answer the failure
questions -- and again keep it local to the recipe providing the functionality.
>> Keeping the information as local to recipe as possible helps with maintenance
>> IMHO. There is nothing worse then after a few years looking over a siteinfo
>> file and seeing 100 entries and having no idea if they are still relevant, or
>> how someone came to specific results.
>
> Agreed, I'm toying with tossing all of the files out and seeing what's
> needed now (since also there's us
Re: [OE-core] Building hg/help2man not relying on them?
On 7/14/11 9:00 PM, Tom Rini wrote: > Hey all, > > As I work on bringing jenkins up on my stripped down builder machines > I've once again run into the "wait, I'm supposed to have installed...?" > problem. Can we switch to building help2man and mercurial rather than > making the end user install them? Perhaps some sort of test for if we > find it, ASSUME_PROVIDED it, otherwise build it? > The full sanity list is: patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk hg chrpath wget cpio Of the above, help2man, texi2html, hg, and chrpath seem to be the ones I usually have to find or build myself. If we can build those (or setup the assume_provide) that would make it much easier for me --Mark ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Building hg/help2man not relying on them?
On 7/15/11 9:39 AM, Joshua Lock wrote: > On Thu, 2011-07-14 at 21:56 -0500, Mark Hatle wrote: >> On 7/14/11 9:00 PM, Tom Rini wrote: >>> Hey all, >>> >>> As I work on bringing jenkins up on my stripped down builder machines >>> I've once again run into the "wait, I'm supposed to have installed...?" >>> problem. Can we switch to building help2man and mercurial rather than >>> making the end user install them? Perhaps some sort of test for if we >>> find it, ASSUME_PROVIDED it, otherwise build it? >>> >> >> The full sanity list is: >> >> patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk hg >> chrpath wget cpio >> >> Of the above, help2man, texi2html, hg, and chrpath seem to be the ones I >> usually >> have to find or build myself. > > Originally I built chrpath when I added relocatable.bbclass but then we > wanted to relocate native packages and it got extremely tricky... I wonder if we can do something like pseudo and force chrpath to be built -very- early in the process.. and then have most things have an automatic requirement on chrpath-native... (pseudo of course has the advantage it's NOT used for native packages...) Is the native chrpath usage only in do_package [or later]? If so, we could probably put a dependency on do_package of chrpath.. with the affect that chrpath would have to be built first... --Mark > > Joshua ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] udev: Change hard coded /usr/lib to support multilib
On 7/18/11 7:32 AM, Koen Kooi wrote:
>
> Op 18 jul 2011, om 09:08 heeft Koen Kooi het volgende geschreven:
>
>>
>> Op 18 jul 2011, om 08:13 heeft Dongxiao Xu het volgende geschreven:
>>
>>> Signed-off-by: Dongxiao Xu
>>> ---
>>> meta/recipes-core/udev/udev-164/makefile.patch | 16
>>> meta/recipes-core/udev/udev-new.inc|1 +
>>> meta/recipes-core/udev/udev_164.bb |2 +-
>>> 3 files changed, 18 insertions(+), 1 deletions(-)
>>> create mode 100644 meta/recipes-core/udev/udev-164/makefile.patch
>>>
>>> diff --git a/meta/recipes-core/udev/udev-164/makefile.patch
>>> b/meta/recipes-core/udev/udev-164/makefile.patch
>>> new file mode 100644
>>> index 000..c46ff4b
>>> --- /dev/null
>>> +++ b/meta/recipes-core/udev/udev-164/makefile.patch
>>> @@ -0,0 +1,16 @@
>>> +Upstream-Status: Inappropriate [configuration]
>>
>> Could you explain why it's inappropriate for upstream but why we do need it
>> here?
>
> I asked the udev maintainer:
>
> 14:25 < koen> kay: the udev Makefile.am has 'ln -sf $(libexecdir)/udev-acl
> $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck', any reason for
> not using ${libdir} over ${prefix}/lib ?
> 14:29 < kay> koen: libdir is /usr/lib64 here, can't use that
>
> So upstream is aware of multilib, but wants to put these scripts in a
> non-multilib dir. Since I don't have any experience with the fedora/opensuse
> way of multilib nor the new oe-core one, could you please explain why oe-core
> needs this patch, but fedora/opensuse don't?
This is likely a problem with the multilib fix. "libexecdir" is often /usr/lib
on many distribuions.. however as your other email mentioned.. setting it to
/usr/lib64 is a mistake. It should be /usr/libexec or /usr/lib64. All of the
associated multilib packages should work correctly and no conflicts introduced
with this package (file contents should be identical.)
It should be permissible for libexecdir to be changed in the configuration if
someone really wants it to be. By default (in bitbake.conf) it is:
export libexecdir = "${exec_prefix}/libexec"
--Mark
> regards,
>
> Koen
>
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] udev: Change hard coded /usr/lib to support multilib
Replying to myself.. sorry, I misunderstood the concern.. see below for a new
explanation..
On 7/18/11 10:25 AM, Mark Hatle wrote:
> On 7/18/11 7:32 AM, Koen Kooi wrote:
>>
>> Op 18 jul 2011, om 09:08 heeft Koen Kooi het volgende geschreven:
>>
>>>
>>> Op 18 jul 2011, om 08:13 heeft Dongxiao Xu het volgende geschreven:
>>>
>>>> Signed-off-by: Dongxiao Xu
>>>> ---
>>>> meta/recipes-core/udev/udev-164/makefile.patch | 16
>>>> meta/recipes-core/udev/udev-new.inc|1 +
>>>> meta/recipes-core/udev/udev_164.bb |2 +-
>>>> 3 files changed, 18 insertions(+), 1 deletions(-)
>>>> create mode 100644 meta/recipes-core/udev/udev-164/makefile.patch
>>>>
>>>> diff --git a/meta/recipes-core/udev/udev-164/makefile.patch
>>>> b/meta/recipes-core/udev/udev-164/makefile.patch
>>>> new file mode 100644
>>>> index 000..c46ff4b
>>>> --- /dev/null
>>>> +++ b/meta/recipes-core/udev/udev-164/makefile.patch
>>>> @@ -0,0 +1,16 @@
>>>> +Upstream-Status: Inappropriate [configuration]
>>>
>>> Could you explain why it's inappropriate for upstream but why we do need it
>>> here?
>>
>> I asked the udev maintainer:
>>
>> 14:25 < koen> kay: the udev Makefile.am has 'ln -sf $(libexecdir)/udev-acl
>> $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck', any reason for
>> not using ${libdir} over ${prefix}/lib ?
>> 14:29 < kay> koen: libdir is /usr/lib64 here, can't use that
>>
>> So upstream is aware of multilib, but wants to put these scripts in a
>> non-multilib dir. Since I don't have any experience with the fedora/opensuse
>> way of multilib nor the new oe-core one, could you please explain why
>> oe-core needs this patch, but fedora/opensuse don't?
>
> This is likely a problem with the multilib fix. "libexecdir" is often
> /usr/lib
> on many distribuions.. however as your other email mentioned.. setting it to
> /usr/lib64 is a mistake. It should be /usr/libexec or /usr/lib64. All of the
> associated multilib packages should work correctly and no conflicts introduced
> with this package (file contents should be identical.)
>
> It should be permissible for libexecdir to be changed in the configuration if
> someone really wants it to be. By default (in bitbake.conf) it is:
>
> export libexecdir = "${exec_prefix}/libexec"
> +-mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
> +-ln -sf $(libexecdir)/udev-acl
> $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
> ++mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d
> ++ln -sf $(libexecdir)/udev-acl
> $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d/udev-acl.ck
I see libexecdir CAN be changed.. so the above is already possible..
The part they had hard coded is "/usr/lib/ConsoleKit"... There is only one
location in the system for ConsoleKit configuration files/scripts.. and that is
distro specific. Assuming the oe based distributions use
$(PREFIX)/lib/ConsoleKit.. then the previous was correct.
The point being it doesn't matter if it's 32-bit, 64-bit or 24-bit... only one
ConsoleKit per system should exist. (There are potentially other files on the
system like this. I know a recent RPM patch went in that separated /usr/lib/rpm
and /usr/lib64/rpm.. this is also a similar mistake, I just haven't had time to
get a patch out to revert that chunk.)
--Mark
> --Mark
>
>> regards,
>>
>> Koen
>>
>>
>> ___
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] pseudo: fix uninitialised variable in realpath_fix.patch
On 7/19/11 6:57 PM, Joshua Lock wrote:
> Several users reported issues with pseudo on CentOS 5.x hosts, Matthew
> McClintock tracked the issue to the realpath_fix.patch and Mark Hatle
> supplied the included fix.
>
> CC: Matthew McClintock
> CC: Mark Hatle
Ack.. this has also already been included in the upstream pseudo.. when we move
to pseudo 1.1.2 we'll get this fix.
--Mark
> Signed-off-by: Joshua Lock
> ---
> .../pseudo/pseudo/realpath_fix.patch |2 +-
> meta/recipes-devtools/pseudo/pseudo_1.1.1.bb |2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch
> b/meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch
> index 7beea51..4a107e0 100644
> --- a/meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch
> +++ b/meta/recipes-devtools/pseudo/pseudo/realpath_fix.patch
> @@ -65,7 +65,7 @@ index 600a918..07a4429 100644
>
> +static void
> +pseudo_init_one_wrapper(pseudo_function *func) {
> -+int (*f)(void);
> ++int (*f)(void) = (int (*)(void)) NULL;
> +char *e;
> +if (*func->real != NULL) {
> +/* already initialized */
> diff --git a/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
> b/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
> index f1c8e63..0a61aec 100644
> --- a/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
> +++ b/meta/recipes-devtools/pseudo/pseudo_1.1.1.bb
> @@ -1,6 +1,6 @@
> require pseudo.inc
>
> -PR = "r1"
> +PR = "r2"
>
> SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2
> \
> file://oe-config.patch \
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/5] multilib_header.bbclass: Add oe_multilib_header wrapper
On 7/25/11 8:54 AM, Phil Blundell wrote: > On Mon, 2011-07-25 at 14:47 +0100, Richard Purdie wrote: >> +/* Copyright (c) 2005-2011 Wind River Systems, Inc. >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU Lesser General Public License version 2.1 >> as >> + * published by the Free Software Foundation. I believe we're flexibly with the license statement in the file.. (Just verifying it to make sure I am allowed to change it.) I personally don't believe it's a big deal, but I understand the concern. Is there a different wording/license statement that would make more sense? My concern is that if we make the license dynamic it's a lot of pain for no real technical reason. I'd like to see if we (WR) can just put a statement on it that it can be used for any purpose -- whatever the legalize is for that -- and if that would satisfy your concerns. (BTW: Our goal of course is NOT to change the license of the produced binary in any way...) > This is going to cause LGPL 2.1 content to appear in the output > packages. For things like binutils this is probably not a big deal, > since they are GPL already, but for ncurses (previously MIT-licensed) > this is a potentially significant change. In any case I think there > needs to be some way of making sure that the LICENSE is updated > appropriately when this file is included. > > p. > > > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/3] conf/machine/include: Start to fill out architecture specific tune include files and tune features
On 7/22/11 1:14 PM, Tom Rini wrote: > On 07/22/2011 11:00 AM, Richard Purdie wrote: >> These changes revolve around the idea of tune features. These are >> represented by >> 'flag' strings that are included in the TUNE_FEATURES variable. >> >> Any string included in TUNE_FEATURES should also add a TUNEVALID[] >> entry so >> we can know which flags are available in TUNE_FEATURES and have >> documentation about >> what the flags do. We will add sanity code to error if flags are listed in >> TUNE_FEATURES but are not documented in TUNEVALID. >> >> A given tune configuration will want to define one or more predetermined >> sets of >> _FEATURE flag lists. These are defined in the form TUNE_FEATURES_tune-. >> For defined tune configuation, should be added to the AVAILTUNE list >> so that >> we can determine what tune configurations are available. Flags cannot be >> used in this >> case as with TUNEVALID since its useful to be able to build up tune lists >> from other >> TUNE_FEATURES_tune-yyy options. >> >> A given tune configuration may also define PACKAGE_EXTRA_ARCHS_tune- >> and >> BASE_LIB_tune- to control the multilib location. All options can be >> overridden >> by the distro or local user configuration. >> >> Signed-off-by: Richard Purdie > > As a specific nit, we can't use x86_64 in OVERRIDES (using the normal > mechanism need base_contains(...). Can we switch to calling it amd64 > ala Debian/Ubuntu? Aside from that, as I told Mark the other day, this > looks good to me. > I actually prefer "x86-64" I think that is a reasonable compromise between the x86_64 naming and the need to not use "_". --Mark ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
