Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH v2] Give coreutils a chance to build the df utility
From: Julian Pidancet @ 2011-10-26 21:41 UTC (permalink / raw)
  To: openembedded-core; +Cc: Julian Pidancet

The coreutils configure script is unable determine how to get free
space from the Operating System when cross-compiling.
This changes caches the result of the "statfs2_bsize" test for the
coreutils configure script.
Both glibc and uclibc defines statfs as a two-argument function
and uses a struct statfs containing a f_bsize field. That's why
the fu_cv_sys_stat_statfs2_bsize variable has to be defined for
both libcs.

Signed-off-by: Julian Pidancet <julian.pidancet@gmail.com>
---
 meta/recipes-core/coreutils/coreutils_8.14.bb |    2 +-
 meta/site/common-glibc                        |    3 +++
 meta/site/common-uclibc                       |    3 +++
 3 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/coreutils/coreutils_8.14.bb b/meta/recipes-core/coreutils/coreutils_8.14.bb
index f3b7af7..fa2a2c9 100644
--- a/meta/recipes-core/coreutils/coreutils_8.14.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.14.bb
@@ -27,7 +27,7 @@ bindir_progs = "base64 basename chcon cksum comm csplit cut dir dircolors dirnam
                 join link logname md5sum mkfifo mktemp nice nl nohup nproc od paste pathchk \
                 pinky pr printenv printf ptx readlink runcon seq sha1sum sha224sum sha256sum \
                 sha384sum sha512sum shred shuf sort split stat stdbuf sum tac tail tee test timeout\
-                tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes"
+                tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes df"
 
 # hostname gets a special treatment and is not included in this
 base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \
diff --git a/meta/site/common-glibc b/meta/site/common-glibc
index 9b74038..364ab67 100644
--- a/meta/site/common-glibc
+++ b/meta/site/common-glibc
@@ -25,6 +25,9 @@ clamav_av_have_in_port_t=${clamav_av_have_in_port_t=yes}
 clamav_av_have_in_addr_t=${clamav_av_have_in_addr_t=yes}
 ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes}
 
+# coreutils
+fu_cv_sys_stat_statfs2_bsize=${fu_cv_sys_stat_statfs2_bsize=yes}
+
 # glib
 glib_cv_strlcpy=${glib_cv_strlcpy=no}
 ac_cv_func_printf_unix98=${ac_cv_func_printf_unix98=yes}
diff --git a/meta/site/common-uclibc b/meta/site/common-uclibc
index bdad0e9..a264765 100644
--- a/meta/site/common-uclibc
+++ b/meta/site/common-uclibc
@@ -28,6 +28,9 @@ ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
 bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=no}
 bash_cv_sys_siglist=${bash_cv_sys_siglist=no}
 
+# coreutils
+fu_cv_sys_stat_statfs2_bsize=${fu_cv_sys_stat_statfs2_bsize=yes}
+
 # va_copy and _va_copy
 ac_cv_va_copy=${ac_cv_va_copy=yes}
 ac_cv___va_copy=${ac_cv___va_copy=yes}
-- 
Julian Pidancet




^ permalink raw reply related

* Re: --root option in upstream shadow
From: Nicolas François @ 2011-10-26 20:51 UTC (permalink / raw)
  To: julian.pidancet; +Cc: pkg-shadow-devel, Scott Garman, openembedded-core
In-Reply-To: <CAKZ=5EWt4QwLeVSJp5v6xgSOX6C_VRpz3hq_PjfCrAGBWU0DEw@mail.gmail.com>

Hi,

On Mon, Oct 24, 2011 at 01:06:11AM +0100, julian.pidancet@gmail.com wrote:
> On Sat, Oct 22, 2011 at 12:54 PM, Nicolas François
> <nicolas.francois@centraliens.net> wrote:
> >
> > What is the expected behavior when the utility authenticates the caller?
> >  1] authenticate the caller in the caller's chroot
> >  2] authenticate the caller in the target's chroot
> >  3] both
> >
> > I currently think that 3] would be the right behavior: the caller needs to
> > be authenticated to make sure it is allowed to use the tool, then it
> > should be authenticated on the target to make sure the operation is
> > allowed.
> > ...But this is much more complex.
> >
> > If this is fine for you, I would prefer to disable this feature when the
> > utility is setuid and not executed by root.
> >
> 
> I'm affraid this patch does not do what you think it does. The --root
> option does not apply to login, but only to the various administrative
> tools that comes with it (gpasswd, groupadd, groupdel, groupmod,
> grpconv, grpunconv, passwd, pwconv, pwunconv, useradd, userdel).

I understand this correctly.

Lets take the passwd use case.
passwd usually authenticates the caller (when UID==0, this authentication
is usually skipped), then asks for the new password, then update the
password databases.
passwd is suid and can be used by non root users to change the caller's
password. What should be the behavior of passwd is such case?
With the current patch, an user with UID 1000 will be allowed to change the
password of the user from the target chroot with the same UID 1000. 

In the patched tools you indicated, gpasswd is also suid.
And all the others can be suid when configured with
--enable-account-tools-setuid

My proposal is to only support --root for root. For non suid utils,
regular users will be denied chroot anyway, hence: "disable this feature
when the utility is setuid and not executed by root."

In your use case (for packaging), I assume the tools are always called by
root. Then this restriction should not affect you.

> It allows OE to manipulate passwd and group files that are located in
> a sysroot by chrooting into it, because all these programs have their
> path to /etc/passwd and friends hardcoded.

The advantage is not only that the destination user/group files are
changed, but also that they are changed considering the configuration of
the target system (e.g. PAM, /etc/login.defs, ...)

Best Regards,
-- 
Nekral



^ permalink raw reply

* Re: [PATCH 3/3] gcc-configure-sdk: Point sysroot to correct location
From: Richard Purdie @ 2011-10-26 20:54 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <840A81C1B782724A8EB52725BD519EFF1A8959@MBX20.4emm.local>

On Fri, 2011-10-21 at 05:23 +0000, James Limbouris wrote:
> > -----Original Message-----
> > From: openembedded-core-bounces@lists.openembedded.org
> > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> > Khem Raj
> > Sent: Friday, 21 October 2011 1:16 PM
> > To: Patches and discussions about the oe-core layer
> > Subject: Re: [OE-core] [PATCH 3/3] gcc-configure-sdk: Point sysroot to correct
> > location
> > 
> > On Thu, Oct 20, 2011 at 10:12 PM, James Limbouris
> > <james@digitalmatter.com.au> wrote:
> > >> -----Original Message-----
> > >> From: openembedded-core-bounces@lists.openembedded.org
> > >> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf
> > Of
> > >> Khem Raj
> > >> Sent: Friday, 21 October 2011 1:03 PM
> > >> To: openembedded-core@lists.openembedded.org
> > >> Subject: [OE-core] [PATCH 3/3] gcc-configure-sdk: Point sysroot to correct
> > >> location
> > >>
> > >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > >> ---
> > >>  meta/recipes-devtools/gcc/gcc-configure-sdk.inc |    2 +-
> > >>  1 files changed, 1 insertions(+), 1 deletions(-)
> > >>
> > >> diff --git a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc b/meta/recipes-
> > >> devtools/gcc/gcc-configure-sdk.inc
> > >> index de80870..98fd4c1 100644
> > >> --- a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
> > >> +++ b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
> > >> @@ -7,7 +7,7 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-
> > >> uclibceabi", "no", "", d )}'
> > >>  EXTRA_OECONF_PATHS = "--with-local-
> > >> prefix=${SDKPATH}/sysroots/${TARGET_SYS}${target_exec_prefix} \
> > >>                        --with-gxx-include-dir=${target_includedir}/c++ \
> > >>                        --with-build-time-
> > >> tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \
> > >> -                      --with-sysroot=${SDKPATH}/sysroots/${TARGET_SYS} \
> > >> +                      --with-
> > >> sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-
> > >> ${TARGET_OS} \
> > >>                        --with-build-sysroot=${STAGING_DIR_TARGET}"
> > >>
> > >>  #
> > >> --
> > >> 1.7.5.4
> > >>
> > >
> > > Shouldn't --with-local-prefix be changed too? I am testing with both
> > ${TARGET_SYS}'s replaced. Will post results shortly.
> > 
> > yes I think both places it should change
> > 
> 
> Ok, I've tested with both changed, and the corresponding binutils patch, and both Qt and kernel compiles are working.

I took these patches but I would like to stress that we shouldn't need
to rely on the hardcoded path in the compiler, it should be picking up
any alternative sysroot paths from the environment. If this isn't
happening, we should be figuring out why not. This change therefore
hides issues and does not fix the problem entirely :(.

Cheers,

Richard




^ permalink raw reply

* [PATCH 0/2] RFC v2: provide 3.0.x and 3.1 libc headers
From: Bruce Ashfield @ 2011-10-26 20:56 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core, saul.wold

Richard,

Here's a quick respin of the series to factor out some code.

Changes since v1:
 
 - factored common code out into the .inc file. Captured in patch 1/2
 - patch 2/2 is the introduction of the new headers

Original Email is included below:

Here's a RFC patch for updating the toolchain linux-libc headers to 3.x
variants.

The reason I'm calling it a RFC is:

  - I wrote some anonymous python code (and I'm no python coder) to
    deal with 2.6 / 3.0 tgz location differences. This could have
    also been done with a variable set in the recipes and used by
    the .inc. I wasn't sure of the preferred approach, hence the RFC.
    I'll take no offense corrections here.

  - I changed the .inc, but didn't bump the PR of the existing recipes
    and didn't remove the existing 2.6 variants. If either of these
    should have been done, let me know and I'll respin.

  - I bumped the default to be 3.1. If that's too agressive for the
    default, and we'd prefer 3.0.8, let me know and I'll respin.

I built and booted all the qemu machines with the 3.1 kernel headers.  So
from the testing I was able to do, this looks to be safe and ready to go.

This is based on my yocto repo, I also did the changes in my oe-core
repository, but I don't have a oe-core contrib branch that I could push to,
so I chose to send the yocto variant. If someone points me to who I email for
an oe-core contrib branch, I can push that variant as well.

Cheers,

Bruce


The following changes since commit fc94f925e848684244a38dcffe15cb1192dfbed8:
  Martin Jansa (1):
        libxml-parser-perl, libxml-simple-perl, expat, sgmlspl-native, git: bump PR to rebuild after perl upgrade

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib zedd/libc-headers-v2
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/libc-headers-v2

Bruce Ashfield (2):
  linux-libc-headers: factor common code into linux-libc-headers.inc
  linux-libc-headers: provide 3.0.x and 3.1 headers

 meta/conf/distro/include/tcmode-default.inc        |    2 +-
 .../linux-libc-headers/linux-libc-headers.inc      |   61 +++++++++++++++++++-
 .../linux-libc-headers_2.6.37.2.bb                 |   46 +--------------
 .../linux-libc-headers_2.6.39.bb                   |   47 +---------------
 .../linux-libc-headers/linux-libc-headers_3.0.8.bb |    9 +++
 .../linux-libc-headers/linux-libc-headers_3.1.bb   |    9 +++
 6 files changed, 79 insertions(+), 95 deletions(-)
 create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
 create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb




^ permalink raw reply

* [PATCH 2/2] linux-libc-headers: provide 3.0.x and 3.1 headers
From: Bruce Ashfield @ 2011-10-26 20:56 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core, saul.wold
In-Reply-To: <cover.1319662382.git.bruce.ashfield@windriver.com>

Provide both a 3.0.x and a 3.1 set of headers to the toolchain.
Compatibility is maintained with older 2.6 headers by creating a
new variable that changes the SRC_URI based on the major version
number of the kernel.

Built and booted with 2.6.37.2, 3.0.8 and 3.1 linux-libc-headers.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/conf/distro/include/tcmode-default.inc        |    2 +-
 .../linux-libc-headers/linux-libc-headers.inc      |   17 ++++++++++++++---
 .../linux-libc-headers/linux-libc-headers_3.0.8.bb |    9 +++++++++
 .../linux-libc-headers/linux-libc-headers_3.1.bb   |    9 +++++++++
 4 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
 create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb

diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 2bf1beb..ed722be 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -21,7 +21,7 @@ SDKGCCVERSION ?= "4.6%"
 BINUVERSION ?= "2.21.1a"
 EGLIBCVERSION ?= "2.13"
 UCLIBCVERSION ?= "0.9.32"
-LINUXLIBCVERSION ?= "2.6.37.2"
+LINUXLIBCVERSION ?= "3.1"
 
 # Temporary preferred version overrides for PPC
 PREFERRED_VERSION_u-boot-mkimage-native_powerpc ?= "2009.08"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
index e83a92b..5fcb181 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -1,9 +1,20 @@
-DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
+DESCRIPTION = "Sanitized set of kernel headers for the C library's use."
 SECTION = "devel"
 LICENSE = "GPLv2"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" 
-SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v2.6/linux-${PV}.tar.bz2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+python __anonymous () {
+    import bb, re, string
+
+    major = bb.data.getVar("PV",d,1).split('.')[0]
+    if major == "3":
+	bb.data.setVar("HEADER_FETCH_VER", "3.0", d)
+    else:
+	bb.data.setVar("HEADER_FETCH_VER", "2.6", d)
+}
+
+SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v${HEADER_FETCH_VER}/linux-${PV}.tar.bz2"
 
 S = "${WORKDIR}/linux-${PV}"
 
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
new file mode 100644
index 0000000..e3bad82
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
@@ -0,0 +1,9 @@
+require linux-libc-headers.inc
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS += "unifdef-native"
+PR = "r1"
+
+SRC_URI += " file://connector-msg-size-fix.patch"
+SRC_URI[md5sum] = "eac4d398a0ecd98214487cd47a228998"
+SRC_URI[sha256sum] = "4ed16da319848f681f711dbda2ac2cf1b306a280ec22f90bae190cf23b533add"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
new file mode 100644
index 0000000..72b6d4a
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
@@ -0,0 +1,9 @@
+require linux-libc-headers.inc
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS += "unifdef-native"
+PR = "r1"
+
+SRC_URI += " file://connector-msg-size-fix.patch"
+SRC_URI[md5sum] = "8d43453f8159b2332ad410b19d86a931"
+SRC_URI[sha256sum] = "2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359"
-- 
1.7.0.4




^ permalink raw reply related

* [PATCH 1/2] linux-libc-headers: factor common code into linux-libc-headers.inc
From: Bruce Ashfield @ 2011-10-26 20:56 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core, saul.wold
In-Reply-To: <cover.1319662382.git.bruce.ashfield@windriver.com>

Each time a new linux-libc-headers is created the same code is
cloned. Placing the common functionality in the .inc file simplies
each recipe and make maintenance easier.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../linux-libc-headers/linux-libc-headers.inc      |   44 ++++++++++++++++++
 .../linux-libc-headers_2.6.37.2.bb                 |   46 +-------------------
 .../linux-libc-headers_2.6.39.bb                   |   47 +-------------------
 3 files changed, 46 insertions(+), 91 deletions(-)

diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
index 014024f..e83a92b 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -5,6 +5,50 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" 
 SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v2.6/linux-${PV}.tar.bz2"
 
+S = "${WORKDIR}/linux-${PV}"
+
+set_arch() {
+	case ${TARGET_ARCH} in
+		alpha*)   ARCH=alpha ;;
+		arm*)     ARCH=arm ;;
+		cris*)    ARCH=cris ;;
+		hppa*)    ARCH=parisc ;;
+		i*86*)    ARCH=i386 ;;
+		ia64*)    ARCH=ia64 ;;
+		mips*)    ARCH=mips ;;
+		m68k*)    ARCH=m68k ;;
+		powerpc*) ARCH=powerpc ;;
+		s390*)    ARCH=s390 ;;
+		sh*)      ARCH=sh ;;
+		sparc64*) ARCH=sparc64 ;;
+		sparc*)   ARCH=sparc ;;
+		x86_64*)  ARCH=x86_64 ;;
+		avr32*)   ARCH=avr32 ;;
+		bfin*)    ARCH=blackfin ;;
+		microblaze*) ARCH=microblaze ;;
+	esac
+}
+
+do_configure() {
+	set_arch
+	oe_runmake allnoconfig ARCH=$ARCH
+}
+
+do_compile () {
+}
+
+do_install() {
+	set_arch
+	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
+	# Kernel should not be exporting this header
+	rm -f ${D}${exec_prefix}/include/scsi/scsi.h
+
+	# The ..install.cmd conflicts between various configure runs
+	find ${D}${includedir} -name ..install.cmd | xargs rm -f
+}
+
+BBCLASSEXTEND = "nativesdk"
+
 #DEPENDS = "cross-linkage"
 RDEPENDS_${PN}-dev = ""
 RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb
index 55d7527..e2def96 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb
@@ -2,52 +2,8 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r2"
+PR = "r3"
 
 SRC_URI += " file://connector-msg-size-fix.patch"
-
-S = "${WORKDIR}/linux-${PV}"
-
-set_arch() {
-	case ${TARGET_ARCH} in
-		alpha*)   ARCH=alpha ;;
-		arm*)     ARCH=arm ;;
-		cris*)    ARCH=cris ;;
-		hppa*)    ARCH=parisc ;;
-		i*86*)    ARCH=i386 ;;
-		ia64*)    ARCH=ia64 ;;
-		mips*)    ARCH=mips ;;
-		m68k*)    ARCH=m68k ;;
-		powerpc*) ARCH=powerpc ;;
-		s390*)    ARCH=s390 ;;
-		sh*)      ARCH=sh ;;
-		sparc64*) ARCH=sparc64 ;;
-		sparc*)   ARCH=sparc ;;
-		x86_64*)  ARCH=x86_64 ;;
-		avr32*)   ARCH=avr32 ;;
-		bfin*)    ARCH=blackfin ;;
-		microblaze*) ARCH=microblaze ;;
-	esac
-}
-
-do_configure() {
-	set_arch
-	oe_runmake allnoconfig ARCH=$ARCH
-}
-
-do_compile () {
-}
-
-do_install() {
-	set_arch
-	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
-	# Kernel should not be exporting this header
-	rm -f ${D}${exec_prefix}/include/scsi/scsi.h
-
-	# The ..install.cmd conflicts between various configure runs
-	find ${D}${includedir} -name ..install.cmd | xargs rm -f
-}
-
-BBCLASSEXTEND = "nativesdk"
 SRC_URI[md5sum] = "89f681bc7c917a84aa7470da6eed5101"
 SRC_URI[sha256sum] = "2920c4cd3e87fe40ebee96d28779091548867e1c36f71c1fc3d07e6d5802161f"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb
index 14f5e8a..a1821e2 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb
@@ -2,53 +2,8 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
+PR = "r3"
 
 SRC_URI += " file://connector-msg-size-fix.patch"
 SRC_URI[md5sum] = "1aab7a741abe08d42e8eccf20de61e05"
 SRC_URI[sha256sum] = "584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6"
-
-S = "${WORKDIR}/linux-${PV}"
-
-PR = "r2"
-
-set_arch() {
-	case ${TARGET_ARCH} in
-		alpha*)   ARCH=alpha ;;
-		arm*)     ARCH=arm ;;
-		cris*)    ARCH=cris ;;
-		hppa*)    ARCH=parisc ;;
-		i*86*)    ARCH=i386 ;;
-		ia64*)    ARCH=ia64 ;;
-		mips*)    ARCH=mips ;;
-		m68k*)    ARCH=m68k ;;
-		powerpc*) ARCH=powerpc ;;
-		s390*)    ARCH=s390 ;;
-		sh*)      ARCH=sh ;;
-		sparc64*) ARCH=sparc64 ;;
-		sparc*)   ARCH=sparc ;;
-		x86_64*)  ARCH=x86_64 ;;
-		avr32*)   ARCH=avr32 ;;
-		bfin*)    ARCH=blackfin ;;
-		microblaze*) ARCH=microblaze ;;
-	esac
-}
-
-do_configure() {
-	set_arch
-	oe_runmake allnoconfig ARCH=$ARCH
-}
-
-do_compile () {
-}
-
-do_install() {
-	set_arch
-	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
-	# Kernel should not be exporting this header
-	rm -f ${D}${exec_prefix}/include/scsi/scsi.h
-
-        # The ..install.cmd conflicts between various configure runs
-        find ${D}${includedir} -name ..install.cmd | xargs rm -f
-}
-
-BBCLASSEXTEND = "nativesdk"
-- 
1.7.0.4




^ permalink raw reply related

* Re: [PATCH 1/1] linux-libc-headers: provide 3.0.x and 3.1 headers
From: Richard Purdie @ 2011-10-26 21:01 UTC (permalink / raw)
  To: Bruce Ashfield; +Cc: openembedded-core, saul.wold
In-Reply-To: <0ec24ded3f71c54e544d953de65d142717f48022.1319652972.git.bruce.ashfield@windriver.com>

On Wed, 2011-10-26 at 14:25 -0400, Bruce Ashfield wrote:
> This changes makes two different 3.x headers available to the
> toolchain. The latest 3.0.x and 3.1 tarballs. Compatibility is
> maintained with older 2.6 headers by creating a new variable
> that changes the SRC_URI based on the major version number of
> the kernel.
> 
> Tested with 2.6.37.2, 3.0.8 and 3.1 builds and boots.
> 
> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> ---
>  meta/conf/distro/include/tcmode-default.inc        |    2 +-
>  .../linux-libc-headers/linux-libc-headers.inc      |   15 +++++-
>  .../linux-libc-headers/linux-libc-headers_3.0.8.bb |   53 ++++++++++++++++++++
>  .../linux-libc-headers/linux-libc-headers_3.1.bb   |   53 ++++++++++++++++++++
>  4 files changed, 120 insertions(+), 3 deletions(-)
>  create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
>  create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
> 
> diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
> index 2bf1beb..ed722be 100644
> --- a/meta/conf/distro/include/tcmode-default.inc
> +++ b/meta/conf/distro/include/tcmode-default.inc
> @@ -21,7 +21,7 @@ SDKGCCVERSION ?= "4.6%"
>  BINUVERSION ?= "2.21.1a"
>  EGLIBCVERSION ?= "2.13"
>  UCLIBCVERSION ?= "0.9.32"
> -LINUXLIBCVERSION ?= "2.6.37.2"
> +LINUXLIBCVERSION ?= "3.1"
>  
>  # Temporary preferred version overrides for PPC
>  PREFERRED_VERSION_u-boot-mkimage-native_powerpc ?= "2009.08"
> diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
> index 014024f..4e874fe 100644
> --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
> +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
> @@ -1,9 +1,20 @@
> -DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
> +DESCRIPTION = "Sanitized set of kernel headers for the C library's use."
>  SECTION = "devel"
>  LICENSE = "GPLv2"
>  
>  LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" 
> -SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v2.6/linux-${PV}.tar.bz2"
> +
> +python __anonymous () {
> +    import bb, re, string
> +
> +    major = bb.data.getVar("PV",d,1).split('.')[0]
> +    if major == "3":
> +        bb.data.setVar("HEADER_FETCH_VER", "3.0", d)
> +    else:
> +        bb.data.setVar("HEADER_FETCH_VER", "2.6", d)
> +}
> +

Just for reference, this kind of code whilst nice, does have a
reasonable amount of overhead. For something which is effectively legacy
setting MAJORVERSION = "3.0" in the recipe probably isn't a big deal.

Also, please do d.getVar("PV", True) instead of the above. The "1" is
bad and should be "True" and its neater to access d's getVar method
directly now. I appreciate there is a lot of older code but any new code
should use this approach.

There is also no need to import string (since its unused) and bb above
(since its already always included).

In answer to your other question, its probably safe to drop the older
versions and switch to 3.1 at this point unless there are known
compatibility issues?

My other comment about moving code to the .inc also stands and I didn't
intend to sound as grumpy as it does when I read it back!

Cheers,

Richard




^ permalink raw reply

* Re: [PATCH 2/2] linux-libc-headers: provide 3.0.x and 3.1 headers
From: Richard Purdie @ 2011-10-26 21:03 UTC (permalink / raw)
  To: Bruce Ashfield; +Cc: openembedded-core, saul.wold
In-Reply-To: <a81c9b800aa70db49fcf4c677a832988ce291481.1319662382.git.bruce.ashfield@windriver.com>

On Wed, 2011-10-26 at 16:56 -0400, Bruce Ashfield wrote:
> Provide both a 3.0.x and a 3.1 set of headers to the toolchain.
> Compatibility is maintained with older 2.6 headers by creating a
> new variable that changes the SRC_URI based on the major version
> number of the kernel.
> 
> Built and booted with 2.6.37.2, 3.0.8 and 3.1 linux-libc-headers.
> 
> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> ---
>  meta/conf/distro/include/tcmode-default.inc        |    2 +-
>  .../linux-libc-headers/linux-libc-headers.inc      |   17 ++++++++++++++---
>  .../linux-libc-headers/linux-libc-headers_3.0.8.bb |    9 +++++++++
>  .../linux-libc-headers/linux-libc-headers_3.1.bb   |    9 +++++++++
>  4 files changed, 33 insertions(+), 4 deletions(-)
>  create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
>  create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
> 
> diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
> index 2bf1beb..ed722be 100644
> --- a/meta/conf/distro/include/tcmode-default.inc
> +++ b/meta/conf/distro/include/tcmode-default.inc
> @@ -21,7 +21,7 @@ SDKGCCVERSION ?= "4.6%"
>  BINUVERSION ?= "2.21.1a"
>  EGLIBCVERSION ?= "2.13"
>  UCLIBCVERSION ?= "0.9.32"
> -LINUXLIBCVERSION ?= "2.6.37.2"
> +LINUXLIBCVERSION ?= "3.1"
>  
>  # Temporary preferred version overrides for PPC
>  PREFERRED_VERSION_u-boot-mkimage-native_powerpc ?= "2009.08"
> diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
> index e83a92b..5fcb181 100644
> --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
> +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
> @@ -1,9 +1,20 @@
> -DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
> +DESCRIPTION = "Sanitized set of kernel headers for the C library's use."
>  SECTION = "devel"
>  LICENSE = "GPLv2"
>  
> -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" 
> -SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v2.6/linux-${PV}.tar.bz2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
> +
> +python __anonymous () {
> +    import bb, re, string
> +
> +    major = bb.data.getVar("PV",d,1).split('.')[0]
> +    if major == "3":
> +	bb.data.setVar("HEADER_FETCH_VER", "3.0", d)
> +    else:
> +	bb.data.setVar("HEADER_FETCH_VER", "2.6", d)
> +}
> +
> +SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v${HEADER_FETCH_VER}/linux-${PV}.tar.bz2"
>  
>  S = "${WORKDIR}/linux-${PV}"
>  
> diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
> new file mode 100644
> index 0000000..e3bad82
> --- /dev/null
> +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
> @@ -0,0 +1,9 @@
> +require linux-libc-headers.inc
> +
> +INHIBIT_DEFAULT_DEPS = "1"
> +DEPENDS += "unifdef-native"

I think the above two lines can go into the common .inc file too at this
point :)

Cheers,

Richard




^ permalink raw reply

* Re: --root option in upstream shadow
From: Mark Hatle @ 2011-10-26 21:04 UTC (permalink / raw)
  To: julian.pidancet, openembedded-core, Scott Garman,
	pkg-shadow-devel
In-Reply-To: <20111026205113.GB25451@nekral.nekral.homelinux.net>

On 10/26/11 3:51 PM, Nicolas François wrote:
> Hi,
> 
> On Mon, Oct 24, 2011 at 01:06:11AM +0100, julian.pidancet@gmail.com wrote:
>> On Sat, Oct 22, 2011 at 12:54 PM, Nicolas François
>> <nicolas.francois@centraliens.net> wrote:
>>>
>>> What is the expected behavior when the utility authenticates the caller?
>>>  1] authenticate the caller in the caller's chroot
>>>  2] authenticate the caller in the target's chroot
>>>  3] both
>>>
>>> I currently think that 3] would be the right behavior: the caller needs to
>>> be authenticated to make sure it is allowed to use the tool, then it
>>> should be authenticated on the target to make sure the operation is
>>> allowed.
>>> ...But this is much more complex.
>>>
>>> If this is fine for you, I would prefer to disable this feature when the
>>> utility is setuid and not executed by root.
>>>
>>
>> I'm affraid this patch does not do what you think it does. The --root
>> option does not apply to login, but only to the various administrative
>> tools that comes with it (gpasswd, groupadd, groupdel, groupmod,
>> grpconv, grpunconv, passwd, pwconv, pwunconv, useradd, userdel).
> 
> I understand this correctly.
> 
> Lets take the passwd use case.
> passwd usually authenticates the caller (when UID==0, this authentication
> is usually skipped), then asks for the new password, then update the
> password databases.
> passwd is suid and can be used by non root users to change the caller's
> password. What should be the behavior of passwd is such case?
> With the current patch, an user with UID 1000 will be allowed to change the
> password of the user from the target chroot with the same UID 1000. 

The existing behavior we use in OpenEmbedded-core is emulate root user (we do
this by call intercepting, and avoiding suid/sgid)..  But under the hood, it all
comes down to file permissions.  If we have permission to modify the file we do
-- otherwise it fails.  This is equivalent to the root user.

There are reasonable cases where a non-root user (with permission to modify the
passwd/group file within a chroot) will want to do so..  This sounds like a
security flaw, but it's not because the permissions are added to the chroot
after the filesystem is finished being constructed.

> In the patched tools you indicated, gpasswd is also suid.
> And all the others can be suid when configured with
> --enable-account-tools-setuid
> 
> My proposal is to only support --root for root. For non suid utils,
> regular users will be denied chroot anyway, hence: "disable this feature
> when the utility is setuid and not executed by root."

I agree, with setuid it doesn't make sense to allow --root functionality.  Would
it be reasonable to drop the setuid/gid if the user attempts --root
functionality.  Internally act as if the user is root and then simply allow the
filesystem dictate success or failure?

> In your use case (for packaging), I assume the tools are always called by
> root. Then this restriction should not affect you.

The tool THINKS it's called as root, but it's actually called as a user.  (We
use a utility called pseudo that intercepts calls and emulated root capabilities.)

But some of our embedded requirements are unique to our build environments.  So
if the default action is only root can perform the --root command, we can easily
remove the check -- or change it that it doesn't function if setuid for our
purposes.  (but with pseudo I don't think this will be an issue.)

>> It allows OE to manipulate passwd and group files that are located in
>> a sysroot by chrooting into it, because all these programs have their
>> path to /etc/passwd and friends hardcoded.
> 
> The advantage is not only that the destination user/group files are
> changed, but also that they are changed considering the configuration of
> the target system (e.g. PAM, /etc/login.defs, ...)

Absolutely!

Thanks.  Anything we can do to get this upstream will make it much easier for us
in the long term.

--Mark

> Best Regards,




^ permalink raw reply

* Re: [PATCH 1/1] linux-libc-headers: provide 3.0.x and 3.1 headers
From: Anders Darander @ 2011-10-26 21:14 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <1319662875.12054.7.camel@ted>

* Richard Purdie <richard.purdie@linuxfoundation.org> [111026 23:02]:
> On Wed, 2011-10-26 at 14:25 -0400, Bruce Ashfield wrote:
> > This changes makes two different 3.x headers available to the
> > toolchain. The latest 3.0.x and 3.1 tarballs. Compatibility is
> > maintained with older 2.6 headers by creating a new variable
> > that changes the SRC_URI based on the major version number of
> > the kernel.

> > Tested with 2.6.37.2, 3.0.8 and 3.1 builds and boots.

> In answer to your other question, its probably safe to drop the older
> versions and switch to 3.1 at this point unless there are known
> compatibility issues?

Don't we have 2.6-kernel left? If so, I guess that we ought to leave the
2.6 versions of the recipe. At least if I remember correctly in that a
userspace compiled against a certain version of kernel headers should
run OK on a newer kernel, but isn't guarenteed to run OK on an older
kernel. Correct me if I'm wrong...

Cheers,
Anders

-- 
Anders Darander
ChargeStorm AB / eStorm AB



^ permalink raw reply

* Re: [PATCH 1/1] linux-libc-headers: provide 3.0.x and 3.1 headers
From: Anders Darander @ 2011-10-26 21:18 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <20111026211439.GA3851@ad.chargestorm.se>

* Anders Darander <anders@chargestorm.se> [111026 23:14]:
> * Richard Purdie <richard.purdie@linuxfoundation.org> [111026 23:02]:
> > On Wed, 2011-10-26 at 14:25 -0400, Bruce Ashfield wrote:
> > > This changes makes two different 3.x headers available to the
> > > toolchain. The latest 3.0.x and 3.1 tarballs. Compatibility is
> > > maintained with older 2.6 headers by creating a new variable
> > > that changes the SRC_URI based on the major version number of
> > > the kernel.

> > > Tested with 2.6.37.2, 3.0.8 and 3.1 builds and boots.

> > In answer to your other question, its probably safe to drop the older
> > versions and switch to 3.1 at this point unless there are known
> > compatibility issues?

> Don't we have 2.6-kernel left? If so, I guess that we ought to leave the
> 2.6 versions of the recipe. At least if I remember correctly in that a
> userspace compiled against a certain version of kernel headers should
> run OK on a newer kernel, but isn't guarenteed to run OK on an older
> kernel. Correct me if I'm wrong...

Forget my reply above, I'm obviously not looking closely enough at the
patch. (Which tells me I'm getting tired and should get some
rest/sleep).

Cheers,
Anders

-- 
Anders Darander
ChargeStorm AB / eStorm AB



^ permalink raw reply

* Re: [PATCH 1/1] linux-libc-headers: provide 3.0.x and 3.1 headers
From: Bruce Ashfield @ 2011-10-27  0:53 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer; +Cc: saul.wold
In-Reply-To: <1319662875.12054.7.camel@ted>

On Wed, Oct 26, 2011 at 5:01 PM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Wed, 2011-10-26 at 14:25 -0400, Bruce Ashfield wrote:
>> This changes makes two different 3.x headers available to the
>> toolchain. The latest 3.0.x and 3.1 tarballs. Compatibility is
>> maintained with older 2.6 headers by creating a new variable
>> that changes the SRC_URI based on the major version number of
>> the kernel.
>>
>> Tested with 2.6.37.2, 3.0.8 and 3.1 builds and boots.
>>
>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>> ---
>>  meta/conf/distro/include/tcmode-default.inc        |    2 +-
>>  .../linux-libc-headers/linux-libc-headers.inc      |   15 +++++-
>>  .../linux-libc-headers/linux-libc-headers_3.0.8.bb |   53 ++++++++++++++++++++
>>  .../linux-libc-headers/linux-libc-headers_3.1.bb   |   53 ++++++++++++++++++++
>>  4 files changed, 120 insertions(+), 3 deletions(-)
>>  create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
>>  create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
>>
>> diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
>> index 2bf1beb..ed722be 100644
>> --- a/meta/conf/distro/include/tcmode-default.inc
>> +++ b/meta/conf/distro/include/tcmode-default.inc
>> @@ -21,7 +21,7 @@ SDKGCCVERSION ?= "4.6%"
>>  BINUVERSION ?= "2.21.1a"
>>  EGLIBCVERSION ?= "2.13"
>>  UCLIBCVERSION ?= "0.9.32"
>> -LINUXLIBCVERSION ?= "2.6.37.2"
>> +LINUXLIBCVERSION ?= "3.1"
>>
>>  # Temporary preferred version overrides for PPC
>>  PREFERRED_VERSION_u-boot-mkimage-native_powerpc ?= "2009.08"
>> diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
>> index 014024f..4e874fe 100644
>> --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
>> +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
>> @@ -1,9 +1,20 @@
>> -DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
>> +DESCRIPTION = "Sanitized set of kernel headers for the C library's use."
>>  SECTION = "devel"
>>  LICENSE = "GPLv2"
>>
>>  LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
>> -SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v2.6/linux-${PV}.tar.bz2"
>> +
>> +python __anonymous () {
>> +    import bb, re, string
>> +
>> +    major = bb.data.getVar("PV",d,1).split('.')[0]
>> +    if major == "3":
>> +        bb.data.setVar("HEADER_FETCH_VER", "3.0", d)
>> +    else:
>> +        bb.data.setVar("HEADER_FETCH_VER", "2.6", d)
>> +}
>> +
>
> Just for reference, this kind of code whilst nice, does have a
> reasonable amount of overhead. For something which is effectively legacy
> setting MAJORVERSION = "3.0" in the recipe probably isn't a big deal.
>
> Also, please do d.getVar("PV", True) instead of the above. The "1" is
> bad and should be "True" and its neater to access d's getVar method
> directly now. I appreciate there is a lot of older code but any new code
> should use this approach.

Ack'd. I stole this from an old example, so I propagated a crime. I can
fix it up and send v3.  I was a bit worried about users of the .inc I
couldn't see, so I think I'll keep the python code around (unless I hear
a strong objection) for now, and we can slate it to be killed off entirely
in the future.

>
> There is also no need to import string (since its unused) and bb above
> (since its already always included).
>
> In answer to your other question, its probably safe to drop the older
> versions and switch to 3.1 at this point unless there are known
> compatibility issues?

I don't know of any, everything worked here. So I'll spin a 3 part
series, update, addition and removal and I'll leave it up to you about which
parts you want.

>
> My other comment about moving code to the .inc also stands and I didn't
> intend to sound as grumpy as it does when I read it back!

No worries. I didn't read it that way either!

Bruce

>
> Cheers,
>
> Richard
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"



^ permalink raw reply

* [PATCH 0/1] qmmp: update to 0.5.2
From: Xiaofeng Yan @ 2011-10-27  2:32 UTC (permalink / raw)
  To: openembedded-core

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Hi Saul,

I Removed the old recipe qmmp_0.5.1 and added qmmp_0.5.2 according to your suggestion.

Thanks
Yan

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: xiaofeng/qmmp_update
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/qmmp_update

Thanks,
    Xiaofeng Yan <xiaofeng.yan@windriver.com>
---


Xiaofeng Yan (1):
  qmmp: update to 0.5.2

 .../conf/distro/include/distro_tracking_fields.inc |    9 +++-
 meta/recipes-qt/qt-apps/qmmp_0.5.1.bb              |   47 ----------------
 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb              |   57 ++++++++++++++++++++
 3 files changed, 64 insertions(+), 49 deletions(-)
 delete mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
 create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb




^ permalink raw reply

* [PATCH 1/1] qmmp: update to 0.5.2
From: Xiaofeng Yan @ 2011-10-27  2:32 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <cover.1319682417.git.xiaofeng.yan@windriver.com>

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Remove recipe qmmp_0.5.1 and add qmmp_0.5.2

Use do_split_package for each grouping and name them correctly besides updating package.
The format to name plugins of qmmp:
qmmp-plugin-<group>-<library>   with the Description: Qmmp<Group>  plugin for %s"

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 .../conf/distro/include/distro_tracking_fields.inc |    9 +++-
 meta/recipes-qt/qt-apps/qmmp_0.5.1.bb              |   47 ----------------
 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb              |   57 ++++++++++++++++++++
 3 files changed, 64 insertions(+), 49 deletions(-)
 delete mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
 create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 1f3540e..6e8eaea 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5726,11 +5726,16 @@ RECIPE_LAST_UPDATE_pn-libgdata = "Dec 29, 2010"
 RECIPE_MAINTAINER_pn-libgdata = "Zhai Edwin <edwin.zhai@intel.com>"
 
 RECIPE_LATEST_VERSION_pn-man-pages = "3.32"
-RECIPE_LATEST_VERSION_pn-qmmp = "0.4.3"
-RECIPE_MAINTAINER_pn-qmmp = "Xiaofeng Yan <xiaofeng.yan@windriver.com>"
 RECIPE_LATEST_VERSION_pn-sysprof = "6b5b8432711ef5c747f8375073cd9af88922d3c6"
 RECIPE_LATEST_VERSION_pn-table = "d42a44938699ee30a998fc42bc149aebf69389db"
 
+RECIPE_STATUS_pn-qmmp = "green"
+RECIPE_LATEST_VERSION_pn-qmmp = "0.5.2"
+RECIPE_LATEST_RELEASE_DATE_pn-qmmp = "Sep 02, 2011"
+RECIPE_LAST_UPDATE_pn-qmmp = "Oct 27, 2011"
+RECIPE_MAINTAINER_pn-qmmp = "Xiaofeng Yan <xiaofeng.yan@windriver.com>"
+
+
 RECIPE_LATEST_VERSION_pn-texinfo = "4.13a"
 RECIPE_LATEST_RELEASE_DATE_pn-texinfo = "Sep 22, 2008"
 RECIPE_LAST_UPDATE_pn-texinfo = "Sep 16, 2011"
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
deleted file mode 100644
index 948c32a..0000000
--- a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written with help of Qt library"
-HOMEPAGE = "http://qmmp.ylsoftware.com"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-SECTION = "multimedia"
-
-PR = "r0"
-
-DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
-RDEPENDS_${PN} += "taglib alsa-lib curl"
-
-SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "7934c069256bf2fc4ab762ad2683db2f"
-SRC_URI[sha256sum] = "16ab0334f368a5ef14d631a1d43d7cae876ee06b7185643377b5e9cfd6143099"
-
-
-PARALLEL_MAKE = ""
-
-inherit qmake2 cmake
-
-export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
-                        -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \
-                        -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
-                        -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \
-                        -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \
-                        -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \
-                        -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \
-                        -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
-                        "
-
-FILES_${PN} = "${bindir}/qmmp ${libdir}/*.so* \ 
-               ${libdir}/qmmp/PlaylistFormats/*.so \
-               ${libdir}/qmmp/Output/libalsa.so \
-               ${libdir}/qmmp/Transports/libhttp.so \
-               ${libdir}/qmmp/Visual/libanalyzer.so \
-               ${datadir}/icons/* \
-               ${datadir}/qmmp/images/* \
-               ${datadir}/applications/qmmp.desktop \
-               "
-
-PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis"
-
-FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so"
-RDEPENDS_${PN}-plugin-input-mad = "libmad"
-FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so"
-RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg"
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
new file mode 100644
index 0000000..98ee907
--- /dev/null
+++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
@@ -0,0 +1,57 @@
+dESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written with help of Qt library"
+HOMEPAGE = "http://qmmp.ylsoftware.com"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+SECTION = "multimedia"
+
+PR = "r4"
+
+PROVIDES = "qmmp"
+DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
+RDEPENDS_${PN} += "taglib alsa-lib libmad curl"
+
+SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "20852f3cce3471bfc5affa9b2e947dc6"
+SRC_URI[sha256sum] = "6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec"
+
+
+PARALLEL_MAKE = ""
+
+inherit qmake2 cmake package
+
+export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
+                        -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \
+                        -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
+                        -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \
+                        -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \
+                        -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \
+                        -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \
+                        -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
+                        "
+PACKAGES_DYNAMIC = "qmmp-plugin-* "
+
+
+python populate_packages_prepend () {
+	import os
+	qmmp_libdir = bb.data.expand('${libdir}/qmmp', d)
+	gd = bb.data.expand('${D}/${libdir}/qmmp', d)
+	plug_dirs = os.listdir(gd)
+
+	for plug_dir in plug_dirs:
+		g_plug_dir = os.path.join(qmmp_libdir,plug_dir)
+		do_split_packages(d, g_plug_dir, '^lib(.*)\.so$', 'qmmp-plugin-' + plug_dir + '-%s', 'Qmmp' + plug_dir  + 'plugin for %s')
+} 
+
+FILES_${PN} = "\
+		${bindir}/qmmp \
+                ${libdir}/lib*${SOLIBS} \ 
+		${datadir}/icons/* \
+                ${datadir}/qmmp/images/* \
+                ${datadir}/applications/* \
+		"
+
+FILES_${PN}-dbg += "\
+                ${libdir}/qmmp/*/.debug/* \
+               "
+
-- 
1.7.0.4




^ permalink raw reply related

* [PATCH] Add readline as dependecy for gdb-cross-canadian
From: Matthew McClintock @ 2011-10-27  3:03 UTC (permalink / raw)
  To: openembedded-core

Got errors that we were unable to find -lreadline, this fixed the
issue

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 meta/recipes-devtools/gdb/gdb-cross-canadian.inc   |    2 +-
 .../gdb/gdb-cross-canadian_7.3a.bb                 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
index 90a20e2..ec0748e 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
@@ -4,4 +4,4 @@ DESCRIPTION = "cross-canadian gdb for ${TARGET_ARCH} target - GNU debugger"
 PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 BPN = "gdb"
 
-DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk"
+DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk readline-nativesdk"
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.3a.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.3a.bb
index 7e8ad04..555bef1 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.3a.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.3a.bb
@@ -1,7 +1,7 @@
 require gdb-common.inc
 require gdb-cross-canadian.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
 EXPAT = "--with-expat"
-- 
1.7.6.1





^ permalink raw reply related

* [RFC] Fix libgcc nativesdk to install libgcc.a in good location for tools
From: Matthew McClintock @ 2011-10-27  3:07 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <1312980634.6733.62.camel@phil-desktop>

This fixes an issue where we cannot find -lgcc when linking. We
update the path to libgcc.a so the library can be installed
correctly

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
I really doubt this is the correct fix and I'm no expert but it's
here for comments. This fixes a real u-boot cross compile build
issue

The previous mv command was failing as the files did not exist
and I also rejiggered the packages since I was not sure if
gdb-cross-canadian-powerpc-dev was included in my tarball of
the toolchain

 meta/recipes-devtools/gcc/libgcc_4.6.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/gcc/libgcc_4.6.bb b/meta/recipes-devtools/gcc/libgcc_4.6.bb
index 63a46ec..7f3ac55 100644
--- a/meta/recipes-devtools/gcc/libgcc_4.6.bb
+++ b/meta/recipes-devtools/gcc/libgcc_4.6.bb
@@ -8,9 +8,8 @@ PACKAGES = "\
   ${PN}-dev \
   "
 
-FILES_${PN} = "${base_libdir}/libgcc*.so.*"
+FILES_${PN} = "${base_libdir}/libgcc*"
 FILES_${PN}-dev = " \
-  ${base_libdir}/libgcc*.so \
   ${libdir}/${TARGET_SYS}/${BINV}/crt* \
   ${libdir}/${TARGET_SYS}/${BINV}/libgcc*"
 
@@ -29,9 +28,10 @@ do_install () {
 	if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then
 		mv ${D}${libdir}/nof/libgcc* ${D}${base_libdir}
 	else
-		mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
+		cp ${D}${libdir}/${TARGET_SYS}/${BINV}/libgcc* ${D}${base_libdir}
 	fi
 
+
 	chown -R root:root ${D}
 	chmod +x ${D}${base_libdir}/libgcc_s.so.*
 }
-- 
1.7.6.1





^ permalink raw reply related

* Re: [RFC] Fix libgcc nativesdk to install libgcc.a in good location for tools
From: James Limbouris @ 2011-10-27  3:40 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <1319684838-24527-1-git-send-email-msm@freescale.com>

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Matthew McClintock
> Sent: Thursday, 27 October 2011 11:07 AM
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [RFC] Fix libgcc nativesdk to install libgcc.a in good location
> for tools
> 
> This fixes an issue where we cannot find -lgcc when linking. We
> update the path to libgcc.a so the library can be installed
> correctly
> 
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
> I really doubt this is the correct fix and I'm no expert but it's
> here for comments. This fixes a real u-boot cross compile build
> issue
> 
> The previous mv command was failing as the files did not exist
> and I also rejiggered the packages since I was not sure if
> gdb-cross-canadian-powerpc-dev was included in my tarball of
> the toolchain
> 
>  meta/recipes-devtools/gcc/libgcc_4.6.bb |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-devtools/gcc/libgcc_4.6.bb b/meta/recipes-
> devtools/gcc/libgcc_4.6.bb
> index 63a46ec..7f3ac55 100644
> --- a/meta/recipes-devtools/gcc/libgcc_4.6.bb
> +++ b/meta/recipes-devtools/gcc/libgcc_4.6.bb
> @@ -8,9 +8,8 @@ PACKAGES = "\
>    ${PN}-dev \
>    "
> 
> -FILES_${PN} = "${base_libdir}/libgcc*.so.*"
> +FILES_${PN} = "${base_libdir}/libgcc*"
>  FILES_${PN}-dev = " \
> -  ${base_libdir}/libgcc*.so \
>    ${libdir}/${TARGET_SYS}/${BINV}/crt* \
>    ${libdir}/${TARGET_SYS}/${BINV}/libgcc*"
> 
> @@ -29,9 +28,10 @@ do_install () {
>  	if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then
>  		mv ${D}${libdir}/nof/libgcc* ${D}${base_libdir}
>  	else
> -		mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
> +		cp ${D}${libdir}/${TARGET_SYS}/${BINV}/libgcc*
> ${D}${base_libdir}
>  	fi
> 
> +
>  	chown -R root:root ${D}
>  	chmod +x ${D}${base_libdir}/libgcc_s.so.*
>  }
> --
> 1.7.6.1
> 

Is this perhaps related to the following issue: http://lists.linuxtogo.org/pipermail/openembedded-core/2011-October/011556.html ?
Some builds had trouble finding libgcc due to a sysroot misconfiguration, which has since been fixed in master.

James




^ permalink raw reply

* Re: [PATCH 3/3] gcc-configure-sdk: Point sysroot to correct location
From: James Limbouris @ 2011-10-27  3:52 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <1319662464.12054.1.camel@ted>

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Richard Purdie
> Sent: Thursday, 27 October 2011 4:54 AM
> To: Patches and discussions about the oe-core layer
> Subject: Re: [OE-core] [PATCH 3/3] gcc-configure-sdk: Point sysroot to correct
> location
> 
> On Fri, 2011-10-21 at 05:23 +0000, James Limbouris wrote:
> > > -----Original Message-----
> > > From: openembedded-core-bounces@lists.openembedded.org
> > > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf
> Of
> > > Khem Raj
> > > Sent: Friday, 21 October 2011 1:16 PM
> > > To: Patches and discussions about the oe-core layer
> > > Subject: Re: [OE-core] [PATCH 3/3] gcc-configure-sdk: Point sysroot to
> correct
> > > location
> > >
> > > On Thu, Oct 20, 2011 at 10:12 PM, James Limbouris
> > > <james@digitalmatter.com.au> wrote:
> > > >> -----Original Message-----
> > > >> From: openembedded-core-bounces@lists.openembedded.org
> > > >> [mailto:openembedded-core-bounces@lists.openembedded.org] On
> Behalf
> > > Of
> > > >> Khem Raj
> > > >> Sent: Friday, 21 October 2011 1:03 PM
> > > >> To: openembedded-core@lists.openembedded.org
> > > >> Subject: [OE-core] [PATCH 3/3] gcc-configure-sdk: Point sysroot to
> correct
> > > >> location
> > > >>
> > > >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > > >> ---
> > > >>  meta/recipes-devtools/gcc/gcc-configure-sdk.inc |    2 +-
> > > >>  1 files changed, 1 insertions(+), 1 deletions(-)
> > > >>
> > > >> diff --git a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
> b/meta/recipes-
> > > >> devtools/gcc/gcc-configure-sdk.inc
> > > >> index de80870..98fd4c1 100644
> > > >> --- a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
> > > >> +++ b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
> > > >> @@ -7,7 +7,7 @@ USE_NLS = '${@base_conditional( "TARGET_OS",
> "linux-
> > > >> uclibceabi", "no", "", d )}'
> > > >>  EXTRA_OECONF_PATHS = "--with-local-
> > > >> prefix=${SDKPATH}/sysroots/${TARGET_SYS}${target_exec_prefix} \
> > > >>                        --with-gxx-include-dir=${target_includedir}/c++ \
> > > >>                        --with-build-time-
> > > >> tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \
> > > >> -                      --with-sysroot=${SDKPATH}/sysroots/${TARGET_SYS} \
> > > >> +                      --with-
> > > >> sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-
> > > >> ${TARGET_OS} \
> > > >>                        --with-build-sysroot=${STAGING_DIR_TARGET}"
> > > >>
> > > >>  #
> > > >> --
> > > >> 1.7.5.4
> > > >>
> > > >
> > > > Shouldn't --with-local-prefix be changed too? I am testing with both
> > > ${TARGET_SYS}'s replaced. Will post results shortly.
> > >
> > > yes I think both places it should change
> > >
> >
> > Ok, I've tested with both changed, and the corresponding binutils patch, and
> both Qt and kernel compiles are working.
> 
> I took these patches but I would like to stress that we shouldn't need
> to rely on the hardcoded path in the compiler, it should be picking up
> any alternative sysroot paths from the environment. If this isn't
> happening, we should be figuring out why not. This change therefore
> hides issues and does not fix the problem entirely :(.
> 
> Cheers,
> 
> Richard

I'm not sure there was a problem apart from the hardcoded paths being wrong - in the use cases this fixed, the environment setup script was not being sourced.

James




^ permalink raw reply

* Re: [PATCH 3/3] gcc-configure-sdk: Point sysroot to correct location
From: Tom Rini @ 2011-10-27  4:11 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <840A81C1B782724A8EB52725BD519EFF1AA886@MBX20.4emm.local>

On Wed, Oct 26, 2011 at 8:52 PM, James Limbouris
<james@digitalmatter.com.au> wrote:
>> -----Original Message-----
>> From: openembedded-core-bounces@lists.openembedded.org
>> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
>> Richard Purdie
>> Sent: Thursday, 27 October 2011 4:54 AM
>> To: Patches and discussions about the oe-core layer
>> Subject: Re: [OE-core] [PATCH 3/3] gcc-configure-sdk: Point sysroot to correct
>> location
>>
>> On Fri, 2011-10-21 at 05:23 +0000, James Limbouris wrote:
>> > > -----Original Message-----
>> > > From: openembedded-core-bounces@lists.openembedded.org
>> > > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf
>> Of
>> > > Khem Raj
>> > > Sent: Friday, 21 October 2011 1:16 PM
>> > > To: Patches and discussions about the oe-core layer
>> > > Subject: Re: [OE-core] [PATCH 3/3] gcc-configure-sdk: Point sysroot to
>> correct
>> > > location
>> > >
>> > > On Thu, Oct 20, 2011 at 10:12 PM, James Limbouris
>> > > <james@digitalmatter.com.au> wrote:
>> > > >> -----Original Message-----
>> > > >> From: openembedded-core-bounces@lists.openembedded.org
>> > > >> [mailto:openembedded-core-bounces@lists.openembedded.org] On
>> Behalf
>> > > Of
>> > > >> Khem Raj
>> > > >> Sent: Friday, 21 October 2011 1:03 PM
>> > > >> To: openembedded-core@lists.openembedded.org
>> > > >> Subject: [OE-core] [PATCH 3/3] gcc-configure-sdk: Point sysroot to
>> correct
>> > > >> location
>> > > >>
>> > > >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> > > >> ---
>> > > >>  meta/recipes-devtools/gcc/gcc-configure-sdk.inc |    2 +-
>> > > >>  1 files changed, 1 insertions(+), 1 deletions(-)
>> > > >>
>> > > >> diff --git a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
>> b/meta/recipes-
>> > > >> devtools/gcc/gcc-configure-sdk.inc
>> > > >> index de80870..98fd4c1 100644
>> > > >> --- a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
>> > > >> +++ b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc
>> > > >> @@ -7,7 +7,7 @@ USE_NLS = '${@base_conditional( "TARGET_OS",
>> "linux-
>> > > >> uclibceabi", "no", "", d )}'
>> > > >>  EXTRA_OECONF_PATHS = "--with-local-
>> > > >> prefix=${SDKPATH}/sysroots/${TARGET_SYS}${target_exec_prefix} \
>> > > >>                        --with-gxx-include-dir=${target_includedir}/c++ \
>> > > >>                        --with-build-time-
>> > > >> tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \
>> > > >> -                      --with-sysroot=${SDKPATH}/sysroots/${TARGET_SYS} \
>> > > >> +                      --with-
>> > > >> sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-
>> > > >> ${TARGET_OS} \
>> > > >>                        --with-build-sysroot=${STAGING_DIR_TARGET}"
>> > > >>
>> > > >>  #
>> > > >> --
>> > > >> 1.7.5.4
>> > > >>
>> > > >
>> > > > Shouldn't --with-local-prefix be changed too? I am testing with both
>> > > ${TARGET_SYS}'s replaced. Will post results shortly.
>> > >
>> > > yes I think both places it should change
>> > >
>> >
>> > Ok, I've tested with both changed, and the corresponding binutils patch, and
>> both Qt and kernel compiles are working.
>>
>> I took these patches but I would like to stress that we shouldn't need
>> to rely on the hardcoded path in the compiler, it should be picking up
>> any alternative sysroot paths from the environment. If this isn't
>> happening, we should be figuring out why not. This change therefore
>> hides issues and does not fix the problem entirely :(.
>>
>> Cheers,
>>
>> Richard
>
> I'm not sure there was a problem apart from the hardcoded paths being wrong - in the use cases this fixed, the environment setup script was not being sourced.

... except for u-boot / kernel which ignore such advice from the
environment, often with reason.

-- 
Tom



^ permalink raw reply

* Re: [RFC] Fix libgcc nativesdk to install libgcc.a in good location for tools
From: McClintock Matthew-B29882 @ 2011-10-27  4:20 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <840A81C1B782724A8EB52725BD519EFF1AA850@MBX20.4emm.local>

On Wed, Oct 26, 2011 at 10:40 PM, James Limbouris
<james@digitalmatter.com.au> wrote:
>> -----Original Message-----
>> From: openembedded-core-bounces@lists.openembedded.org
>> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
>> Matthew McClintock
>> Sent: Thursday, 27 October 2011 11:07 AM
>> To: openembedded-core@lists.openembedded.org
>> Subject: [OE-core] [RFC] Fix libgcc nativesdk to install libgcc.a in good location
>> for tools
>>
>> This fixes an issue where we cannot find -lgcc when linking. We
>> update the path to libgcc.a so the library can be installed
>> correctly
>>
>> Signed-off-by: Matthew McClintock <msm@freescale.com>
>> ---
>> I really doubt this is the correct fix and I'm no expert but it's
>> here for comments. This fixes a real u-boot cross compile build
>> issue
>>
>> The previous mv command was failing as the files did not exist
>> and I also rejiggered the packages since I was not sure if
>> gdb-cross-canadian-powerpc-dev was included in my tarball of
>> the toolchain
>>
>>  meta/recipes-devtools/gcc/libgcc_4.6.bb |    6 +++---
>>  1 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/gcc/libgcc_4.6.bb b/meta/recipes-
>> devtools/gcc/libgcc_4.6.bb
>> index 63a46ec..7f3ac55 100644
>> --- a/meta/recipes-devtools/gcc/libgcc_4.6.bb
>> +++ b/meta/recipes-devtools/gcc/libgcc_4.6.bb
>> @@ -8,9 +8,8 @@ PACKAGES = "\
>>    ${PN}-dev \
>>    "
>>
>> -FILES_${PN} = "${base_libdir}/libgcc*.so.*"
>> +FILES_${PN} = "${base_libdir}/libgcc*"
>>  FILES_${PN}-dev = " \
>> -  ${base_libdir}/libgcc*.so \
>>    ${libdir}/${TARGET_SYS}/${BINV}/crt* \
>>    ${libdir}/${TARGET_SYS}/${BINV}/libgcc*"
>>
>> @@ -29,9 +28,10 @@ do_install () {
>>       if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then
>>               mv ${D}${libdir}/nof/libgcc* ${D}${base_libdir}
>>       else
>> -             mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
>> +             cp ${D}${libdir}/${TARGET_SYS}/${BINV}/libgcc*
>> ${D}${base_libdir}
>>       fi
>>
>> +
>>       chown -R root:root ${D}
>>       chmod +x ${D}${base_libdir}/libgcc_s.so.*
>>  }
>> --
>> 1.7.6.1
>>
>
> Is this perhaps related to the following issue: http://lists.linuxtogo.org/pipermail/openembedded-core/2011-October/011556.html ?
> Some builds had trouble finding libgcc due to a sysroot misconfiguration, which has since been fixed in master.

I  applied this patch first. It did not fix my toolchain.

The recipe above still is looking for this file
'${D}${libdir}/libgcc*' before my patch - when that folder does not
even exist and it's actually
'${D}${libdir}/${TARGET_SYS}/${BINV}/libgcc*'. It's worth noting that
FILES_${PN} is referencing the path where a file actually exists,
which makes me wonder why they are different, esp. since these two
lines were added in the same patch.

-M

-M



^ permalink raw reply

* [PATCH 1/2] Add new strace-graph package to avoid making perl a dependecy for all of strace
From: Matthew McClintock @ 2011-10-27  5:14 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 meta/recipes-devtools/strace/strace_4.5.20.bb |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/strace/strace_4.5.20.bb b/meta/recipes-devtools/strace/strace_4.5.20.bb
index b3d2aa5..0e22657 100644
--- a/meta/recipes-devtools/strace/strace_4.5.20.bb
+++ b/meta/recipes-devtools/strace/strace_4.5.20.bb
@@ -3,9 +3,13 @@ HOMEPAGE = "http://strace.sourceforge.net"
 SECTION = "console/utils"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4535377ede62550fdeaf39f595fd550a"
-PR = "r2"
+PR = "r3"
+
+PACKAGES = "${PN} ${PN}-graph"
+FILES_${PN} = "${bindir}/strace"
+FILES_${PN}-graph = "${bindir}/strace-graph"
+RDEPENDS_${PN}-graph = "perl"
 
-RDEPENDS = "perl"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
            file://sigmask.patch \
-- 
1.7.6.1





^ permalink raw reply related

* [PATCH 2/2] Add new util-linux-chkdupexe package to avoid making perl a dependecy for all of util-linux
From: Matthew McClintock @ 2011-10-27  5:14 UTC (permalink / raw)
  To: openembedded-core
In-Reply-To: <1319692454-20226-1-git-send-email-msm@freescale.com>

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 meta/recipes-core/util-linux/util-linux.inc       |    7 +++++--
 meta/recipes-core/util-linux/util-linux_2.19.1.bb |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 67d81b9..eeba67c 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -29,7 +29,8 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
              util-linux-swaponoff util-linux-losetup util-linux-umount \
              util-linux-mount util-linux-readprofile util-linux-libblkid \
              util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
-             util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid"
+             util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
+	     util-linux-chkdupexe"
 
 EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \
  --enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
@@ -55,6 +56,7 @@ FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.a ${libdi
 FILES_util-linux-lscpu = "${bindir}/lscpu"
 
 FILES_util-linux-fsck = "${base_sbindir}/fsck*"
+FILES_util-linux-chkdupexe = "${bindir}/chkdupexe"
 
 # Util-linux' blkid replaces the e2fsprogs one
 FILES_util-linux-blkid = "${base_sbindir}/blkid*"
@@ -62,7 +64,8 @@ RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
 RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
 
 RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
-RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup perl"
+RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
+RDEPENDS_${PN}-chkdupexe = "perl"
 
 RRECOMMENDS_${PN}_virtclass-native = ""
 RDEPENDS_${PN}_virtclass-native = ""
diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
index 04f4457..fb5637e 100644
--- a/meta/recipes-core/util-linux/util-linux_2.19.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.19"
-PR = "r8"
+PR = "r9"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+
-- 
1.7.6.1





^ permalink raw reply related

* Re: [PATCH 1/2] Add new strace-graph package to avoid making perl a dependecy for all of strace
From: Richard Purdie @ 2011-10-27  7:26 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <1319692454-20226-1-git-send-email-msm@freescale.com>

On Thu, 2011-10-27 at 00:14 -0500, Matthew McClintock wrote:
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
>  meta/recipes-devtools/strace/strace_4.5.20.bb |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-devtools/strace/strace_4.5.20.bb b/meta/recipes-devtools/strace/strace_4.5.20.bb
> index b3d2aa5..0e22657 100644
> --- a/meta/recipes-devtools/strace/strace_4.5.20.bb
> +++ b/meta/recipes-devtools/strace/strace_4.5.20.bb
> @@ -3,9 +3,13 @@ HOMEPAGE = "http://strace.sourceforge.net"
>  SECTION = "console/utils"
>  LICENSE = "BSD"
>  LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4535377ede62550fdeaf39f595fd550a"
> -PR = "r2"
> +PR = "r3"
> +
> +PACKAGES = "${PN} ${PN}-graph"
> +FILES_${PN} = "${bindir}/strace"
> +FILES_${PN}-graph = "${bindir}/strace-graph"
> +RDEPENDS_${PN}-graph = "perl"
>  
This wipes out the ${PN}-dbg, ${PN}-dev and other packages. You need to
add ${PN}-graph to PACKAGES rather than overwriting it.

Cheers,

Richard




^ permalink raw reply

* Re: [PATCH 0/5] Recipe upgrades
From: Richard Purdie @ 2011-10-27  7:31 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1319576293.git.scott.a.garman@intel.com>

On Tue, 2011-10-25 at 14:32 -0700, Scott Garman wrote:
> Hello,
> 
> Here is a set of some straightfoward recipe upgrades: sudo, grep,
> mtools, and openssh.
> 
> Build testing: These have been successfully built for all 5 qemu
> architectures.
> 
> Runtime testing: I have performed basic runtime testing for all of
> these recipe upgrades as well within a qemux86 session.
> 
> The following changes since commit f586aaa8d00361a9597a546d665077c75cf4d520:
> 
>   libxml-parser-perl, libxml-simple-perl, expat, sgmlspl-native, git: bump PR to rebuild after perl upgrade (2011-10-25 08:36:01 +0100)
> 
> are available in the git repository at:
>   git://git.pokylinux.org/poky-contrib sgarman/recipe-upgrades-final
>   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/recipe-upgrades-final
> 
> Scott Garman (5):
>   sudo: upgrade to 1.8.3
>   grep: upgrade to 2.9
>   mtools: upgrade to 4.0.17
>   openssh: upgrade to 5.9p1

I've merged the above, the distro tracking had feedback from Saul.

Cheers,

Richard




^ permalink raw reply

* Re: [PATCH 2/2] Add new util-linux-chkdupexe package to avoid making perl a dependecy for all of util-linux
From: Richard Purdie @ 2011-10-27  7:32 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer
In-Reply-To: <1319692454-20226-2-git-send-email-msm@freescale.com>

On Thu, 2011-10-27 at 00:14 -0500, Matthew McClintock wrote:
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
>  meta/recipes-core/util-linux/util-linux.inc       |    7 +++++--
>  meta/recipes-core/util-linux/util-linux_2.19.1.bb |    2 +-
>  2 files changed, 6 insertions(+), 3 deletions(-)

Merged to master, thanks.

Cheers,

Richard




^ 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