Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH 4/4] dbus: use useradd class to allow use in read-only filesystems
From: Otavio Salvador @ 2011-10-21 14:10 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1319206126.git.otavio@ossystems.com.br>

Move creation of required user/groups to useradd class thus allowing
use with read-only filesystems and booting the initial boot.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-core/dbus/dbus.inc |   48 +++++++++++++++++----------------------
 1 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index a8ecda8..2a97c02 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -10,15 +10,22 @@ DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X
 DEPENDS_virtclass-native = "expat-native virtual/libintl-native"
 DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk virtual/libx11"
 
+PR = "r1"
+
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
            file://tmpdir.patch; \
            file://dbus-1.init"
 
-inherit autotools pkgconfig gettext update-rc.d
+inherit useradd autotools pkgconfig gettext update-rc.d
 
 INITSCRIPT_NAME = "dbus-1"
 INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
 
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM_${PN} = "-r netdev"
+USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/dbus \
+                       --no-create-home --user-group messagebus"
+
 CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
 
 DEBIANNAME_${PN} = "dbus-1"
@@ -44,32 +51,7 @@ RRECOMMENDS_${PN}-lib = "${PN}"
 FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
 
 pkg_postinst_dbus() {
-	# can't do adduser stuff offline
-	if [ "x$D" != "x" ]; then
-		exit 1
-	fi
-
-	MESSAGEUSER=messagebus
-	MESSAGEHOME=/var/run/dbus
-	UUIDDIR=/var/lib/dbus
-
-	mkdir -p $MESSAGEHOME
-	mkdir -p $UUIDDIR
-	chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
-	chown "$MESSAGEUSER":"$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || \
-		adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password \
-			--ingroup "$MESSAGEUSER" "$MESSAGEUSER"
-
-	chown "$MESSAGEUSER":"$MESSAGEUSER" "$UUIDDIR"
-
-	grep -q netdev: /etc/group || addgroup netdev
-
-	chown root:"$MESSAGEUSER" /usr/libexec/dbus-daemon-launch-helper
-	chmod 4754 /usr/libexec/dbus-daemon-launch-helper
-
-	# add volatile after new user/grp are created
-	echo "d messagebus messagebus 0755 /var/run/dbus none" > /etc/default/volatiles/99_dbus
-	if [ -e /etc/init.d/populate-volatile.sh ] ; then
+	if [ -z "${D}" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then
 		/etc/init.d/populate-volatile.sh update
 	fi
 }
@@ -92,6 +74,18 @@ do_install() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
 
+	install -d ${D}${sysconfdir}/default/volatiles
+	echo "d messagebus messagebus 0755 ${localstatedir}/run/dbus none" \
+	     > ${D}${sysconfdir}/default/volatiles/99_dbus
+
+
+	mkdir -p ${D}${localstatedir}/run/dbus ${D}${localstatedir}/lib/dbus
+
+	chown messagebus:messagebus ${D}${localstatedir}/run/dbus ${D}${localstatedir}/lib/dbus
+
+	chown root:messagebus ${D}${libexecdir}/dbus-daemon-launch-helper
+	chmod 4754 ${D}${libexecdir}/dbus-daemon-launch-helper
+
 	# disable dbus-1 sysv script on systemd installs
 	# nearly all distros call the initscript plain 'dbus', but OE-core is different
 	ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service
-- 
1.7.2.5




^ permalink raw reply related

* [PATCH 2/4] useradd.bbclass: check if a group already exists manually
From: Otavio Salvador @ 2011-10-21 14:10 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1319206126.git.otavio@ossystems.com.br>

The use of groupadd -f makes much more difficult to figure when a
group is not add. This was the case of the class not working for our
usage and this being caused by the lack of '/etc/group' file but
unnoticed as groupadd wasn't failing according.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/classes/useradd.bbclass |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index 1e03a04..fb70b3e 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -37,7 +37,13 @@ if test "x$GROUPADD_PARAM" != "x"; then
 	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
+		groupname=`echo "$opts" | awk '{ print $NF }'`
+		group_exists=`grep "^$groupname:" $SYSROOT/etc/group || true`
+		if test "x$group_exists" = "x"; then
+			eval $PSEUDO groupadd  $OPT $opts
+		else
+			echo "Note: group $groupname already exists, not re-creating it"
+		fi
 
 		if test "x$opts" = "x$remaining"; then
 			break
-- 
1.7.2.5




^ permalink raw reply related

* [PATCH 3/4] base-passwd: move initial criation of group and passwd to preinst
From: Otavio Salvador @ 2011-10-21 14:10 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1319206126.git.otavio@ossystems.com.br>

To allow use and manipulation of users and groups at rootfs building
time, the '/etc/passwd' and '/etc/group' needs to be available as soon
as possible.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../recipes-core/base-passwd/base-passwd_3.5.22.bb |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 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 137512d..aa90a6d 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 = "r3"
+PR = "r4"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 
@@ -37,6 +37,23 @@ do_install () {
 	install -p -m 644 debian/copyright ${D}${docdir}/${BPN}/
 }
 
+pkg_preinst_${PN} () {
+	set -e
+
+	# Used for rootfs generation. On in-target install this will be run
+        # before the unpack so the files won't be available
+
+	if [ ! -e $D${sysconfdir}/passwd ] && [ -e $D${datadir}/base-passwd/passwd.master ]; then
+		cp $D${datadir}/base-passwd/passwd.master $D${sysconfdir}/passwd
+	fi
+
+	if [ ! -e $D${sysconfdir}/group ] && [ -e $D${datadir}/base-passwd/group.master ]; then
+		cp $D${datadir}/base-passwd/group.master $D${sysconfdir}/group
+	fi
+
+	exit 0
+}
+
 pkg_postinst_${PN} () {
 	set -e
 
-- 
1.7.2.5




^ permalink raw reply related

* [PATCH 0/4 v2] Fixes and improvements
From: Otavio Salvador @ 2011-10-21 14:10 UTC (permalink / raw)
  To: openembedded-core

The following changes since commit 99da9a4e65f9dffb04efc3ad60125194c476d6b3:

  distro-tracking-fields: update fields for tzdata and gst-plugins-good (2011-10-20 13:07:16 +0100)

are available in the git repository at:
  git://github.com/OSSystems/oe-core master
  https://github.com/OSSystems/oe-core/tree/HEAD

Otavio Salvador (4):
  bootimg.bbclass: add support to disable HDD image building
  useradd.bbclass: check if a group already exists manually
  base-passwd: move initial criation of group and passwd to preinst
  dbus: use useradd class to allow use in read-only filesystems

 meta/classes/bootimg.bbclass                       |   44 +++++++++---------
 meta/classes/useradd.bbclass                       |    8 +++-
 .../recipes-core/base-passwd/base-passwd_3.5.22.bb |   19 +++++++-
 meta/recipes-core/dbus/dbus.inc                    |   48 +++++++++-----------
 4 files changed, 69 insertions(+), 50 deletions(-)

-- 
1.7.2.5




^ permalink raw reply

* [PATCH 1/4] bootimg.bbclass: add support to disable HDD image building
From: Otavio Salvador @ 2011-10-21 14:10 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1319206126.git.otavio@ossystems.com.br>

If an image sets NOHDD = "1" the HDD image won't be build.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/classes/bootimg.bbclass |   44 +++++++++++++++++++++--------------------
 1 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index a5ba3cf..eecc2bf 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -48,34 +48,36 @@ SYSLINUXMENU = "${HDDDIR}/menu"
 inherit syslinux
 		
 build_boot_bin() {
-	install -d ${HDDDIR}
-	install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage \
-	${HDDDIR}/vmlinuz
+	# Create an HDD image
+	if [ "${NOHDD}" != "1" ] ; then
+		install -d ${HDDDIR}
+		install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage \
+		${HDDDIR}/vmlinuz
 
-	if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then 
-    		install -m 0644 ${INITRD} ${HDDDIR}/initrd
-	fi
+		if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then
+				install -m 0644 ${INITRD} ${HDDDIR}/initrd
+		fi
 
-	if [ -n "${ROOTFS}" ] && [ -s "${ROOTFS}" ]; then 
-    		install -m 0644 ${ROOTFS} ${HDDDIR}/rootfs.img
-	fi
+		if [ -n "${ROOTFS}" ] && [ -s "${ROOTFS}" ]; then
+				install -m 0644 ${ROOTFS} ${HDDDIR}/rootfs.img
+		fi
 
-	install -m 444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys
+		install -m 444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys
 
-	# Do a little math, bash style
-	#BLOCKS=`du -s ${HDDDIR} | cut -f 1`
-	BLOCKS=`du -bks ${HDDDIR} | cut -f 1`
-	SIZE=`expr $BLOCKS + ${BOOTIMG_EXTRA_SPACE}`	
+		# Do a little math, bash style
+		BLOCKS=`du -bks ${HDDDIR} | cut -f 1`
+		SIZE=`expr $BLOCKS + ${BOOTIMG_EXTRA_SPACE}`
 
-	mkdosfs -n ${BOOTIMG_VOLUME_ID} -d ${HDDDIR} \
-	-C ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg $SIZE 
+		mkdosfs -n ${BOOTIMG_VOLUME_ID} -d ${HDDDIR} \
+		-C ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg $SIZE
 
-	syslinux ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
-	chmod 644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
+		syslinux ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
+		chmod 644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
 
-	cd ${DEPLOY_DIR_IMAGE}
-	rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hddimg
-	ln -s ${IMAGE_NAME}.hddimg ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hddimg
+		cd ${DEPLOY_DIR_IMAGE}
+		rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hddimg
+		ln -s ${IMAGE_NAME}.hddimg ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hddimg
+	fi
 	
 	#Create an ISO if we have an INITRD
 	if [ -n "${INITRD}" ] && [ -s "${INITRD}" ] && [ "${NOISO}" != "1" ] ; then
-- 
1.7.2.5




^ permalink raw reply related

* [PATCH] subversion-1.6.15: add native support too
From: Martin Jansa @ 2011-10-21 13:11 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <20111021112625.GQ3522@jama.jama.net>

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../subversion/subversion_1.6.15.bb                |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
index 9a9484f..d3c7392 100644
--- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
@@ -5,6 +5,8 @@ RDEPENDS_${PN} = "neon"
 LICENSE = "Apache-2"
 HOMEPAGE = "http://subversion.tigris.org"
 
+BBCLASSEXTEND = "native"
+
 PR = "r1"
 
 SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \
-- 
1.7.7




^ permalink raw reply related

* Re: [PATCH 1/4] bootimg.bbclass: add support to disable HDD image building
From: Otavio Salvador @ 2011-10-21 12:27 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <CAMKF1sqpvqZ4cOg4jceaB9P6HMTcZqhYVFG1SqZxN4Um3G1fAA@mail.gmail.com>

On Fri, Oct 21, 2011 at 04:07, Khem Raj <raj.khem@gmail.com> wrote:
> On Thu, Oct 20, 2011 at 8:31 PM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>>  meta/classes/bootimg.bbclass |   44 +++++++++++++++++++++--------------------
>>  1 files changed, 23 insertions(+), 21 deletions(-)
>>
>> diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
>> index a5ba3cf..eecc2bf 100644
>> --- a/meta/classes/bootimg.bbclass
>> +++ b/meta/classes/bootimg.bbclass
>> @@ -48,34 +48,36 @@ SYSLINUXMENU = "${HDDDIR}/menu"
>>  inherit syslinux
>>
>>  build_boot_bin() {
>> -       install -d ${HDDDIR}
>> -       install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage \
>> -       ${HDDDIR}/vmlinuz
>> +       # Create an HDD image
>> +       if [ "${NOHDD}" != "1" ] ; then
>
> please document this new variable NOHDD somewhere so people know how
> and when to use it

What do you suggests.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br



^ permalink raw reply

* Re: [PATCH 3/4] base-passwd: move initial criation of group and passwd to preinst
From: Otavio Salvador @ 2011-10-21 12:05 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <1319179949.3244.0.camel@lenovo.internal.reciva.com>

On Fri, Oct 21, 2011 at 04:52, Phil Blundell <philb@gnu.org> wrote:
> On Fri, 2011-10-21 at 03:31 +0000, Otavio Salvador wrote:
>> @@ -37,7 +37,7 @@ do_install () {
>>       install -p -m 644 debian/copyright ${D}${docdir}/${BPN}/
>>  }
>>
>> -pkg_postinst_${PN} () {
>> +pkg_preinst_${PN} () {
>>       set -e
>>
>>       if [ ! -e $D${sysconfdir}/passwd ] ; then
>
> Doesn't this break on-target installs (or, more generally, installs
> where preinst runs before unpacking)?

It does indeed. I will fix it and send a new patch for it.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br



^ permalink raw reply

* Re: [PATCH 2/5] kernel.bbclass: respect MACHINE_KERNEL_PR
From: Koen Kooi @ 2011-10-21 12:05 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <CAP9ODKqFfswQ4Y6fJBJMTjrvnu0syiS3rAWxZjhdtwyx_Z_SWQ@mail.gmail.com>


Op 20 okt. 2011, om 15:02 heeft Otavio Salvador het volgende geschreven:

> On Thu, Oct 20, 2011 at 10:54, Koen Kooi <koen@dominion.thruhere.net> wrote:
> ...
>>> Also, the idea never was to have everyone using bleeding edge for
>>> shipping products. This is what stable releases are for?
>> 
>> That's what stable releases are for, but I don't see a release for OE-core, do you? I see a poky release, but not an OE-core release.
> 
> People, let's calm down.
> 
> I think since Richard disagree about pushing this patch and more then
> one person disagree with Richard, TSC is the way to go.

Executive summary of the TSC meeting:

1) This patch gets applied, but no more PR helpers will be allowed, INC_PR and MACHINE_KERNEL_PR are the only ones tolerated for the time being.
2) kernel.bbclass gets dropped from meta-oe
3) basic-hash will get turned on in master-next
4) super-duper PR automation work will land in master-next and get merged into master when it's deemed "good enough"

The intermediate merge step into master-next is only done if enough people test master-next. If people don't want to test it, the merge and associated breakage will go straight into master.

regards,

Koen


^ permalink raw reply

* Re: [PATCH] base.bbclass: add subversion-native to DEPENDS if there is svn:// in SRC_URI
From: Martin Jansa @ 2011-10-21 11:26 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <1319190483-5637-1-git-send-email-Martin.Jansa@gmail.com>

[-- Attachment #1: Type: text/plain, Size: 1320 bytes --]

On Fri, Oct 21, 2011 at 11:48:03AM +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/classes/base.bbclass |    7 +++++++
>  1 files changed, 7 insertions(+), 0 deletions(-)
> 
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index f539744..bced226 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -401,6 +401,13 @@ python () {
>                      bb.note("SKIPPING %s because it's %s" % (pn, this_license))
>                      raise bb.parse.SkipPackage("incompatible with license %s" % this_license)
>  
> +    # Svn packages should DEPEND on subversion-native
> +    srcuri = bb.data.getVar('SRC_URI', d, 1)
> +    if "svn://" in srcuri:
> +        depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
> +        depends = depends + " subversion-native:do_populate_sysroot"
> +        bb.data.setVarFlag('do_fetch', 'depends', depends, d)
> +
>      # Git packages should DEPEND on git-native
>      srcuri = bb.data.getVar('SRC_URI', d, 1)
>      if "git://" in srcuri:

For this to work correctly, we need to add BBCLASSEXTEND = "native" also
to subversion_1.6* otherwise everybody will get subversion-native-1.7.0
-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply

* [PATCH] base.bbclass: add subversion-native to DEPENDS if there is svn:// in SRC_URI
From: Martin Jansa @ 2011-10-21  9:48 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <bcdfb52940fbceb12549f4725ad808ae496afdb3.1319184832.git.Martin.Jansa@gmail.com>

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/base.bbclass |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index f539744..bced226 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -401,6 +401,13 @@ python () {
                     bb.note("SKIPPING %s because it's %s" % (pn, this_license))
                     raise bb.parse.SkipPackage("incompatible with license %s" % this_license)
 
+    # Svn packages should DEPEND on subversion-native
+    srcuri = bb.data.getVar('SRC_URI', d, 1)
+    if "svn://" in srcuri:
+        depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
+        depends = depends + " subversion-native:do_populate_sysroot"
+        bb.data.setVarFlag('do_fetch', 'depends', depends, d)
+
     # Git packages should DEPEND on git-native
     srcuri = bb.data.getVar('SRC_URI', d, 1)
     if "git://" in srcuri:
-- 
1.7.7




^ permalink raw reply related

* Re: [PATCH 2/8] libatomics-ops: force ARM mode
From: Martin Jansa @ 2011-10-21  8:48 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <20111021084346.GA20103@mi.fu-berlin.de>

[-- Attachment #1: Type: text/plain, Size: 804 bytes --]

On Fri, Oct 21, 2011 at 10:43:46AM +0200, Henning Heinold wrote:
> Hi,
> 
> hm we should think of reworking this recipe now. Because since gcc 4.5
> pulseaudio for arm can use the gcc internal atomicstuff and in oe-core 
> and meta-oe we have 4.5 or 4.6 only. The lib is
> only needed for mips and it is still the old release, on cvs
> is a much better version, which supports thumb too, if
> remember correctly.

Agreed, I've added this only because pulseaudio is now needed for
gst-plugins and I wasn't able to build any armv[45]t images.

But because I don't know much about pulseaudio or libatomics-ops I was
hoping that someone who maintains them will fix it properly and this
work around will be needed only temporary.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply

* Re: [PATCH 2/8] libatomics-ops: force ARM mode
From: Henning Heinold @ 2011-10-21  8:43 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <22ed6acc0a44d9bc0d6f7a2e800c039d77d75477.1319184832.git.Martin.Jansa@gmail.com>

Hi,

hm we should think of reworking this recipe now. Because since gcc 4.5
pulseaudio for arm can use the gcc internal atomicstuff and in oe-core 
and meta-oe we have 4.5 or 4.6 only. The lib is
only needed for mips and it is still the old release, on cvs
is a much better version, which supports thumb too, if
remember correctly.

Bye Henning




^ permalink raw reply

* Re: [PATCH 3/8] pulseaudio-0.9.23: force ARM mode
From: Koen Kooi @ 2011-10-21  8:29 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <9e9f9e73e7bfa4a5184196b874cfb1dfe179be24.1319184832.git.Martin.Jansa@gmail.com>


Op 21 okt. 2011, om 10:17 heeft Martin Jansa het volgende geschreven:

> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> .../pulseaudio/pulseaudio_0.9.23.bb                |    1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
> index 4ac2418..2f872b8 100644
> --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
> +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
> @@ -23,3 +23,4 @@ do_compile_prepend() {
>     cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl
> }
> 
> +ARM_INSTRUCTION_SET = "arm"

Missing PR bump


^ permalink raw reply

* [PATCH 8/8] subversion: add 1.7.0 with native support and negative D_P for now
From: Martin Jansa @ 2011-10-21  8:17 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1319184832.git.Martin.Jansa@gmail.com>

* be aware that checkouts from 1.7.0 are not compatible with older
  subversion clients (ie when builder populating distro PREMIRROR is
  using 1.7.0 all builders need to have also 1.7.0)
* and also 1.7.0 client needs to call svn upgrade in checkout first in
  order to use it (so if PREMIRROR has tarball from 1.6.x it won't work
  on client using 1.7.0 unless fetcher2 is improved to detect this and
  call svn upgrade)
* tested on SHR distribution
  http://wiki.shr-project.org/trac/wiki/Building%20SHR#subversion1.7inshr-chroot
* only missing part is to add subversion-native dependency, so that
  native subversion is built, before building ie elementary (because EFL
  are using svnversion from configure.ac to detect source revision and
  .svn dir needs to be from compatible version).
* read http://subversion.apache.org/docs/release-notes/1.7.html

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../subversion/subversion-1.7.0/libtool2.patch     |   15 ++++++++
 .../subversion/subversion_1.7.0.bb                 |   37 ++++++++++++++++++++
 2 files changed, 52 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
 create mode 100644 meta/recipes-devtools/subversion/subversion_1.7.0.bb

diff --git a/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
new file mode 100644
index 0000000..5cd572b
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+--- a/configure.ac	2011-10-20 21:56:02.230663987 +0200
++++ b/configure.ac	2011-08-17 15:01:30.000000000 +0200
+@@ -227,8 +227,8 @@
+   LIBTOOL="$sh_libtool"
+   SVN_LIBTOOL="$sh_libtool"
+ else
+-  sh_libtool="$abs_builddir/libtool"
+-  SVN_LIBTOOL="\$(SHELL) $sh_libtool"
++  sh_libtool="$abs_builddir/$host_alias-libtool"
++  SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool"
+ fi
+ AC_SUBST(SVN_LIBTOOL)
+ 
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.0.bb b/meta/recipes-devtools/subversion/subversion_1.7.0.bb
new file mode 100644
index 0000000..396b35b
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion_1.7.0.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "The Subversion (svn) client"
+SECTION = "console/network"
+DEPENDS = "apr-util neon"
+RDEPENDS_${PN} = "neon"
+LICENSE = "Apache-2"
+HOMEPAGE = "http://subversion.tigris.org"
+
+BBCLASSEXTEND = "native"
+
+# negative, because of new checkout format in 1.7.0 
+# and distro PREMIRRORs need to be in sync with users
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
+           file://libtool2.patch \
+"
+SRC_URI[md5sum] = "930e6644a1b6094efd268fde6a318f04"
+SRC_URI[sha256sum] = "64fd5f263a80e609717a3ca42f1f2625606a5c4a40a85716f82c866033780978"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4"
+
+EXTRA_OECONF = " \
+                --without-berkeley-db --without-apxs --without-apache \
+                --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
+                --with-apr-util=${STAGING_BINDIR_CROSS}"
+
+inherit autotools
+
+export LDFLAGS += " -L${STAGING_LIBDIR} "
+
+acpaths = "-I build/ -I build/ac-macros/"
+
+do_configure_prepend () {
+	rm -f ${S}/libtool
+	rm -f ${S}/build/libtool.m4
+	sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4
+}
-- 
1.7.7




^ permalink raw reply related

* [PATCH 7/8] apr-util: add native support
From: Martin Jansa @ 2011-10-21  8:17 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1319184832.git.Martin.Jansa@gmail.com>

* needed for native subversion
* do_configure_append_virtclass-native is needed, because apr_builddir points to
  /OE/shr-core/tmp/sysroots/x86_64-linux/usr/share/build-1
  and we're not installing libtool from apr there

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-support/apr/apr-util_1.3.12.bb |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-support/apr/apr-util_1.3.12.bb b/meta/recipes-support/apr/apr-util_1.3.12.bb
index 800e67e..0064c51 100644
--- a/meta/recipes-support/apr/apr-util_1.3.12.bb
+++ b/meta/recipes-support/apr/apr-util_1.3.12.bb
@@ -3,6 +3,8 @@ HOMEPAGE = "http://apr.apache.org/"
 SECTION = "libs"
 DEPENDS = "apr expat gdbm"
 
+BBCLASSEXTEND = "native"
+
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \
                     file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42"
@@ -33,6 +35,12 @@ OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
 do_configure_prepend() {
 	cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
 }
+do_configure_prepend_virtclass-native() {
+	cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${S}/build/rules.mk
+}
+do_configure_append_virtclass-native() {
+	sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk
+}
 
 FILES_${PN}     += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so"
 FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/apr_dbm_gdbm.*"
-- 
1.7.7




^ permalink raw reply related

* [PATCH 6/8] neon: add native support
From: Martin Jansa @ 2011-10-21  8:17 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1319184832.git.Martin.Jansa@gmail.com>

* needed for native subversion

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-support/neon/neon_0.29.5.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-support/neon/neon_0.29.5.bb b/meta/recipes-support/neon/neon_0.29.5.bb
index 8201ffe..34c7253 100644
--- a/meta/recipes-support/neon/neon_0.29.5.bb
+++ b/meta/recipes-support/neon/neon_0.29.5.bb
@@ -5,9 +5,12 @@ LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \
                     file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037"
 DEPENDS = "zlib libxml2 expat time gnutls libproxy"
+DEPENDS_virtclass-native = "zlib-native libxml2-native expat-native gnutls-native"
 
 PR = "r1"
 
+BBCLASSEXTEND = "native"
+
 SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \
            file://pkgconfig.patch"
 
-- 
1.7.7




^ permalink raw reply related

* [PATCH 5/8] apr: add native support
From: Martin Jansa @ 2011-10-21  8:17 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1319184832.git.Martin.Jansa@gmail.com>

* needed for native subversion

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-support/apr/apr_1.4.5.bb |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-support/apr/apr_1.4.5.bb b/meta/recipes-support/apr/apr_1.4.5.bb
index 173402a..be465b4 100644
--- a/meta/recipes-support/apr/apr_1.4.5.bb
+++ b/meta/recipes-support/apr/apr_1.4.5.bb
@@ -6,6 +6,8 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \
                     file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96"
 
+BBCLASSEXTEND = "native"
+
 PR = "r1"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
-- 
1.7.7




^ permalink raw reply related

* [PATCH 4/8] webkit-gtk: force arm mode to work around binutils segfault
From: Martin Jansa @ 2011-10-21  8:17 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1319184832.git.Martin.Jansa@gmail.com>

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-sato/webkit/webkit-gtk_svn.bb |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index 2862ad4..0a1f8b6 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -45,6 +45,23 @@ EXTRA_OECONF = "\
 
 EXTRA_AUTORECONF = " -I Source/autotools "
 
+
+#| ./Source/JavaScriptCore/heap/HandleTypes.h: In static member function 'static T* JSC::HandleTypes<T>::getFromSlot(JSC::HandleSlot) [with T = JSC::Structure, JSC::HandleTypes<T>::ExternalType = JSC::Structure*, JSC::HandleSlot = JSC::JSValue*]':
+#| ./Source/JavaScriptCore/heap/Handle.h:141:79:   instantiated from 'JSC::Handle<T>::ExternalType JSC::Handle<T>::get() const [with T = JSC::Structure, JSC::Handle<T>::ExternalType = JSC::Structure*]'
+#| ./Source/JavaScriptCore/runtime/ScopeChain.h:39:75:   instantiated from here
+#| ./Source/JavaScriptCore/heap/HandleTypes.h:38:130: warning: cast from 'JSC::JSCell*' to 'JSC::HandleTypes<JSC::Structure>::ExternalType {aka JSC::Structure*}' increases required alignment of target type [-Wcast-align]
+#| {standard input}: Assembler messages:
+#| {standard input}:28873: Error: invalid immediate: 983040 is out of range
+#| {standard input}:28873: Error: value of 983040 too large for field of 2 bytes at 15110
+#| /OE/shr-core/tmp/sysroots/x86_64-linux/usr/libexec/armv4t-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.6.2/as: BFD (GNU Binutils) 2.21.1 assertion fail /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/binutils-cross-2.21.1a-r0/binutils-2.21.1/bfd/elf.c:2819
+#| arm-oe-linux-gnueabi-g++: internal compiler error: Segmentation fault (program as)
+#| Please submit a full bug report,
+#| with preprocessed source if appropriate.
+#| See <http://gcc.gnu.org/bugs.html> for instructions.
+#| make[1]: *** [Source/JavaScriptCore/jit/libjavascriptcoregtk_1_0_la-JIT.lo] Error 1
+#| make[1]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0'
+ARM_INSTRUCTION_SET = "arm"
+
 CONFIGUREOPT_DEPTRACK = ""
 
 do_configure_append() {
-- 
1.7.7




^ permalink raw reply related

* [PATCH 3/8] pulseaudio-0.9.23: force ARM mode
From: Martin Jansa @ 2011-10-21  8:17 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1319184832.git.Martin.Jansa@gmail.com>

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../pulseaudio/pulseaudio_0.9.23.bb                |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
index 4ac2418..2f872b8 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
@@ -23,3 +23,4 @@ do_compile_prepend() {
     cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl
 }
 
+ARM_INSTRUCTION_SET = "arm"
-- 
1.7.7




^ permalink raw reply related

* [PATCH 2/8] libatomics-ops: force ARM mode
From: Martin Jansa @ 2011-10-21  8:17 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1319184832.git.Martin.Jansa@gmail.com>

* otherwise ie spitz (armv5te) build fails with:
| make[3]: Entering directory `/OE/shr-core/tmp/work/armv5te-oe-linux-gnueabi/libatomics-ops-1.2-r5/libatomic_ops-1.2/src'
| arm-oe-linux-gnueabi-gcc  -march=armv5te  -mthumb -mthumb-interwork  -mtune=xscale --sysroot=/OE/shr-core/tmp/sysroots/spitz -DHAVE_CONFIG_H -I.    -fPIC -O
2 -pipe -g -feliminate-unused-debug-types -DNDEBUG -c atomic_ops.c
| arm-oe-linux-gnueabi-gcc  -march=armv5te  -mthumb -mthumb-interwork  -mtune=xscale --sysroot=/OE/shr-core/tmp/sysroots/spitz -DHAVE_CONFIG_H -I.    -fPIC -O
2 -pipe -g -feliminate-unused-debug-types -DNDEBUG -c atomic_ops_stack.c
| arm-oe-linux-gnueabi-gcc  -march=armv5te  -mthumb -mthumb-interwork  -mtune=xscale --sysroot=/OE/shr-core/tmp/sysroots/spitz -DHAVE_CONFIG_H -I.    -fPIC -O
2 -pipe -g -feliminate-unused-debug-types -DNDEBUG -c atomic_ops_malloc.c
| atomic_ops_malloc.c: In function 'msb':
| atomic_ops_malloc.c:223:2: warning: right shift count >= width of type [enabled by default]
| rm -f libatomic_ops_gpl.a
| ar cru libatomic_ops_gpl.a atomic_ops_stack.o atomic_ops_malloc.o
| arm-oe-linux-gnueabi-ranlib libatomic_ops_gpl.a
| {standard input}: Assembler messages:
| {standard input}:286: Error: selected processor does not support Thumb mode `swp r1,r2,[r3]'
| {standard input}:329: Error: selected processor does not support Thumb mode `swp r0,r1,[r3]'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../pulseaudio/libatomics-ops_1.2.bb               |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb b/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
index 05b22e8..4d9ca0d 100644
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
+++ b/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
@@ -20,4 +20,6 @@ S = "${WORKDIR}/libatomic_ops-${PV}"
 
 ALLOW_EMPTY_${PN} = "1"
 
+ARM_INSTRUCTION_SET = "arm"
+
 inherit autotools pkgconfig
-- 
1.7.7




^ permalink raw reply related

* [PATCH 1/8] pulseaudio-0.9.23: inherit perlnative to work around build on host without XML/Parser.pm
From: Martin Jansa @ 2011-10-21  8:17 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1319184832.git.Martin.Jansa@gmail.com>

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../pulseaudio/pulseaudio_0.9.23.bb                |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
index 33f5e15..4ac2418 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
@@ -4,7 +4,7 @@ PR = "r5"
 
 DEPENDS += "gdbm speex"
 
-inherit gettext
+inherit gettext perlnative
 
 SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.gz \
   file://buildfix.patch \
-- 
1.7.7




^ permalink raw reply related

* [PATCH 0/8] Subversion-1.7.0 and arm/thumb work arounds
From: Martin Jansa @ 2011-10-21  8:17 UTC (permalink / raw)
  To: openembedded-core

Hi,

arm mode was forced without PR bump, because if it was failing for someone he 
will notice.

Be carefull with using subversion-1.7.0 (read the commit message).

Pulseaudio-1.1 was released, so hopefully this work arounds won't be needed
there or they could be resolved better with upgrade.

Regards,

The following changes since commit 99da9a4e65f9dffb04efc3ad60125194c476d6b3:

  distro-tracking-fields: update fields for tzdata and gst-plugins-good (2011-10-20 13:07:16 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib jansa/pull2
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull2

Martin Jansa (8):
  pulseaudio-0.9.23: inherit perlnative to work around build on host
    without XML/Parser.pm
  libatomics-ops: force ARM mode
  pulseaudio-0.9.23: force ARM mode
  webkit-gtk: force arm mode to work around binutils segfault
  apr: add native support
  neon: add native support
  apr-util: add native support
  subversion: add 1.7.0 with native support and negative D_P for now

 .../subversion/subversion-1.7.0/libtool2.patch     |   15 ++++++++
 .../subversion/subversion_1.7.0.bb                 |   37 ++++++++++++++++++++
 .../pulseaudio/libatomics-ops_1.2.bb               |    2 +
 .../pulseaudio/pulseaudio_0.9.23.bb                |    3 +-
 meta/recipes-sato/webkit/webkit-gtk_svn.bb         |   17 +++++++++
 meta/recipes-support/apr/apr-util_1.3.12.bb        |    8 ++++
 meta/recipes-support/apr/apr_1.4.5.bb              |    2 +
 meta/recipes-support/neon/neon_0.29.5.bb           |    3 ++
 8 files changed, 86 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
 create mode 100644 meta/recipes-devtools/subversion/subversion_1.7.0.bb

-- 
1.7.7




^ permalink raw reply

* Re: [PATCH] mesa-dri: move extra DRIMODULES to EXTRA_DRIMODULES
From: Martin Jansa @ 2011-10-21  8:12 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <7603E49D-D11F-4D4A-8883-B07E61B3FBC2@dominion.thruhere.net>

[-- Attachment #1: Type: text/plain, Size: 2851 bytes --]

On Fri, Oct 21, 2011 at 09:54:21AM +0200, Koen Kooi wrote:
> 
> Op 21 okt. 2011, om 09:34 heeft Martin Jansa het volgende geschreven:
> 
> > On Sat, Oct 15, 2011 at 7:02 PM, Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> >> On Sat, 2011-10-15 at 12:38 +0200, Martin Jansa wrote:
> >>> * this way we can use
> >>>   EXTRA_DRIDRIVERS_armv4t += ",glamo" in meta-openmoko layer and
> >>>   EXTRA_DRIDRIVERS_armv4t += ",foo" in meta-bar layer without knowledge
> >>>   of other modules in other layers in stack
> >>> * actually it's like old MACHINE_DRI_MODULES from OE-classic but renamed
> >>>   to indicate that it should be used for architecture not machine
> >> 
> >> This is way overcomplicated. Just do:
> >> 
> >> DRIDRIVERS_append_armv4t = ",glamo"
> > 
> > Ah, is it expected that armv4t is no longer valid OVERRIDE?
> 
> It is valid for angstrom:

I was thinking about adding the same to shr config.. but can I expect
that everybody who wants to use meta-openmoko will read README so
carefully that it will be enough to say
This layer depends on FEED_ARCH OVERRIDE?

Regards,

> koen@dominion:/OE/tentacle/sources/meta-ti$ MACHINE=om-gta01 bitbake -e | grep OVERRIDES
> # DISTROOVERRIDES=${DISTRO}
> DISTROOVERRIDES="angstrom"
> # MACHINEOVERRIDES=${MACHINE}:${@bb.data.getVar('FEED_ARCH', d,1).replace('all','noarch')}:${SOC_FAMILY}
> MACHINEOVERRIDES="om-gta01:armv4t:Unknown"
> # OVERRIDES=${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}${@bb.utils.contains("TUNE_FEATURES", "no-thumb-interwork", ":thumb-interwork", "", d)}:libc-glibc:libc-glibc
> 
> regards,
> 
> Koen
> 
> > 
> > OVERRIDES="linux-gnueabi:arm:build-linux:pn-libdrm:om-gta02::shr:forcevariable:thumb:libc-glibc"
> > 
> > # OVERRIDES=${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable${@bb.utils.contains("TUNE_FEATURES",
> > "thumb", ":thumb", "", d)}${@bb.utils.contains("TUNE_FEATURES",
> > "no-thumb-interwork", ":thumb-interwork", "", d)}:libc-glibc
> > 
> > So I've to change it to
> > DRIDRIVERS_append_arm
> > or is it TRANSLATED_TARGET_ARCH fault?
> > 
> > Regards,
> > 
> > _______________________________________________
> > 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

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply

* Re: [PATCH 2/6] gmp: also generate the libgmpcxx library
From: Saul Wold @ 2011-10-21  7:54 UTC (permalink / raw)
  To: Kamble, Nitin A; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <9DA5872FEF993D41B7173F58FCF6BE94E32D2390@orsmsx504.amr.corp.intel.com>

On 10/20/2011 11:04 PM, Kamble, Nitin A wrote:
>
>
>> -----Original Message-----
>> From: Saul Wold [mailto:saul.wold@intel.com]
>> Sent: Thursday, October 20, 2011 12:50 AM
>> To: Patches and discussions about the oe-core layer
>> Cc: Kamble, Nitin A
>> Subject: Re: [OE-core] [PATCH 2/6] gmp: also generate the libgmpcxx
>> library
>>
>> On 10/18/2011 05:30 PM, nitin.a.kamble@intel.com wrote:
>>> From: Nitin A Kamble<nitin.a.kamble@intel.com>
>>>
>>> configure runs few checks to make sure c++ compiler and runtime are
>> working as expected
>>> with the --enable-cxx=detect option.
>>>
>> Somehow this change has also changed what the gmp package provides,
>> before this change the package provided libgmp10 via PKG_gmp: libgmp10,
>> after this change, the libgmp10 is no longer provided and causes other
>> breakage.
>>
>> The example case I found was a coreutils package that was built prior
>> to
>> this change failed to fulfill it's dependencies after this change when
>> creating an image.  If I rebuild coreutils with the newer gmp build,
>> then all is well, I think we need to understand this better before
>> making this change.
>>
>> Did something else change in the packaging that would cause use to look
>> the mapping above?
>>
> Saul,
>    In my testing I did not get any of these issues you mentioned above.
>
> Also I tried to reproduce the issue with coreutils as mentioned above, and I can not reproduce the issue for creations of an image. Can you verify the issue one more time?
>
Just to confirm, did you have a build of coreutils prior to your gmp 
changes? Which image did you build?  Be sure you build an image that 
includes coreutils, such at an -sdk image.

I can easily reproduce this issue.

Sau!

> Thanks,
> Nitin
>
>>
>> Sau!
>>
>>
>>> Signed-off-by: Nitin A Kamble<nitin.a.kamble@intel.com>
>>> ---
>>>    meta/recipes-support/gmp/gmp.inc      |    2 ++
>>>    meta/recipes-support/gmp/gmp_4.2.1.bb |    2 +-
>>>    meta/recipes-support/gmp/gmp_5.0.2.bb |    2 +-
>>>    3 files changed, 4 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/meta/recipes-support/gmp/gmp.inc b/meta/recipes-
>> support/gmp/gmp.inc
>>> index 66349e6..3c662a0 100644
>>> --- a/meta/recipes-support/gmp/gmp.inc
>>> +++ b/meta/recipes-support/gmp/gmp.inc
>>> @@ -14,3 +14,5 @@ ARM_INSTRUCTION_SET = "arm"
>>>    acpaths = ""
>>>
>>>    BBCLASSEXTEND = "native nativesdk"
>>> +
>>> +EXTRA_OECONF += " --enable-cxx=detect"
>>> diff --git a/meta/recipes-support/gmp/gmp_4.2.1.bb b/meta/recipes-
>> support/gmp/gmp_4.2.1.bb
>>> index 74da6b8..97ac4b2 100644
>>> --- a/meta/recipes-support/gmp/gmp_4.2.1.bb
>>> +++ b/meta/recipes-support/gmp/gmp_4.2.1.bb
>>> @@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1+"
>>>    LIC_FILES_CHKSUM =
>> "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a \
>>>
>> file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
>>>                        file://gmp-
>> h.in;startline=6;endline=21;md5=5e25ffd16996faba8c1cd27b04b16099"
>>> -PR = "r0"
>>> +PR = "r1"
>>>
>>>    SRC_URI = "${GNU_MIRROR}/gmp/${BP}.tar.bz2 \
>>>               file://disable-stdc.patch"
>>> diff --git a/meta/recipes-support/gmp/gmp_5.0.2.bb b/meta/recipes-
>> support/gmp/gmp_5.0.2.bb
>>> index 03fef45..f80971e 100644
>>> --- a/meta/recipes-support/gmp/gmp_5.0.2.bb
>>> +++ b/meta/recipes-support/gmp/gmp_5.0.2.bb
>>> @@ -2,7 +2,7 @@ require gmp.inc
>>>    LICENSE="LGPLv3&GPLv3"
>>>    LIC_FILES_CHKSUM =
>> "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
>>>
>> file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790"
>>> -PR = "r0"
>>> +PR = "r1"
>>>
>>>    SRC_URI_append += "file://sh4-asmfix.patch \
>>>                       file://use-includedir.patch "
>




^ permalink raw reply


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox