[OE-core] [PATCH 6/6] openssh: add init.d/sshd status command for LSB compliance
From: Jackie Huang jackie.hu...@windriver.com Signed-off-by: Li Wang li.w...@windriver.com Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- .../openssh/openssh-6.2p2/init | 10 +- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/init b/meta/recipes-connectivity/openssh/openssh-6.2p2/init index 12fb79b..266689c 100644 --- a/meta/recipes-connectivity/openssh/openssh-6.2p2/init +++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/init @@ -1,6 +1,9 @@ #! /bin/sh set -e +# source function library +. /etc/init.d/functions + # /etc/init.d/ssh: start and stop the OpenBSD secure shell daemon test -x /usr/sbin/sshd || exit 0 @@ -92,8 +95,13 @@ case $1 in echo . ;; + status) + status /usr/sbin/sshd + return $? + ;; + *) - echo Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart} + echo Usage: /etc/init.d/ssh {start|stop|status|reload|force-reload|restart} exit 1 esac -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] nfs-utils: add init.d/nfsserver status command for LSB compliance
From: Jackie Huang jackie.hu...@windriver.com Signed-off-by: Li Wang li.w...@windriver.com Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- .../nfs-utils/nfs-utils/nfsserver | 11 +++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver index e460e26..1ac6fec 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver @@ -14,6 +14,8 @@ # # Startup script for nfs-utils # +# Source function library. +. /etc/init.d/functions # # The environment variable NFS_SERVERS may be set in /etc/default/nfsd # Other control variables may be overridden here too @@ -141,6 +143,13 @@ stop) exportfs -ua stop_statd stop_mountd stop_nfsd;; +status) + status /usr/sbin/rpc.mountd + RETVAL=$? + status nfsd + rval=$? + [ $RETVAL -eq 0 ] exit $rval + exit $RETVAL;; reload)test -r /etc/exports exportfs -r;; restart)exportfs -ua stop_mountd @@ -150,4 +159,6 @@ restart)exportfs -ua start_mountd start_statd test -r /etc/exports exportfs -a;; +*) echo Usage: $0 {start|stop|status|reload|restart} + exit 1;; esac -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] dbus: add init.d/dbus-1 status command for LSB compliance
From: Jackie Huang jackie.hu...@windriver.com Signed-off-by: Li Wang li.w...@windriver.com Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init |9 - 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init b/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init index 0351190..04025e6 100644 --- a/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init +++ b/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init @@ -16,6 +16,9 @@ set -e +# Source function library. +. /etc/init.d/functions + DAEMON=@bindir@/dbus-daemon NAME=dbus DAEMONUSER=messagebus # must match /etc/dbus-1/system.conf @@ -99,6 +102,10 @@ case $1 in stop) shut_it_down ;; + status) +status $DAEMON +exit $? + ;; reload|force-reload) reload_it ;; @@ -108,7 +115,7 @@ case $1 in start_it_up ;; *) -echo Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload} 2 +echo Usage: /etc/init.d/$NAME {start|stop|status|restart|reload|force-reload} 2 exit 1 ;; esac -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] sysvinit: add init.d/bootlogd status command for LSB compliance
From: Jackie Huang jackie.hu...@windriver.com Signed-off-by: Li Wang li.w...@windriver.com Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- meta/recipes-core/sysvinit/sysvinit/bootlogd.init |9 - 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/meta/recipes-core/sysvinit/sysvinit/bootlogd.init b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init index f8f07a0..7b87827 100755 --- a/meta/recipes-core/sysvinit/sysvinit/bootlogd.init +++ b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init @@ -13,6 +13,9 @@ DAEMON=/sbin/bootlogd NAME=bootlogd DESC=Bootlog daemon +# source function library +. /etc/init.d/functions + test -f $DAEMON || exit 0 [ -r /etc/default/bootlogd ] . /etc/default/bootlogd @@ -73,10 +76,14 @@ case $ACTION in start-stop-daemon --start --quiet --exec $DAEMON echo $NAME. ;; + status) + status $DAEMON + exit $? + ;; *) N=${0##*/} N=${N#[SK]??} - echo Usage: $N {start|stop|restart|force-reload} 2 + echo Usage: $N {start|stop|status|restart|force-reload} 2 exit 1 ;; esac -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6 v3] Add status command for daemon of some packages
From: Jackie Huang jackie.hu...@windriver.com v3 comments: Add usage info for nfsserver, and drop rh_status in at and sshd script. -- The following changes since commit d98f08a7ad95d0b17846276b028a6614f16b6846: genext2fs: fix memory corruption on powerpc (2013-08-20 07:11:44 -0700) are available in the git repository at: git://git.pokylinux.org/poky-contrib jhuang0/r_status_for_daemons_0822_0 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/r_status_for_daemons_0822_0 Jackie Huang (6): sysklogd: add init.d/syslog status command for LSB compliance nfs-utils: add init.d/nfsserver status command for LSB compliance dbus: add init.d/dbus-1 status command for LSB compliance sysvinit: add init.d/bootlogd status command for LSB compliance at: add init.d/atd status command for LSB compliance openssh: add init.d/sshd status command for LSB compliance .../nfs-utils/nfs-utils/nfsserver | 11 +++ .../openssh/openssh-6.2p2/init | 10 +- meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init |9 - meta/recipes-core/sysvinit/sysvinit/bootlogd.init |9 - meta/recipes-extended/at/files/S99at |8 +++- meta/recipes-extended/sysklogd/files/sysklogd | 13 - 6 files changed, 55 insertions(+), 5 deletions(-) -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] at: add init.d/atd status command for LSB compliance
From: Jackie Huang jackie.hu...@windriver.com Signed-off-by: Li Wang li.w...@windriver.com Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- meta/recipes-extended/at/files/S99at |8 +++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/meta/recipes-extended/at/files/S99at b/meta/recipes-extended/at/files/S99at index 386f8a4..eca379b 100644 --- a/meta/recipes-extended/at/files/S99at +++ b/meta/recipes-extended/at/files/S99at @@ -5,6 +5,9 @@ umask 077 +# Source function library. +. /etc/init.d/functions + start() { echo -n Starting atd: start-stop-daemon --start --quiet --pidfile /var/run/atd.pid --background --exec /usr/sbin/atd -- -f @@ -30,8 +33,11 @@ case $1 in restart|reload) restart ;; + status) + status /usr/sbin/atd + ;; *) - echo $Usage: $0 {start|stop|restart} + echo $Usage: $0 {start|stop|restart|status} exit 1 esac -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] bc: fix segmentation fault
On Aug 19, 2013, at 7:20 PM, Kai Kang kai.k...@windriver.com wrote: When run 'bc -l', it segmentation faults. Apply patch from BLFS to fix it. Ref: http://www.mail-archive.com/blfs-support@linuxfromscratch.org/msg04601.html Signed-off-by: Kai Kang kai.k...@windriver.com --- meta/recipes-extended/bc/bc_1.06.bb| 3 ++- .../bc/files/fix-segment-fault.patch | 28 ++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/bc/files/fix-segment-fault.patch diff --git a/meta/recipes-extended/bc/bc_1.06.bb b/meta/recipes-extended/bc/bc_1.06.bb index fe9c3f4..4b28fad 100644 --- a/meta/recipes-extended/bc/bc_1.06.bb +++ b/meta/recipes-extended/bc/bc_1.06.bb @@ -13,7 +13,8 @@ SECTION = base DEPENDS = flex PR = r2 -SRC_URI = ${GNU_MIRROR}/bc/bc-${PV}.tar.gz +SRC_URI = ${GNU_MIRROR}/bc/bc-${PV}.tar.gz \ + file://fix-segment-fault.patch SRC_URI[md5sum] = d44b5dddebd8a7a7309aea6c36fda117 SRC_URI[sha256sum] = 4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33 diff --git a/meta/recipes-extended/bc/files/fix-segment-fault.patch b/meta/recipes-extended/bc/files/fix-segment-fault.patch new file mode 100644 index 000..20c0da2 --- /dev/null +++ b/meta/recipes-extended/bc/files/fix-segment-fault.patch @@ -0,0 +1,28 @@ +Upstream-Status: Pending + +when run command such as 'echo a = 13 | bc -l', it segmentation faults. +This patch is from http://www.mail-archive.com/blfs-support@linuxfromscratch.org/msg04602.html. + +Signed-off-by: Kai Kang kai.k...@windriver.com + +--- bc-1.06/lib/number.c.orig2003-09-26 21:14:02.0 + bc-1.06/lib/number.c 2003-09-26 21:14:26.0 + +@@ -34,6 +34,7 @@ + #include number.h + #include assert.h + #include stdlib.h ++#include string.h what does adding this include file fix ? + #include ctype.h/* Prototypes needed for external utility routines. */ + + #define bc_rt_warn rt_warn +--- bc-1.06/bc/load.c.orig 2003-09-26 21:14:14.0 + bc-1.06/bc/load.c2003-09-26 21:14:26.0 + +@@ -156,7 +156,7 @@ + long label_no; + long vaf_name; /* variable, array or function number. */ + long func; +- program_counter save_adr; ++ static program_counter save_adr; + + /* Initialize. */ + str = code; -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/6] openssh: add init.d/sshd status command for LSB compliance
Hi Jackie One thing comes to mind is that these scripts are hardcoding the binaries and may be it would be nicer to replace the bindir, libdir and so on at install time, that would make them flexible where /usr is not used e.g. but I guess thats a general problem with capture init scripts all around probably. On Aug 19, 2013, at 8:25 PM, jackie.hu...@windriver.com wrote: From: Jackie Huang jackie.hu...@windriver.com Signed-off-by: Li Wang li.w...@windriver.com Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- .../openssh/openssh-6.2p2/init | 15 ++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/init b/meta/recipes-connectivity/openssh/openssh-6.2p2/init index 6beec84..6bbc573 100644 --- a/meta/recipes-connectivity/openssh/openssh-6.2p2/init +++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/init @@ -1,6 +1,9 @@ #! /bin/sh set -e +# source function library +. /etc/init.d/functions + # /etc/init.d/ssh: start and stop the OpenBSD secure shell daemon test -x /usr/sbin/sshd || exit 0 @@ -46,6 +49,11 @@ check_keys() { fi } +rh_status() { + status /usr/sbin/sshd; + return $? +} + export PATH=${PATH:+$PATH:}/usr/sbin:/sbin case $1 in @@ -84,8 +92,13 @@ case $1 in echo . ;; + status) + rh_status; + exit $? + ;; + *) - echo Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart} + echo Usage: /etc/init.d/ssh {start|stop|status|reload|force-reload|restart} exit 1 esac -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] bc: fix segmentation fault
On 2013年08月22日 14:38, Khem Raj wrote: On Aug 19, 2013, at 7:20 PM, Kai Kang kai.k...@windriver.com wrote: When run 'bc -l', it segmentation faults. Apply patch from BLFS to fix it. Ref: http://www.mail-archive.com/blfs-support@linuxfromscratch.org/msg04601.html Signed-off-by: Kai Kang kai.k...@windriver.com --- meta/recipes-extended/bc/bc_1.06.bb| 3 ++- .../bc/files/fix-segment-fault.patch | 28 ++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/bc/files/fix-segment-fault.patch diff --git a/meta/recipes-extended/bc/bc_1.06.bb b/meta/recipes-extended/bc/bc_1.06.bb index fe9c3f4..4b28fad 100644 --- a/meta/recipes-extended/bc/bc_1.06.bb +++ b/meta/recipes-extended/bc/bc_1.06.bb @@ -13,7 +13,8 @@ SECTION = base DEPENDS = flex PR = r2 -SRC_URI = ${GNU_MIRROR}/bc/bc-${PV}.tar.gz +SRC_URI = ${GNU_MIRROR}/bc/bc-${PV}.tar.gz \ + file://fix-segment-fault.patch SRC_URI[md5sum] = d44b5dddebd8a7a7309aea6c36fda117 SRC_URI[sha256sum] = 4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33 diff --git a/meta/recipes-extended/bc/files/fix-segment-fault.patch b/meta/recipes-extended/bc/files/fix-segment-fault.patch new file mode 100644 index 000..20c0da2 --- /dev/null +++ b/meta/recipes-extended/bc/files/fix-segment-fault.patch @@ -0,0 +1,28 @@ +Upstream-Status: Pending + +when run command such as 'echo a = 13 | bc -l', it segmentation faults. +This patch is from http://www.mail-archive.com/blfs-support@linuxfromscratch.org/msg04602.html. + +Signed-off-by: Kai Kang kai.k...@windriver.com + +--- bc-1.06/lib/number.c.orig 2003-09-26 21:14:02.0 + bc-1.06/lib/number.c 2003-09-26 21:14:26.0 + +@@ -34,6 +34,7 @@ + #include number.h + #include assert.h + #include stdlib.h ++#include string.h what does adding this include file fix ? To be honest, I am not sure why add this include. After build it is harmless, so I didn't want to modify it because I think LFS is trustable. Regards, Kai + #include ctype.h/* Prototypes needed for external utility routines. */ + + #define bc_rt_warn rt_warn +--- bc-1.06/bc/load.c.orig 2003-09-26 21:14:14.0 + bc-1.06/bc/load.c 2003-09-26 21:14:26.0 + +@@ -156,7 +156,7 @@ + long label_no; + long vaf_name; /* variable, array or function number. */ + long func; +- program_counter save_adr; ++ static program_counter save_adr; + + /* Initialize. */ + str = code; -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Regards, Neil | Kai Kang ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/25] Final Review and ACK
On Aug 20, 2013, at 8:06 AM, Otavio Salvador ota...@ossystems.com.br wrote: Thanks for merging the patches but one change, the poky.conf change (http://patchwork.openembedded.org/patch/55893/), has not been merged. thats poky specific patch not related to OE-Core as such, poky ml is more appropriate for this patch ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/6] openssh: add init.d/sshd status command for LSB compliance
On 8/22/2013 2:42 PM, Khem Raj wrote: Hi Jackie One thing comes to mind is that these scripts are hardcoding the binaries and may be it would be nicer to replace the bindir, libdir and so on at install time, that would make them flexible where /usr is not used e.g. but I guess thats a general problem with capture init scripts all around probably. Yes it is general problem that almost all init scripts have these hardcoding binaries, maybe we need a requirement and do that for all these scripts with a plan. Thanks, Jackie On Aug 19, 2013, at 8:25 PM, jackie.hu...@windriver.com wrote: From: Jackie Huang jackie.hu...@windriver.com Signed-off-by: Li Wang li.w...@windriver.com Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- .../openssh/openssh-6.2p2/init | 15 ++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/init b/meta/recipes-connectivity/openssh/openssh-6.2p2/init index 6beec84..6bbc573 100644 --- a/meta/recipes-connectivity/openssh/openssh-6.2p2/init +++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/init @@ -1,6 +1,9 @@ #! /bin/sh set -e +# source function library +. /etc/init.d/functions + # /etc/init.d/ssh: start and stop the OpenBSD secure shell daemon test -x /usr/sbin/sshd || exit 0 @@ -46,6 +49,11 @@ check_keys() { fi } +rh_status() { + status /usr/sbin/sshd; + return $? +} + export PATH=${PATH:+$PATH:}/usr/sbin:/sbin case $1 in @@ -84,8 +92,13 @@ case $1 in echo . ;; + status) + rh_status; + exit $? + ;; + *) - echo Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart} + echo Usage: /etc/init.d/ssh {start|stop|status|reload|force-reload|restart} exit 1 esac -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Jackie Huang WIND RIVER | China Development Center MSN:jackiel...@hotmail.com Tel: +86 8477 8594 Mobile: +86 138 1027 4745 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/6] openssh: add init.d/sshd status command for LSB compliance
On 08/22/2013 03:02 PM, jhuang0 wrote: On 8/22/2013 2:42 PM, Khem Raj wrote: Hi Jackie One thing comes to mind is that these scripts are hardcoding the binaries and may be it would be nicer to replace the bindir, libdir and so on at install time, that would make them flexible where /usr is not used e.g. but I guess thats a general problem with capture init scripts all around probably. Yes it is general problem that almost all init scripts have these hardcoding binaries, maybe we need a requirement and do that for all these scripts with a plan. Thanks, Jackie Agree. If we're going to do this, we need to take the postinst scripts into consideration, as the postinst scripts have the same problem. Best Regards, Chen Qi On Aug 19, 2013, at 8:25 PM, jackie.hu...@windriver.com wrote: From: Jackie Huang jackie.hu...@windriver.com Signed-off-by: Li Wang li.w...@windriver.com Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- .../openssh/openssh-6.2p2/init | 15 ++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/init b/meta/recipes-connectivity/openssh/openssh-6.2p2/init index 6beec84..6bbc573 100644 --- a/meta/recipes-connectivity/openssh/openssh-6.2p2/init +++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/init @@ -1,6 +1,9 @@ #! /bin/sh set -e +# source function library +. /etc/init.d/functions + # /etc/init.d/ssh: start and stop the OpenBSD secure shell daemon test -x /usr/sbin/sshd || exit 0 @@ -46,6 +49,11 @@ check_keys() { fi } +rh_status() { +status /usr/sbin/sshd; +return $? +} + export PATH=${PATH:+$PATH:}/usr/sbin:/sbin case $1 in @@ -84,8 +92,13 @@ case $1 in echo . ;; + status) +rh_status; +exit $? + ;; + *) -echo Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart} +echo Usage: /etc/init.d/ssh {start|stop|status|reload|force-reload|restart} exit 1 esac -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] bc: fix segmentation fault
Kai On Aug 21, 2013, at 11:50 PM, Kang Kai kai.k...@windriver.com wrote: what does adding this include file fix ? To be honest, I am not sure why add this include. After build it is harmless, so I didn't want to modify it because I think LFS is trustable. Its matter of understanding the change and may be explaining a bit better what it fixes and make the patch better for upstream too so try to build it without this include added and see if you get some warnings/errors that it fixes and then add that information to patch header. Regards, Kai ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] [v4] systemd: Remove base_libdir if installed only for systemd_unitdir
From: Muhammad Shakeel muhammad_shak...@mentor.com If a recipe installs systemd_unitdir and it is a non-systemd build than systemd.bbclass deletes systemd_unitdir (/lib/systemd/) but not base_libdir (/lib). In this case if base_libdir is empty than following QA Issue is reported. ERROR: QA Issue: openssh: Files/directories were installed but not shipped /lib If base_libdir was installed due to systemd_unitdir installation than for non-systemd build it should also be removed. Signed-off-by: Muhammad Shakeel muhammad_shak...@mentor.com --- meta/classes/systemd.bbclass |3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index 76f0e7d..8ec4992 100644 --- a/meta/classes/systemd.bbclass +++ b/meta/classes/systemd.bbclass @@ -168,6 +168,9 @@ python rm_systemd_unitdir (){ systemd_unitdir = oe.path.join(d.getVar(D, True), d.getVar('systemd_unitdir', True)) if os.path.exists(systemd_unitdir): shutil.rmtree(systemd_unitdir) +base_libdir = oe.path.join(d.getVar(D, True), d.getVar('base_libdir', True)) +if (os.path.exists(base_libdir) and not os.listdir(base_libdir)): +os.rmdir(base_libdir) } do_install[postfuncs] += rm_systemd_unitdir -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] [v4] nfs-utils: Add systemd support
From: Muhammad Shakeel muhammad_shak...@mentor.com - Remove dependency on meta-systemd Signed-off-by: Muhammad Shakeel muhammad_shak...@mentor.com --- .../nfs-utils/nfs-utils/nfs-mountd.service | 11 ++ .../nfs-utils/nfs-utils/nfs-server.service | 18 ++ .../nfs-utils/nfs-utils/nfs-statd.service | 12 +++ .../nfs-utils/nfs-utils/nfs-utils.conf | 35 .../nfs-utils/nfs-utils_1.2.8.bb | 20 +-- 5 files changed, 94 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service new file mode 100644 index 000..2e8dc03 --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service @@ -0,0 +1,11 @@ +[Unit] +Description=NFS Mount Daemon +After=rpcbind.service nfs-server.service +Requires=rpcbind.service nfs-server.service + +[Service] +EnvironmentFile=-/etc/nfs-utils.conf +ExecStart=/usr/sbin/rpc.mountd -F $MOUNTD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service new file mode 100644 index 000..6c1eacb --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service @@ -0,0 +1,18 @@ +[Unit] +Description=NFS Server +Requires=rpcbind.service nfs-mountd.service +After=rpcbind.service + +[Service] +Type=oneshot +EnvironmentFile=-/etc/nfs-utils.conf +ExecStartPre=/usr/sbin/exportfs -r +ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT +ExecStop=/usr/sbin/rpc.nfsd 0 +ExecStopPost=/usr/sbin/exportfs -f +ExecReload=/usr/sbin/exportfs -r +StandardError=syslog +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service new file mode 100644 index 000..ca53527 --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service @@ -0,0 +1,12 @@ +[Unit] +Description=NFS file locking service +After=rpcbind.service +Requires=rpcbind.service +Before=remote-fs-pre.target + +[Service] +EnvironmentFile=-/etc/nfs-utils.conf +ExecStart=/usr/sbin/rpc.statd -F $STATD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf new file mode 100644 index 000..a1007a7 --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf @@ -0,0 +1,35 @@ +# Parameters to be passed to nfs-utils (clients server) service files. +# + +# Options to pass to rpc.nfsd. +NFSD_OPTS= + +# Number of servers to start up; the default is 8 servers. +NFSD_COUNT= + +# Where to mount nfsd filesystem; the default is /proc/fs/nfsd. +PROCNFSD_MOUNTPOINT= + +# Options used to mount nfsd filesystem; the default is rw,nodev,noexec,nosuid. +PROCNFSD_MOUNTOPTS= + +# Options for rpc.mountd. +# If you have a port-based firewall, you might want to set up +# a fixed port here using the --port option. +MOUNTD_OPTS= + +# Parameters to be passed to nfs-common (nfs clients server) init script. +# + +# If you do not set values for the NEED_ options, they will be attempted +# autodetected; this should be sufficient for most people. Valid alternatives +# for the NEED_ options are yes and no. + +# Do you want to start the statd daemon? It is not needed for NFSv4. +NEED_STATD= + +# Options to pass to rpc.statd. +# N.B. statd normally runs on both client and server, and run-time +# options should be specified accordingly. +# STATD_OPTS=-p 32765 -o 32766 +STATD_OPTS= diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb index fd6d33e..f684424 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb @@ -15,7 +15,11 @@ RRECOMMENDS_${PN} = kernel-module-nfsd SRC_URI = ${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.bz2 \ file://nfs-utils-1.0.6-uclibc.patch \ file://nfs-utils-1.2.3-sm-notify-res_init.patch \ - file://nfsserver + file://nfsserver \ + file://nfs-utils.conf \ + file://nfs-server.service \ + file://nfs-mountd.service \ + file://nfs-statd.service SRC_URI[md5sum] = 6e7d97de51e428a0b8698c16ca23db77 SRC_URI[sha256sum] = 1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6 @@ -31,7 +35,10 @@ INITSCRIPT_NAME = nfsserver # in the shutdown levels, but that works fine. INITSCRIPT_PARAMS = defaults -inherit autotools update-rc.d +inherit autotools update-rc.d systemd + +SYSTEMD_SERVICE_${PN} = nfs-server.service nfs-mountd.service nfs-statd.service +SYSTEMD_AUTO_ENABLE = disable # --enable-uuid is
[OE-core] [PATCH 2/5] [v4] lighttpd: Add systemd support
From: Muhammad Shakeel muhammad_shak...@mentor.com - Remove dependency on meta-systemd Signed-off-by: Muhammad Shakeel muhammad_shak...@mentor.com --- .../lighttpd/files/lighttpd.service| 12 meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb | 14 -- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service b/meta/recipes-extended/lighttpd/files/lighttpd.service new file mode 100644 index 000..a5333b6 --- /dev/null +++ b/meta/recipes-extended/lighttpd/files/lighttpd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Lightning Fast Webserver With Light System Requirements +After=network.target + +[Service] +ExecStartPre=/usr/sbin/lighttpd -t -f /etc/lighttpd.conf +ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target + diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb index 6635e31..3876fcc 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb @@ -22,6 +22,7 @@ SRC_URI = http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://index.html.lighttpd \ file://lighttpd.conf \ file://lighttpd \ +file://lighttpd.service \ SRC_URI[md5sum] = 8e2d4ae8e918d4de1aeb9842584d170b @@ -39,19 +40,28 @@ EXTRA_OECONF = \ --disable-static \ -inherit autotools pkgconfig update-rc.d gettext +inherit autotools pkgconfig update-rc.d gettext systemd INITSCRIPT_NAME = lighttpd INITSCRIPT_PARAMS = defaults 70 +SYSTEMD_SERVICE_${PN} = lighttpd.service +SYSTEMD_AUTO_ENABLE = enable + do_install_append() { install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system + sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${systemd_unitdir}/system/lighttpd.service + sed -i 's,/etc/,${sysconfdir}/,g' ${D}${systemd_unitdir}/system/lighttpd.service + sed -i 's,/bin/,${base_bindir}/,g' ${D}${systemd_unitdir}/system/lighttpd.service } -FILES_${PN} += ${sysconfdir} /www +FILES_${PN} += ${sysconfdir} /www ${systemd_unitdir} CONFFILES_${PN} = ${sysconfdir}/lighttpd.conf -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] [v4] openssh: Add systemd support
From: Muhammad Shakeel muhammad_shak...@mentor.com -Remove dependency on meta-systemd Signed-off-by: Muhammad Shakeel muhammad_shak...@mentor.com --- .../openssh/openssh-6.2p2/sshd.socket | 11 +++ .../openssh/openssh-6.2p2/sshd@.service|9 + .../openssh/openssh-6.2p2/sshdgenkeys.service | 10 ++ meta/recipes-connectivity/openssh/openssh_6.2p2.bb | 20 ++-- 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket new file mode 100644 index 000..753a33b --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket @@ -0,0 +1,11 @@ +[Unit] +Conflicts=sshd.service + +[Socket] +ExecStartPre=/bin/mkdir -p /var/run/sshd +ListenStream=22 +Accept=yes + +[Install] +WantedBy=sockets.target +Also=sshdgenkeys.service diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service new file mode 100644 index 000..d118490 --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service @@ -0,0 +1,9 @@ +[Unit] +Description=OpenSSH Per-Connection Daemon +After=sshdgenkeys.service + +[Service] +ExecStart=-/usr/sbin/sshd -i +ExecReload=/bin/kill -HUP $MAINPID +StandardInput=socket +StandardError=syslog diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service new file mode 100644 index 000..c717214 --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service @@ -0,0 +1,10 @@ +[Unit] +Description=SSH Key Generation + +[Service] +ExecStart=/usr/bin/ssh-keygen -A +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb index c76f9ac..8dac2f1 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb @@ -26,14 +26,17 @@ SRC_URI = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar. file://init \ file://openssh-CVE-2011-4327.patch \ file://mac.patch \ - ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} + ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ + file://sshd.socket \ + file://sshd@.service \ + file://sshdgenkeys.service PAM_SRC_URI = file://sshd SRC_URI[md5sum] = be46174dcbb77ebb4ea88ef140685de1 SRC_URI[sha256sum] = 7f29b9d2ad672ae0f9e1dcbff871fc5c2e60a194e90c766432e32161b842313b -inherit useradd update-rc.d update-alternatives +inherit useradd update-rc.d update-alternatives systemd USERADD_PACKAGES = ${PN}-sshd USERADD_PARAM_${PN}-sshd = --system --no-create-home --home-dir /var/run/sshd --shell /bin/false --user-group sshd @@ -41,6 +44,10 @@ INITSCRIPT_PACKAGES = ${PN}-sshd INITSCRIPT_NAME_${PN}-sshd = sshd INITSCRIPT_PARAMS_${PN}-sshd = defaults 9 +SYSTEMD_PACKAGES = ${PN}-sshd +SYSTEMD_SERVICE_${PN}-sshd = sshd.socket sshd@.service sshdgenkeys.service +SYSTEMD_AUTO_ENABLE = enable + PACKAGECONFIG ??= tcp-wrappers PACKAGECONFIG[tcp-wrappers] = --with-tcp-wrappers,,tcp-wrappers @@ -93,6 +100,14 @@ do_install_append () { echo HostKey /var/run/ssh/ssh_host_rsa_key ${D}${sysconfdir}/ssh/sshd_config_readonly echo HostKey /var/run/ssh/ssh_host_dsa_key ${D}${sysconfdir}/ssh/sshd_config_readonly echo HostKey /var/run/ssh/ssh_host_ecdsa_key ${D}${sysconfdir}/ssh/sshd_config_readonly + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system + sed -i 's,/bin/,${base_bindir}/,g' ${D}${systemd_unitdir}/system/sshd.socket ${D}${systemd_unitdir}/system/sshd@.service + sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${systemd_unitdir}/system/sshd@.service + sed -i 's,/usr/bin/,${bindir}/,g' ${D}${systemd_unitdir}/system/sshdgenkeys.service } ALLOW_EMPTY_${PN} = 1 @@ -102,6 +117,7 @@ FILES_${PN}-scp = ${bindir}/scp.${BPN} FILES_${PN}-ssh = ${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config FILES_${PN}-sshd = ${sbindir}/sshd ${sysconfdir}/init.d/sshd FILES_${PN}-sshd += ${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly +FILES_${PN}-sshd += ${systemd_unitdir} FILES_${PN}-sftp = ${bindir}/sftp FILES_${PN}-sftp-server = ${libexecdir}/sftp-server FILES_${PN}-misc = ${bindir}/ssh* ${libexecdir}/ssh* -- 1.7.9.5 ___ Openembedded-core mailing list
[OE-core] [PATCH 3/5] [v4] rpcbind: Add systemd support
From: Muhammad Shakeel muhammad_shak...@mentor.com - Remove dependency on meta-systemd Signed-off-by: Muhammad Shakeel muhammad_shak...@mentor.com --- meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf |3 +++ .../rpcbind/rpcbind/rpcbind.service| 14 ++ meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb | 15 ++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf new file mode 100644 index 000..2a4dfbc --- /dev/null +++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf @@ -0,0 +1,3 @@ +# Optional arguments passed to rpcbind. +# +RPCBIND_OPTS= diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service new file mode 100644 index 000..fa217b9 --- /dev/null +++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service @@ -0,0 +1,14 @@ +[Unit] +Description=RPC Bind +After=network.target +Wants=rpcbind.target +Before=rpcbind.target + +[Service] +Type=forking +EnvironmentFile=-/etc/rpcbind.conf +ExecStart=/usr/sbin/rpcbind -w $RPCBIND_OPTS +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb index be2897c..b65c7aa 100644 --- a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb +++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb @@ -15,6 +15,8 @@ SRC_URI = ${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ file://fix_host_path.patch \ file://obsolete_automake_macros.patch \ ${UCLIBCPATCHES} \ + file://rpcbind.conf \ + file://rpcbind.service \ UCLIBCPATCHES_libc-uclibc = file://0001-uclibc-nss.patch \ @@ -27,7 +29,7 @@ SRC_URI[sha256sum] = c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497 PR = r4 -inherit autotools update-rc.d +inherit autotools update-rc.d systemd PACKAGECONFIG ??= tcp-wrappers PACKAGECONFIG[tcp-wrappers] = --enable-libwrap,--disable-libwrap,tcp-wrappers @@ -35,6 +37,11 @@ PACKAGECONFIG[tcp-wrappers] = --enable-libwrap,--disable-libwrap,tcp-wrappers INITSCRIPT_NAME = rpcbind INITSCRIPT_PARAMS = start 43 S . start 32 0 6 . stop 81 1 . +SYSTEMD_SERVICE_${PN} = rpcbind.service +SYSTEMD_AUTO_ENABLE = disable + +EXTRA_OECONF += --enable-warmstarts + do_install_append () { mv ${D}${bindir} ${D}${sbindir} @@ -43,4 +50,10 @@ do_install_append () { -e 's,/sbin/,${sbindir}/,g' \ ${WORKDIR}/init.d ${D}${sysconfdir}/init.d/rpcbind chmod 0755 ${D}${sysconfdir}/init.d/rpcbind + + install -m 0755 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir} + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system + sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${systemd_unitdir}/system/rpcbind.service + sed -i 's,/etc/,${sysconfdir}/,g' ${D}${systemd_unitdir}/system/rpcbind.service } -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] bc: fix segmentation fault
On 2013年08月22日 15:15, Khem Raj wrote: Kai On Aug 21, 2013, at 11:50 PM, Kang Kai kai.k...@windriver.com wrote: what does adding this include file fix ? To be honest, I am not sure why add this include. After build it is harmless, so I didn't want to modify it because I think LFS is trustable. Its matter of understanding the change and may be explaining a bit better what it fixes and make the patch better for upstream too so try to build it without this include added and see if you get some warnings/errors that it fixes and then add that information to patch header. Thanks. I'll check it and be more careful next time. Regards, Kai Regards, Kai -- Regards, Neil | Kai Kang ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] test
test ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] stat: fix the wrong return code
After stat -h is executed, the return code is 1. This patch changes it to 0. Signed-off-by: Zhangle Yang zhangle.y...@windriver.com --- .../stat/stat-3.3/fix-error-return.patch | 16 meta/recipes-extended/stat/stat_3.3.bb |3 ++- 2 files changed, 18 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-extended/stat/stat-3.3/fix-error-return.patch diff --git a/meta/recipes-extended/stat/stat-3.3/fix-error-return.patch b/meta/recipes-extended/stat/stat-3.3/fix-error-return.patch new file mode 100644 index 000..032995d --- /dev/null +++ b/meta/recipes-extended/stat/stat-3.3/fix-error-return.patch @@ -0,0 +1,16 @@ +This patch fixies the wrong return code of stat -h. + +Upstream-Status: Pending +Signed-off-by: Zhangle Yang zhangle.y...@windriver.com + +--- stat-3.3/stat.c.orig 2013-08-22 10:49:45.0 +0800 stat-3.3/stat.c2013-08-22 10:50:31.0 +0800 +@@ -845,7 +845,7 @@ + fprintf(stderr, \t\t%%S - Security ID in SE-Linux\n); + fprintf(stderr, \t\t%%C - Security context in SE-Linux\n); + fprintf(stderr, \t\t%%d - Free file nodes in file system\n); +-exit(1); ++exit(0); + } + + diff --git a/meta/recipes-extended/stat/stat_3.3.bb b/meta/recipes-extended/stat/stat_3.3.bb index 73e0873..1131bdf 100644 --- a/meta/recipes-extended/stat/stat_3.3.bb +++ b/meta/recipes-extended/stat/stat_3.3.bb @@ -8,7 +8,8 @@ BBCLASSEXTEND = native PR = r0 -SRC_URI = ftp://metalab.unc.edu/pub/Linux/utils/file/stat-3.3.tar.gz; +SRC_URI = ftp://metalab.unc.edu/pub/Linux/utils/file/stat-3.3.tar.gz \ + file://fix-error-return.patch SRC_URI[md5sum] = 37e247e8e400ad9205f1b0500b728fd3 SRC_URI[sha256sum] = 7071f0384a423a938dd542c1f08547a02824f6359acd3ef3f944b2c4c2d1ee09 -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] stat: fix the wrong return code
On Aug 22, 2013, at 12:42 AM, Zhangle Yang zhangle.y...@windriver.com wrote: After stat -h is executed, the return code is 1. This patch changes it to 0. aside from the patch. why don't we use stat from coreutils or busybox and drop maintaining this old version of stat. Are there some use cases where we don't have busy box or coreutils on box ? Signed-off-by: Zhangle Yang zhangle.y...@windriver.com --- .../stat/stat-3.3/fix-error-return.patch | 16 meta/recipes-extended/stat/stat_3.3.bb |3 ++- 2 files changed, 18 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-extended/stat/stat-3.3/fix-error-return.patch diff --git a/meta/recipes-extended/stat/stat-3.3/fix-error-return.patch b/meta/recipes-extended/stat/stat-3.3/fix-error-return.patch new file mode 100644 index 000..032995d --- /dev/null +++ b/meta/recipes-extended/stat/stat-3.3/fix-error-return.patch @@ -0,0 +1,16 @@ +This patch fixies the wrong return code of stat -h. + +Upstream-Status: Pending +Signed-off-by: Zhangle Yang zhangle.y...@windriver.com + +--- stat-3.3/stat.c.orig 2013-08-22 10:49:45.0 +0800 stat-3.3/stat.c 2013-08-22 10:50:31.0 +0800 +@@ -845,7 +845,7 @@ + fprintf(stderr, \t\t%%S - Security ID in SE-Linux\n); + fprintf(stderr, \t\t%%C - Security context in SE-Linux\n); + fprintf(stderr, \t\t%%d - Free file nodes in file system\n); +-exit(1); ++exit(0); + } + + diff --git a/meta/recipes-extended/stat/stat_3.3.bb b/meta/recipes-extended/stat/stat_3.3.bb index 73e0873..1131bdf 100644 --- a/meta/recipes-extended/stat/stat_3.3.bb +++ b/meta/recipes-extended/stat/stat_3.3.bb @@ -8,7 +8,8 @@ BBCLASSEXTEND = native PR = r0 -SRC_URI = ftp://metalab.unc.edu/pub/Linux/utils/file/stat-3.3.tar.gz; +SRC_URI = ftp://metalab.unc.edu/pub/Linux/utils/file/stat-3.3.tar.gz \ + file://fix-error-return.patch SRC_URI[md5sum] = 37e247e8e400ad9205f1b0500b728fd3 SRC_URI[sha256sum] = 7071f0384a423a938dd542c1f08547a02824f6359acd3ef3f944b2c4c2d1ee09 -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)!
On Wednesday 21 August 2013 22:58:55 Saul Wold wrote: Paul, Ross: Please review this set. It has a number of large changes that I want more EYES on! Particularly, the python3 patch set, which I may remove before this is final due to the world build issue. There is also a few patches on poky from Beth and myself which need a look at and ACK The following changes since commit d98f08a7ad95d0b17846276b028a6614f16b6846: genext2fs: fix memory corruption on powerpc (2013-08-20 07:11:44 -0700) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/stage http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/ stage Cristian Iorga (4): packagegroup-self-hosted: pcmanfm integration builder: register directories with pcmanfm build-appliance-image: changing the icon theme to sato default-providers: Set the preferred provider for bluez I thought we were going to fix the libasound-module-bluez multiple provider issue by renaming the package? Jonathan Liu (3): xf86-video-intel: remove duplicate xf86driproto from DEPENDS xf86-video-vesa: remove duplicate xf86driproto from DEPENDS mesa: enable additional drivers for gallium-llvm x86/x86-64 Kai Kang (3): bc: fix segmentation fault libx11: upgrade to 1.6.1 libx11-diet: upgrade to 1.6.1 Deleted keysymdef_include patch - why? Presumably because it was merged upstream, but that needs to be stated. Khem Raj (27): generate-manifest-3.3.py: Add script to generate python 3.3 manifests python-3.3-manifest: Add python3 manifest file python3native.bbclass: Add python3 abstraction class package_rpm.bbclass:Make the regexp less greedy classes/distutils: Introduce PYTHON_PN classes: Add distutils for python3 I hadn't noticed earlier, but this set of changes introduces a shedload more bbclasses. Are these really all necessary? setuptools.bbclass: Use python-distribute instead of python-setuptools distutils3.bbclass: Port the distutils class fix to handle filenames with spaces setuptools3.bbclass: Remove useless multiline comment These incremental changes to files added in earlier commits need to be squashed into those commits. distutils: Introduce PYTHON_ABI variable distutils3: Do build_ext as separate step during compile python3: Add recipes python3: Add native recipe python_2.7.3.bb: Inherit python-dir python3-nose: Testing tools for python zeromq: Add recipe pyzmq: Add recipes using python3 There's inadequate justification given in the commit messages for why these last two need to be added; I already mentioned this in earlier feedback on these changes. What's more, the second commit makes a tweak to the commit before which should be squashed into there instead. ipython: Add recipes for ipython2 and ipython3 Again, the commit message needs to mention why we need these. python-distribute: Add recipes for python2 and python3 python3: Upgrade to 3.3.2 distutils3.bbclass: Fix typo and use proper values for target sysroot python3, python3-native: Consider OE staging installation python3: Fix host include contamination issue distutils3.bbclass: Use MACHINE for sysroot when not building for build host python3: Fix the compiler invocation and linker flags when cross compiling python: Add Patch description and status information eglibc: Update SRC_URI and fix unpackaged empty dir I appreciate the work and testing that has gone into this set of changes but it still needs further cleaning up as discussed above IMO. Lauren Post (2): directfb: Upgrade to 1.6.3 directfb: add fusion patch for hangs on exit with The commit messages seem a little bit malformed on these two. Mark Hatle (11): image.bbclass: Add basic support for PACKAGE_EXCLUDE python-smartpm: Add support for excluding package from the install package_rpm.bbclass: Add support for PACKAGE_EXCLUDE to RPM installs python-smartpm: Add support to disable installing recommends package_rpm.bbclass: NO_RECOMMENDATIONS support package_deb.bbclass: Use the WORKDIR not SYSROOT for temp files package_deb: Add support for NO_RECOMMENDATIONS and PACKAGE_EXCLUDE opkg: Add --no-install-recommends option. package_ipk: Add support for NO_RECOMMENDATIONS opkg: Add support for excluding packages from the install package_ipk: Add support for PACKAGE_EXCLUDE As mentioned earlier I'm still unhappy with not persisting these into the rootfs if package-management is enabled, but I'll try to address that myself in a follow-up. Marko Lindqvist (3): texinfo: correct dont-depend-on-help2man.patch SDL2: add recipe boost: fix build when PARALLEL_MAKE is not set Otavio Salvador (1): distro_features_check.bbclass: Allow checking of required/conflicting features I should have asked this earlier - why does this need to be a separate bbclass? The code
Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)!
-Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Paul Eggleton Sent: Thursday, August 22, 2013 12:08 PM To: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)! On Wednesday 21 August 2013 22:58:55 Saul Wold wrote: Paul, Ross: Please review this set. It has a number of large changes that I want more EYES on! Particularly, the python3 patch set, which I may remove before this is final due to the world build issue. There is also a few patches on poky from Beth and myself which need a look at and ACK The following changes since commit d98f08a7ad95d0b17846276b028a6614f16b6846: genext2fs: fix memory corruption on powerpc (2013-08-20 07:11:44 -0700) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/stage http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h =sgw/ stage Cristian Iorga (4): packagegroup-self-hosted: pcmanfm integration builder: register directories with pcmanfm build-appliance-image: changing the icon theme to sato default-providers: Set the preferred provider for bluez I thought we were going to fix the libasound-module-bluez multiple provider issue by renaming the package? - Actually, that involves more changes (change in packagegroup-base.bb) and I think that this change will be eliminated once we will make the change to BlueZ5 in the next release (or I hope so :-) ). Jonathan Liu (3): xf86-video-intel: remove duplicate xf86driproto from DEPENDS xf86-video-vesa: remove duplicate xf86driproto from DEPENDS mesa: enable additional drivers for gallium-llvm x86/x86-64 Kai Kang (3): bc: fix segmentation fault libx11: upgrade to 1.6.1 libx11-diet: upgrade to 1.6.1 Deleted keysymdef_include patch - why? Presumably because it was merged upstream, but that needs to be stated. Khem Raj (27): generate-manifest-3.3.py: Add script to generate python 3.3 manifests python-3.3-manifest: Add python3 manifest file python3native.bbclass: Add python3 abstraction class package_rpm.bbclass:Make the regexp less greedy classes/distutils: Introduce PYTHON_PN classes: Add distutils for python3 I hadn't noticed earlier, but this set of changes introduces a shedload more bbclasses. Are these really all necessary? setuptools.bbclass: Use python-distribute instead of python-setuptools distutils3.bbclass: Port the distutils class fix to handle filenames with spaces setuptools3.bbclass: Remove useless multiline comment These incremental changes to files added in earlier commits need to be squashed into those commits. distutils: Introduce PYTHON_ABI variable distutils3: Do build_ext as separate step during compile python3: Add recipes python3: Add native recipe python_2.7.3.bb: Inherit python-dir python3-nose: Testing tools for python zeromq: Add recipe pyzmq: Add recipes using python3 There's inadequate justification given in the commit messages for why these last two need to be added; I already mentioned this in earlier feedback on these changes. What's more, the second commit makes a tweak to the commit before which should be squashed into there instead. ipython: Add recipes for ipython2 and ipython3 Again, the commit message needs to mention why we need these. python-distribute: Add recipes for python2 and python3 python3: Upgrade to 3.3.2 distutils3.bbclass: Fix typo and use proper values for target sysroot python3, python3-native: Consider OE staging installation python3: Fix host include contamination issue distutils3.bbclass: Use MACHINE for sysroot when not building for build host python3: Fix the compiler invocation and linker flags when cross compiling python: Add Patch description and status information eglibc: Update SRC_URI and fix unpackaged empty dir I appreciate the work and testing that has gone into this set of changes but it still needs further cleaning up as discussed above IMO. Lauren Post (2): directfb: Upgrade to 1.6.3 directfb: add fusion patch for hangs on exit with The commit messages seem a little bit malformed on these two. Mark Hatle (11): image.bbclass: Add basic support for PACKAGE_EXCLUDE python-smartpm: Add support for excluding package from the install package_rpm.bbclass: Add support for PACKAGE_EXCLUDE to RPM installs python-smartpm: Add support to disable installing recommends package_rpm.bbclass: NO_RECOMMENDATIONS support package_deb.bbclass: Use the WORKDIR not SYSROOT for temp files package_deb: Add support for NO_RECOMMENDATIONS and PACKAGE_EXCLUDE opkg: Add --no-install-recommends option. package_ipk: Add support for NO_RECOMMENDATIONS opkg: Add support for excluding packages from the
Re: [OE-core] [PATCH][for-dylan] bluez4: fix network Connect parameter validation
On 21 August 2013 23:47, Peter A. Bigot p...@pabigot.com wrote: The incorrect validation prevents connection to the NAP service on another device. Is this intended for master as well as dylan? Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)!
On Thu, Aug 22, 2013 at 09:14:07AM +, Iorga, Cristian wrote: -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Paul Eggleton Sent: Thursday, August 22, 2013 12:08 PM To: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)! Iorga, please get better e-mail client, there is no way to see what was written by you and what was there from Paul's reply. Cristian Iorga (4): packagegroup-self-hosted: pcmanfm integration builder: register directories with pcmanfm build-appliance-image: changing the icon theme to sato default-providers: Set the preferred provider for bluez I thought we were going to fix the libasound-module-bluez multiple provider issue by renaming the package? - Actually, that involves more changes (change in packagegroup-base.bb) and I think that this change will be eliminated once we will make the change to BlueZ5 in the next release (or I hope so :-) ). -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] busybox.inc: Add -f to rm of ${D}${sysconfdir}/syslog-startup.conf.${BPN} to not error out when the busybox config used does not have SYSLOG enabled and DISTRO_FEATURES does not cont
Signed-off-by: Florin Sarbu florin.sa...@windriver.com --- meta/recipes-core/busybox/busybox.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 8b38c1a..454d7e3 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -277,7 +277,7 @@ do_install () { # Remove the sysvinit specific configuration file for systemd systems to avoid confusion if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then - rm ${D}${sysconfdir}/syslog-startup.conf.${BPN} + rm -f ${D}${sysconfdir}/syslog-startup.conf.${BPN} fi } -- 1.8.3.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)!
On Thu, 2013-08-22 at 10:07 +0100, Paul Eggleton wrote: On Wednesday 21 August 2013 22:58:55 Saul Wold wrote: package_rpm.bbclass:Make the regexp less greedy That's a rather poor commit message. There are multiple regexps in this class and none of them is famous enough to be adequately described as the regexp. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] alsa-lib: fix function definitions error for mips
Functions atomic_add(s) and atomic_sub(s) are defined with 'extern __inline__' that may cause compile fails when cross compile for mips. The error message looks like: | pcm/.libs/libpcm.a(pcm_meter.o): In function `snd_pcm_meter_update_scope': | .../alsa-lib-1.0.27.2/src/pcm/pcm_meter.c:139: undefined reference to `atomic_sub' Replace the 'extern __inline__' with 'static __inline__' to fix this issue. Signed-off-by: Kai Kang kai.k...@windriver.com --- ...-iatomic.h-functions-definitions-for-mips.patch | 68 ++ meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb | 1 + 2 files changed, 69 insertions(+) create mode 100644 meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch diff --git a/meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch b/meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch new file mode 100644 index 000..f1a7947 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch @@ -0,0 +1,68 @@ +Upstream-Status: Backport + +Signed-off-by: Kai Kang kai.k...@windriver.com + +From f21f48a70f8437a671b58fcab75e54222a9eea16 Mon Sep 17 00:00:00 2001 +From: Kai Kang jiashuo.kang at gmail.com +Date: Thu, 15 Aug 2013 17:17:19 +0800 +Subject: [PATCH] Update iatomic.h functions definitions for mips + +Functions atomic_add(s) and atomic_sub(s) are defined with 'extern +__inline__' that may cause compile fails when cross compile for mips. +The error message looks like: + +| pcm/.libs/libpcm.a(pcm_meter.o): In function `snd_pcm_meter_update_scope': +| .../alsa-lib-1.0.27.2/src/pcm/pcm_meter.c:139: undefined reference to `atomic_sub' + +Replace the 'extern __inline__' with 'static __inline__' to fix this +issue. + +Signed-off-by: Kai Kang jiashuo.kang at gmail.com +Signed-off-by: Takashi Iwai ti...@suse.de +--- + include/iatomic.h | 8 + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/include/iatomic.h b/include/iatomic.h +index 5711fe8..2393297 100644 +--- a/include/iatomic.h b/include/iatomic.h +@@ -720,7 +720,7 @@ typedef struct { volatile int counter; } atomic_t; + * Atomically adds @i to @v. Note that the guaranteed useful range + * of an atomic_t is only 24 bits. + */ +-extern __inline__ void atomic_add(int i, atomic_t * v) ++static __inline__ void atomic_add(int i, atomic_t * v) + { + unsigned long temp; + +@@ -744,7 +744,7 @@ extern __inline__ void atomic_add(int i, atomic_t * v) + * Atomically subtracts @i from @v. Note that the guaranteed + * useful range of an atomic_t is only 24 bits. + */ +-extern __inline__ void atomic_sub(int i, atomic_t * v) ++static __inline__ void atomic_sub(int i, atomic_t * v) + { + unsigned long temp; + +@@ -763,7 +763,7 @@ extern __inline__ void atomic_sub(int i, atomic_t * v) + /* + * Same as above, but return the result value + */ +-extern __inline__ int atomic_add_return(int i, atomic_t * v) ++static __inline__ int atomic_add_return(int i, atomic_t * v) + { + unsigned long temp, result; + +@@ -784,7 +784,7 @@ extern __inline__ int atomic_add_return(int i, atomic_t * v) + return result; + } + +-extern __inline__ int atomic_sub_return(int i, atomic_t * v) ++static __inline__ int atomic_sub_return(int i, atomic_t * v) + { + unsigned long temp, result; + +-- +1.8.1.2 + diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb index 5455944..0e1ea76 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb @@ -17,6 +17,7 @@ ARM_INSTRUCTION_SET = arm SRC_URI = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ file://Check-if-wordexp-function-is-supported.patch \ file://fix-tstamp-declaration.patch \ + file://Update-iatomic.h-functions-definitions-for-mips.patch \ SRC_URI[md5sum] = 69129a7c37697f81ac092335e9fa452b SRC_URI[sha256sum] = 690ed393e7efd4fc7e3a2d2cda5449298ca0c895197e5914e350882012430d19 -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Fix alsa-lib compiles fails on mips
The following changes since commit b2ff1add530b1fec2fb7f385227a03db47015c37: poky.conf: Don't force the addition of extra DISTRO_FEATURES (2013-08-20 22:58:04 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib kangkai/alsa-lib http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/alsa-lib Kai Kang (1): alsa-lib: fix function definitions error for mips ...-iatomic.h-functions-definitions-for-mips.patch | 68 ++ meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb | 1 + 2 files changed, 69 insertions(+) create mode 100644 meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)!
On Thu, 2013-08-22 at 10:07 +0100, Paul Eggleton wrote: On Wednesday 21 August 2013 22:58:55 Saul Wold wrote: Marko Lindqvist (3): texinfo: correct dont-depend-on-help2man.patch SDL2: add recipe boost: fix build when PARALLEL_MAKE is not set Otavio Salvador (1): distro_features_check.bbclass: Allow checking of required/conflicting features I should have asked this earlier - why does this need to be a separate bbclass? The code doesn't do anything if the variables aren't set, so it can't be because it could have an impact on existing setups that don't set them. FWIW I do have a worry about the shear weight of the core these days as we're building up piles of anonymous python for example. In many ways I therefore like the idea of having more classes which get included when they're needed. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] connman: upgrade to 1.17
The following changes since commit b2ff1add530b1fec2fb7f385227a03db47015c37: poky.conf: Don't force the addition of extra DISTRO_FEATURES (2013-08-20 22:58:04 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ciorga/PUs http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ciorga/PUs Cristian Iorga (1): connman: upgrade to 1.17 .../recipes-connectivity/connman/{connman_1.16.bb = connman_1.17.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-connectivity/connman/{connman_1.16.bb = connman_1.17.bb} (69%) -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] connman: upgrade to 1.17
connman 1.17 is mainly a bugfix release, as such, recommended to upgrade to. Signed-off-by: Cristian Iorga cristian.io...@intel.com --- .../recipes-connectivity/connman/{connman_1.16.bb = connman_1.17.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-connectivity/connman/{connman_1.16.bb = connman_1.17.bb} (69%) diff --git a/meta/recipes-connectivity/connman/connman_1.16.bb b/meta/recipes-connectivity/connman/connman_1.17.bb similarity index 69% rename from meta/recipes-connectivity/connman/connman_1.16.bb rename to meta/recipes-connectivity/connman/connman_1.17.bb index 7e54bc2..461157f 100644 --- a/meta/recipes-connectivity/connman/connman_1.16.bb +++ b/meta/recipes-connectivity/connman/connman_1.17.bb @@ -6,8 +6,8 @@ SRC_URI = ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ file://connman \ -SRC_URI[md5sum] = d290681619e10426442d07c3f4c1 -SRC_URI[sha256sum] = 7273e88e6a6338be1e51b0e4c685d556386897cba9317cd83370bfb3f009982a +SRC_URI[md5sum] = dd4a13f789de1b69fcddf0cf613f2d5b +SRC_URI[sha256sum] = d31aa2e7dc9fa817c93aba973995b63506a8c83f55afe507028f09b580ef0b00 PR = ${INC_PR}.0 -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Upgrade harfbuzz
The following changes since commit b2ff1add530b1fec2fb7f385227a03db47015c37: poky.conf: Don't force the addition of extra DISTRO_FEATURES (2013-08-20 22:58:04 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib mihaip/harfbuzz http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mihaip/harfbuzz Mihai Prica (1): harfbuzz: upgrade to v0.9.19 .../harfbuzz-0.9.17/disable_graphite.patch | 15 --- .../{harfbuzz_0.9.17.bb = harfbuzz_0.9.19.bb} | 18 +- 2 files changed, 13 insertions(+), 20 deletions(-) delete mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch rename meta/recipes-graphics/harfbuzz/{harfbuzz_0.9.17.bb = harfbuzz_0.9.19.bb} (61%) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] harfbuzz: upgrade to v0.9.19
Remove the disable_graphite.patch because the --without-graphite2 configure option can be used instead. Split package into harfbuzz and harfbuzz-icu. The ICU support is now built into a separate library that will be shipped in a different package. Signed-off-by: Mihai Prica mihai.pr...@intel.com --- .../harfbuzz-0.9.17/disable_graphite.patch | 15 --- .../{harfbuzz_0.9.17.bb = harfbuzz_0.9.19.bb} | 18 +- 2 files changed, 13 insertions(+), 20 deletions(-) delete mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch rename meta/recipes-graphics/harfbuzz/{harfbuzz_0.9.17.bb = harfbuzz_0.9.19.bb} (61%) diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch deleted file mode 100644 index 49938ba..000 --- a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Marko Lindqvist cazf...@gmail.com -diff -Nurd harfbuzz-0.9.10/configure.ac harfbuzz-0.9.10/configure.ac harfbuzz-0.9.10/configure.ac 2013-01-03 08:08:51.0 +0200 -+++ harfbuzz-0.9.10/configure.ac 2013-01-09 08:18:04.812529418 +0200 -@@ -185,7 +185,7 @@ - - dnl == - --PKG_CHECK_MODULES(GRAPHITE2, graphite2, have_graphite=true, have_graphite=false) -+have_graphite=false - if $have_graphite; then - AC_DEFINE(HAVE_GRAPHITE2, 1, [Have Graphite library]) - fi diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.17.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.19.bb similarity index 61% rename from meta/recipes-graphics/harfbuzz/harfbuzz_0.9.17.bb rename to meta/recipes-graphics/harfbuzz/harfbuzz_0.9.19.bb index 968d8a2..daf7273 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.17.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.19.bb @@ -13,17 +13,25 @@ LIC_FILES_CHKSUM = file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \ SECTION = libs -PR = r0 - SRC_URI = http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${PV}.tar.bz2 \ - file://disable_graphite.patch \ -SRC_URI[md5sum] = c48827713e93539dc7285f9e86ffbdc5 -SRC_URI[sha256sum] = a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed +SRC_URI[md5sum] = 9782581ee6ef972554772e84ca448131 +SRC_URI[sha256sum] = d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35 inherit autotools pkgconfig DEPENDS = icu glib-2.0 cairo freetype BBCLASSEXTEND = native + +EXTRA_OECONF = --with-glib --with-freetype --with-cairo --with-icu --without-graphite2 + +PACKAGES =+ ${PN}-icu ${PN}-icu-dbg ${PN}-icu-dev + +FILES_${PN}-icu = ${libdir}/libharfbuzz-icu.so.* +FILES_${PN}-icu-dbg = ${libdir}/.debug/libharfbuzz-icu.so* +FILES_${PN}-icu-dev = ${libdir}/libharfbuzz-icu.la \ + ${libdir}/libharfbuzz-icu.so \ + ${libdir}/pkgconfig/harfbuzz-icu.pc \ + -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)!
Sorry, for the moment, I don't have the necessary time resources to switch to another email client. I will do it after 1.5 release. Regards, Cristian -Original Message- From: Martin Jansa [mailto:martin.ja...@gmail.com] Sent: Thursday, August 22, 2013 12:55 PM To: Iorga, Cristian Cc: Paul Eggleton; openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)! On Thu, Aug 22, 2013 at 09:14:07AM +, Iorga, Cristian wrote: -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Paul Eggleton Sent: Thursday, August 22, 2013 12:08 PM To: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)! Iorga, please get better e-mail client, there is no way to see what was written by you and what was there from Paul's reply. Cristian Iorga (4): packagegroup-self-hosted: pcmanfm integration builder: register directories with pcmanfm build-appliance-image: changing the icon theme to sato default-providers: Set the preferred provider for bluez I thought we were going to fix the libasound-module-bluez multiple provider issue by renaming the package? - Actually, that involves more changes (change in packagegroup-base.bb) and I think that this change will be eliminated once we will make the change to BlueZ5 in the next release (or I hope so :-) ). -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/28] libiconv: Extend to nativesdk and support non-linux targets
This library is currently only available when targeting non-libc. This patch also makes it available when targetting non-linux since it is likely of use then. It also adds a BBCLASSEXTEND for nativesdk since again, it can be useful in that context. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-support/libiconv/libiconv_1.14.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-support/libiconv/libiconv_1.14.bb b/meta/recipes-support/libiconv/libiconv_1.14.bb index b1d2612..470900b 100644 --- a/meta/recipes-support/libiconv/libiconv_1.14.bb +++ b/meta/recipes-support/libiconv/libiconv_1.14.bb @@ -22,6 +22,8 @@ S = ${WORKDIR}/libiconv-${PV} inherit autotools pkgconfig gettext python __anonymous() { +if d.getVar(TARGET_OS, True) != linux: +return if d.getVar(TCLIBC, True) == eglibc: raise bb.parse.SkipPackage(libiconv is provided for use with uClibc only - eglibc already provides iconv) } @@ -44,3 +46,5 @@ do_install_append () { rm -rf ${D}${libdir}/preloadable_libiconv.so rm -rf ${D}${libdir}/charset.alias } + +BBCLASSEXTEND = nativesdk -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/28] package.bbclass: Fix handling of symlinks in debug packages
When copying the sources for the debug source package we use cpio -Ll which means to copy files as hardlinks and to dereference symlinks. It appears there is a bug in cpio since -Ll will copy symlinks and not dereference them. We therefore do a second pass over copied symlinks resolving them into files. Ideally we would copy these as hardlinks as well however it doesn't seem worth the extra code and effort for what amounts to a corner case for a minor space improvement. This means that the -dbg packages no longer contain broken symlinks. [YOCTO #5020] Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/classes/package.bbclass | 6 ++ 1 file changed, 6 insertions(+) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 2460d0a..f6f9310 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -316,6 +316,12 @@ def copydebugsources(debugsrcdir, d): #if retval: #bb.fatal(debug source copy failed with exit code %s (cmd was %s) % (retval, cmd)) +# cpio seems to have a bug with -lL together and symbolic links are just copied, not dereferenced. +# Work around this by manually finding and copying any symbolic links that made it through. +cmd = find %s%s -type l -print0 -delete | sed s#%s%s/##g | (cd '%s' ; cpio -pd0mL --no-preserve-owner '%s%s' 2/dev/null) % (dvar, debugsrcdir, dvar, debugsrcdir, workparentdir, dvar, debugsrcdir) +(retval, output) = oe.utils.getstatusoutput(cmd) +if retval: +bb.fatal(debugsrc symlink fixup failed with exit code %s (cmd was %s) % (retval, cmd)) # The copy by cpio may have resulted in some empty directories! Remove these cmd = find %s%s -empty -type d -delete % (dvar, debugsrcdir) -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/28] gcc-cross-canadian-4.8: Allow elfutils to be a configurable dependency
Some SDK platforms have elfutils support, some do not, therefore allow this to be configured. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb index 278a529..49ba75f 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb @@ -5,8 +5,9 @@ require gcc-cross-canadian.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS += nativesdk-gmp nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils -RDEPENDS_${PN} += nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils +ELFUTILS = nativesdk-elfutils +DEPENDS += nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} +RDEPENDS_${PN} += nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} SYSTEMHEADERS = /usr/include SYSTEMLIBS = ${target_base_libdir}/ -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/28] populate_sdk_base: Allow sdk tar options to be overridden
It can be useful to override or append options to the SDK tarball creation command so add a variable to allow this. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/classes/populate_sdk_base.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index aa3c2fa..998280e 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -108,11 +108,13 @@ fakeroot create_sdk_files() { sed -i -e s:##DEFAULT_INSTALL_DIR##:$escaped_sdkpath: ${SDK_OUTPUT}/${SDKPATH}/relocate_sdk.py } +SDKTAROPTS = --owner=root --group=root -j + fakeroot tar_sdk() { # Package it up mkdir -p ${SDK_DEPLOY} cd ${SDK_OUTPUT}/${SDKPATH} - tar --owner=root --group=root -cj --file=${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 . + tar ${SDKTAROPTS} -c --file=${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 . } fakeroot create_shar() { -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 13/28] gcc-cross-canadian: Merge 4.7 and 4.8 recipes into common include
This removes duplication and follows the pattern of the other gcc recipes. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 19 ++ .../recipes-devtools/gcc/gcc-cross-canadian_4.7.bb | 23 -- .../recipes-devtools/gcc/gcc-cross-canadian_4.8.bb | 20 --- 3 files changed, 19 insertions(+), 43 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index 10ddacf..85c3166 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -7,3 +7,22 @@ BPN = gcc DEPENDS = virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc nativesdk-gettext GCCMULTILIB = --enable-multilib + +require gcc-configure-sdk.inc +require gcc-package-sdk.inc + +ELFUTILS = nativesdk-elfutils +DEPENDS += nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib +RDEPENDS_${PN} += nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} + +SYSTEMHEADERS = /usr/include +SYSTEMLIBS = ${target_base_libdir}/ +SYSTEMLIBS1 = ${target_libdir}/ + +EXTRA_OECONF += --disable-libunwind-exceptions --disable-libssp \ + --disable-libgomp --disable-libmudflap \ + --with-mpfr=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-mpc=${STAGING_DIR_HOST}${layout_exec_prefix} + +# gcc 4.7 needs -isystem +export ARCH_FLAGS_FOR_TARGET = --sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir} diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb index 53c4632..355757c 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb @@ -1,26 +1,3 @@ -inherit cross-canadian - require recipes-devtools/gcc/gcc-${PV}.inc require gcc-cross-canadian.inc -require gcc-configure-sdk.inc -require gcc-package-sdk.inc - -DEPENDS += nativesdk-gmp nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils -RDEPENDS_${PN} += nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils - -SYSTEMHEADERS = /usr/include -SYSTEMLIBS = ${target_base_libdir}/ -SYSTEMLIBS1 = ${target_libdir}/ - -EXTRA_OECONF += --disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_HOST}${layout_exec_prefix} \ - --with-mpc=${STAGING_DIR_HOST}${layout_exec_prefix} - -# to find libmpfr -# export LD_LIBRARY_PATH = {STAGING_DIR_HOST}${layout_exec_prefix} - -PARALLEL_MAKE = -# gcc 4.7 needs -isystem -export ARCH_FLAGS_FOR_TARGET = --sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir} diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb index bf49c3d..bf53c5c 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb @@ -1,25 +1,5 @@ -inherit cross-canadian - require recipes-devtools/gcc/gcc-${PV}.inc require gcc-cross-canadian.inc -require gcc-configure-sdk.inc -require gcc-package-sdk.inc - -ELFUTILS = nativesdk-elfutils -DEPENDS += nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib -RDEPENDS_${PN} += nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} - -SYSTEMHEADERS = /usr/include -SYSTEMLIBS = ${target_base_libdir}/ -SYSTEMLIBS1 = ${target_libdir}/ -EXTRA_OECONF += --disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_HOST}${layout_exec_prefix} \ - --with-mpc=${STAGING_DIR_HOST}${layout_exec_prefix} -# to find libmpfr -# export LD_LIBRARY_PATH = {STAGING_DIR_HOST}${layout_exec_prefix} -# gcc 4.7 needs -isystem -export ARCH_FLAGS_FOR_TARGET = --sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir} -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/28] gcc-cross-canadian-4.8: Add missing dependency on nativesdk-zlib
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb index 49ba75f..bf49c3d 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb @@ -6,7 +6,7 @@ require gcc-configure-sdk.inc require gcc-package-sdk.inc ELFUTILS = nativesdk-elfutils -DEPENDS += nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} +DEPENDS += nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib RDEPENDS_${PN} += nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} SYSTEMHEADERS = /usr/include -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/28] gcc-package-sdk.inc: Allow executable extension to be overridden
On platforms like windows, executables have extensions. Whilst I'm not proposing we wholesale support windows extensions, this small tweak allows a cross compiler targetting mingw to be built which does seem like a good use case. The patch therefore adds an EXEEXT which the mingw layer can set for the libexec symlinks. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/gcc/gcc-package-sdk.inc | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-package-sdk.inc b/meta/recipes-devtools/gcc/gcc-package-sdk.inc index b546d5c..21beccc 100644 --- a/meta/recipes-devtools/gcc/gcc-package-sdk.inc +++ b/meta/recipes-devtools/gcc/gcc-package-sdk.inc @@ -28,6 +28,8 @@ FILES_${PN}-doc = \ ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \ +EXEEXT = + # Compute how to get from libexecdir to bindir in python (easier than shell) BINRELPATH = ${@oe.path.relative(d.expand(${libexecdir}/gcc/${TARGET_SYS}/${BINV}), d.expand(${bindir}))} @@ -62,12 +64,13 @@ do_install () { # found. dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/ install -d $dest + suffix=${EXEEXT} for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do - if [ $t = g77 -o $t = gfortran ] [ ! -e ${D}${bindir}/${TARGET_PREFIX}$t ]; then + if [ $t = g77 -o $t = gfortran ] [ ! -e ${D}${bindir}/${TARGET_PREFIX}$t$suffix ]; then continue fi - ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t + ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t$suffix $dest$t$suffix done chown -R root:root ${D} -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 17/28] gcc-cross-initial: Fold common configuration into gcc-cross-initial.inc
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/gcc/gcc-cross-initial.inc | 2 ++ meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.7.bb | 1 - meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.8.bb | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc index 1ac1db6..8184538 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc @@ -24,6 +24,8 @@ EXTRA_OECONF = --with-newlib \ ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \ ${EXTRA_OECONF_FPU} +EXTRA_OECONF += --with-native-system-header-dir=${SYSTEMHEADERS} + GCCCROSS_BUILDSYSROOT = ${B}/tmpsysroot do_configure_prepend () { diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.7.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.7.bb index 39c90ca..fd90e11 100644 --- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.7.bb +++ b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.7.bb @@ -1,4 +1,3 @@ require recipes-devtools/gcc/gcc-cross-initial_${PV}.bb require gcc-crosssdk-initial.inc -EXTRA_OECONF += --with-native-system-header-dir=${SYSTEMHEADERS} diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.8.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.8.bb index 39c90ca..fd90e11 100644 --- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.8.bb +++ b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.8.bb @@ -1,4 +1,3 @@ require recipes-devtools/gcc/gcc-cross-initial_${PV}.bb require gcc-crosssdk-initial.inc -EXTRA_OECONF += --with-native-system-header-dir=${SYSTEMHEADERS} -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 18/28] gcc-runtime: Fold common configuration into gcc-configure-runtime.inc
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/gcc/gcc-configure-runtime.inc | 5 + meta/recipes-devtools/gcc/gcc-runtime_4.7.bb| 4 meta/recipes-devtools/gcc/gcc-runtime_4.8.bb| 4 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc index f89ca6b..2ff8561 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc @@ -7,6 +7,11 @@ EXTRA_OECONF_PATHS = \ --with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET} +ARCH_FLAGS_FOR_TARGET += -isystem${STAGING_INCDIR} + +EXTRA_OECONF += --disable-libunwind-exceptions +EXTRA_OECONF_append_linuxstdbase = --enable-clocale=gnu + RUNTIMETARGET = libssp libstdc++-v3 libgomp # ? # libiberty diff --git a/meta/recipes-devtools/gcc/gcc-runtime_4.7.bb b/meta/recipes-devtools/gcc/gcc-runtime_4.7.bb index fbaf057..c16d27e 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime_4.7.bb +++ b/meta/recipes-devtools/gcc/gcc-runtime_4.7.bb @@ -2,7 +2,3 @@ require recipes-devtools/gcc/gcc-${PV}.inc require gcc-configure-runtime.inc require gcc-package-runtime.inc -ARCH_FLAGS_FOR_TARGET += -isystem${STAGING_INCDIR} - -EXTRA_OECONF += --disable-libunwind-exceptions -EXTRA_OECONF_append_linuxstdbase = --enable-clocale=gnu diff --git a/meta/recipes-devtools/gcc/gcc-runtime_4.8.bb b/meta/recipes-devtools/gcc/gcc-runtime_4.8.bb index fbaf057..c16d27e 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime_4.8.bb +++ b/meta/recipes-devtools/gcc/gcc-runtime_4.8.bb @@ -2,7 +2,3 @@ require recipes-devtools/gcc/gcc-${PV}.inc require gcc-configure-runtime.inc require gcc-package-runtime.inc -ARCH_FLAGS_FOR_TARGET += -isystem${STAGING_INCDIR} - -EXTRA_OECONF += --disable-libunwind-exceptions -EXTRA_OECONF_append_linuxstdbase = --enable-clocale=gnu -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 23/28] gcc-cross-canadian: Fold configure-sdk and package-sdk into the main .inc
This also has the advantage of removing the confusing sdk naming which has been purged everywhere else in favour of cross-canadian. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/gcc/gcc-configure-sdk.inc | 47 - meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 127 ++- meta/recipes-devtools/gcc/gcc-package-sdk.inc| 78 -- 3 files changed, 125 insertions(+), 127 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-configure-sdk.inc delete mode 100644 meta/recipes-devtools/gcc/gcc-package-sdk.inc diff --git a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc deleted file mode 100644 index 6c55bc7..000 --- a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc +++ /dev/null @@ -1,47 +0,0 @@ -require gcc-configure-common.inc - -EXTRA_OECONF_PATHS = --with-gxx-include-dir=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}${target_includedir}/c++ \ - --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \ - --with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ - --with-build-sysroot=${STAGING_DIR_TARGET} - -# -# gcc-cross looks and finds these in ${exec_prefix} but we're not so lucky -# for the sdk. Hardcoding the paths ensures the build doesn't go canadian or worse. -# -export AR_FOR_TARGET = ${TARGET_PREFIX}ar -export AS_FOR_TARGET = ${TARGET_PREFIX}as -export DLLTOOL_FOR_TARGET = ${TARGET_PREFIX}dlltool -export CC_FOR_TARGET = ${TARGET_PREFIX}gcc -export CXX_FOR_TARGET = ${TARGET_PREFIX}g++ -export LD_FOR_TARGET = ${TARGET_PREFIX}ld -export LIPO_FOR_TARGET = ${TARGET_PREFIX}lipo -export NM_FOR_TARGET = ${TARGET_PREFIX}nm -export OBJDUMP_FOR_TARGET = ${TARGET_PREFIX}objdump -export RANLIB_FOR_TARGET = ${TARGET_PREFIX}ranlib -export STRIP_FOR_TARGET = ${TARGET_PREFIX}strip -export WINDRES_FOR_TARGET = ${TARGET_PREFIX}windres - -# -# We need to override this and make sure the compiler can find staging -# -export ARCH_FLAGS_FOR_TARGET = --sysroot=${STAGING_DIR_TARGET} - -do_configure () { - export CC_FOR_BUILD=${BUILD_CC} - export CXX_FOR_BUILD=${BUILD_CXX} - export CFLAGS_FOR_BUILD=${BUILD_CFLAGS} - export CPPFLAGS_FOR_BUILD=${BUILD_CPPFLAGS} - export CXXFLAGS_FOR_BUILD=${BUILD_CXXFLAGS} - export LDFLAGS_FOR_BUILD=${BUILD_LDFLAGS} - export CFLAGS_FOR_TARGET=${TARGET_CFLAGS} - export CPPFLAGS_FOR_TARGET=${TARGET_CPPFLAGS} - export CXXFLAGS_FOR_TARGET=${TARGET_CXXFLAGS} - export LDFLAGS_FOR_TARGET=${TARGET_LDFLAGS} - (cd ${S} gnu-configize) || die failure running gnu-configize - oe_runconf -} - -do_compile () { - oe_runmake all-host -} diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index 85c3166..5908e72 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -8,8 +8,131 @@ DEPENDS = virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}binutils-crosssdk v GCCMULTILIB = --enable-multilib -require gcc-configure-sdk.inc -require gcc-package-sdk.inc +require gcc-configure-common.inc + +EXTRA_OECONF_PATHS = --with-gxx-include-dir=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}${target_includedir}/c++ \ + --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \ + --with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ + --with-build-sysroot=${STAGING_DIR_TARGET} + +# +# gcc-cross looks and finds these in ${exec_prefix} but we're not so lucky +# for the sdk. Hardcoding the paths ensures the build doesn't go canadian or worse. +# +export AR_FOR_TARGET = ${TARGET_PREFIX}ar +export AS_FOR_TARGET = ${TARGET_PREFIX}as +export DLLTOOL_FOR_TARGET = ${TARGET_PREFIX}dlltool +export CC_FOR_TARGET = ${TARGET_PREFIX}gcc +export CXX_FOR_TARGET = ${TARGET_PREFIX}g++ +export LD_FOR_TARGET = ${TARGET_PREFIX}ld +export LIPO_FOR_TARGET = ${TARGET_PREFIX}lipo +export NM_FOR_TARGET = ${TARGET_PREFIX}nm +export OBJDUMP_FOR_TARGET = ${TARGET_PREFIX}objdump +export RANLIB_FOR_TARGET = ${TARGET_PREFIX}ranlib +export STRIP_FOR_TARGET = ${TARGET_PREFIX}strip +export WINDRES_FOR_TARGET = ${TARGET_PREFIX}windres + +# +# We need to override this and make sure the compiler can find staging +# +export ARCH_FLAGS_FOR_TARGET = --sysroot=${STAGING_DIR_TARGET} + +do_configure () { + export CC_FOR_BUILD=${BUILD_CC} + export CXX_FOR_BUILD=${BUILD_CXX} + export CFLAGS_FOR_BUILD=${BUILD_CFLAGS} + export CPPFLAGS_FOR_BUILD=${BUILD_CPPFLAGS} + export CXXFLAGS_FOR_BUILD=${BUILD_CXXFLAGS} + export LDFLAGS_FOR_BUILD=${BUILD_LDFLAGS} + export CFLAGS_FOR_TARGET=${TARGET_CFLAGS} +
[OE-core] [PATCH 24/28] gcc-cross.inc: Clean up after merge
* Remove the duplicate EXTRA_OECONF_PATHS that is overwritten * Merge the do_compile and do_compile_prepend * Group dependency and configuration variables together Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/gcc/gcc-cross.inc | 48 + 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index bf22101..a09fd54 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -1,26 +1,38 @@ inherit cross +INHIBIT_DEFAULT_DEPS = 1 +EXTRADEPENDS = DEPENDS = virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc ${EXTRADEPENDS} ${NATIVEDEPS} PROVIDES = virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ +python () { +if d.getVar(TARGET_OS, True).startswith(linux): +d.setVar(EXTRADEPENDS, linux-libc-headers) +} require gcc-configure-common.inc -EXTRA_OECONF += --enable-poison-system-directories \ - +EXTRA_OECONF += --enable-poison-system-directories +EXTRA_OECONF_append_sh4 = --with-multilib-list= --enable-incomplete-targets -INHIBIT_DEFAULT_DEPS = 1 +EXTRA_OECONF += --disable-libunwind-exceptions \ + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ + --with-system-zlib EXTRA_OECONF_PATHS = \ - --with-headers=${STAGING_DIR_TARGET}${SYSTEMHEADERS} \ - --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \ + --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \ --with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET} +ARCH_FLAGS_FOR_TARGET += -isystem${STAGING_DIR_TARGET}${target_includedir} + +LIBGCCS_VAR = -lgcc_s +LIBGCCS_VAR_avr32 = + do_configure_prepend () { sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure } -do_compile_prepend () { +do_compile () { export CC=${BUILD_CC} export AR_FOR_TARGET=${TARGET_SYS}-ar export RANLIB_FOR_TARGET=${TARGET_SYS}-ranlib @@ -31,18 +43,7 @@ do_compile_prepend () { export CPPFLAGS_FOR_TARGET=${TARGET_CPPFLAGS} export CXXFLAGS_FOR_TARGET=${TARGET_CXXFLAGS} export LDFLAGS_FOR_TARGET=${TARGET_LDFLAGS} -} - -LIBGCCS_VAR = -lgcc_s -LIBGCCS_VAR_avr32 = -EXTRADEPENDS = -python () { -if d.getVar(TARGET_OS, True).startswith(linux): -d.setVar(EXTRADEPENDS, linux-libc-headers) -} - -do_compile () { oe_runmake all-host all-target-libgcc # now generate script to drive testing echo #!/usr/bin/env sh ${B}/${TARGET_PREFIX}testgcc @@ -137,19 +138,6 @@ STOP } -EXTRA_OECONF_append_sh4 = --with-multilib-list= --enable-incomplete-targets - -EXTRA_OECONF += --disable-libunwind-exceptions \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ - --with-system-zlib - -EXTRA_OECONF_PATHS = \ - --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \ - --with-sysroot=${STAGING_DIR_TARGET} \ - --with-build-sysroot=${STAGING_DIR_TARGET} - -ARCH_FLAGS_FOR_TARGET += -isystem${STAGING_DIR_TARGET}${target_includedir} - INHIBIT_PACKAGE_STRIP = 1 # Compute how to get from libexecdir to bindir in python (easier than shell) -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/28] crosssdk: Construct target_exec_prefix from prefix_nativesdk
${exec_prefix_nativesdk} doesn't exist so use prefix_nativesdk instead. This resolves issues for code which attepts to use target_exec_prefix. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/classes/crosssdk.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index 32b14d3..810f61d 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass @@ -23,7 +23,7 @@ target_libdir = ${SDKPATHNATIVE}${libdir_nativesdk} target_includedir = ${SDKPATHNATIVE}${includedir_nativesdk} target_base_libdir = ${SDKPATHNATIVE}${base_libdir_nativesdk} target_prefix = ${SDKPATHNATIVE}${prefix_nativesdk} -target_exec_prefix = ${SDKPATHNATIVE}${exec_prefix_nativesdk} +target_exec_prefix = ${SDKPATHNATIVE}${prefix_nativesdk} baselib = lib do_populate_sysroot[stamp-extra-info] = -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 22/28] gcc-*-runtime.inc: Fold configuration into gcc-runtime.inc
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- .../recipes-devtools/gcc/gcc-configure-runtime.inc | 64 - meta/recipes-devtools/gcc/gcc-package-runtime.inc | 80 meta/recipes-devtools/gcc/gcc-runtime.inc | 145 + meta/recipes-devtools/gcc/gcc-runtime_4.7.bb | 3 +- meta/recipes-devtools/gcc/gcc-runtime_4.8.bb | 3 +- 5 files changed, 147 insertions(+), 148 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-configure-runtime.inc delete mode 100644 meta/recipes-devtools/gcc/gcc-package-runtime.inc create mode 100644 meta/recipes-devtools/gcc/gcc-runtime.inc diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc deleted file mode 100644 index 2ff8561..000 --- a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc +++ /dev/null @@ -1,64 +0,0 @@ -require gcc-configure-common.inc - -CXXFLAGS := ${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)} - -EXTRA_OECONF_PATHS = \ ---with-gxx-include-dir=${includedir}/c++/ \ ---with-sysroot=${STAGING_DIR_TARGET} \ ---with-build-sysroot=${STAGING_DIR_TARGET} - -ARCH_FLAGS_FOR_TARGET += -isystem${STAGING_INCDIR} - -EXTRA_OECONF += --disable-libunwind-exceptions -EXTRA_OECONF_append_linuxstdbase = --enable-clocale=gnu - -RUNTIMETARGET = libssp libstdc++-v3 libgomp -# ? -# libiberty -# libmudflap -# libgfortran - -do_configure () { - export CXX=${CXX} -nostdinc++ -nostdlib++ - mtarget=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` - target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` - cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget/* ${B} - for d in libgcc ${RUNTIMETARGET}; do - echo Configuring $d - rm -rf ${B}/$target/$d/ - mkdir -p ${B}/$target/$d/ - cd ${B}/$target/$d/ - chmod a+x ${S}/$d/configure - ${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} - done -} - -do_compile () { - target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` - for d in libgcc ${RUNTIMETARGET}; do - cd ${B}/$target/$d/ - oe_runmake MULTIBUILDTOP=${B}/$target/$d/ - done -} - -do_install () { - target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` - for d in ${RUNTIMETARGET}; do - cd ${B}/$target/$d/ - oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install - done - rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir - if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then - rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude - fi - if [ -d ${D}${infodir} ]; then - rmdir --ignore-fail-on-non-empty -p ${D}${infodir} - fi - chown -R root:root ${D} -} - -INHIBIT_DEFAULT_DEPS = 1 -DEPENDS = virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ libgcc -PROVIDES = virtual/${TARGET_PREFIX}compilerlibs - -BBCLASSEXTEND = nativesdk diff --git a/meta/recipes-devtools/gcc/gcc-package-runtime.inc b/meta/recipes-devtools/gcc/gcc-package-runtime.inc deleted file mode 100644 index 2e2f75a..000 --- a/meta/recipes-devtools/gcc/gcc-package-runtime.inc +++ /dev/null @@ -1,80 +0,0 @@ -PACKAGES = \ - ${PN}-dbg \ - libstdc++ \ - libstdc++-precompile-dev \ - libstdc++-dev \ - libstdc++-staticdev \ - libg2c \ - libg2c-dev \ - libssp \ - libssp-dev \ - libssp-staticdev \ - libgfortran \ - libgfortran-dev \ - libmudflap \ - libmudflap-dev \ - libgomp \ - libgomp-dev \ - libgomp-staticdev \ - -# The base package doesn't exist, so we clear the recommends. -RRECOMMENDS_${PN}-dbg = - -# include python debugging scripts -FILES_${PN}-dbg += \ - ${libdir}/libstdc++.so.*-gdb.py \ - ${datadir}/gcc-${BINV}/python/libstdcxx - -FILES_libg2c = ${target_libdir}/libg2c.so.* -FILES_libg2c-dev = \ - ${libdir}/libg2c.so \ - ${libdir}/libg2c.a \ - ${libdir}/libfrtbegin.a - -FILES_libstdc++ = ${libdir}/libstdc++.so.* -FILES_libstdc++-dev = \ - ${includedir}/c++/ \ - ${libdir}/libstdc++.so \ - ${libdir}/libstdc++.la \ - ${libdir}/libsupc++.la -FILES_libstdc++-staticdev = \ - ${libdir}/libstdc++.a \ - ${libdir}/libsupc++.a - -FILES_libstdc++-precompile-dev = ${includedir}/c++/${TARGET_SYS}/bits/*.gch - -FILES_libssp = ${libdir}/libssp.so.* -FILES_libssp-dev = \ - ${libdir}/libssp*.so \ - ${libdir}/libssp*_nonshared.a \ - ${libdir}/libssp*.la \ - ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ssp -FILES_libssp-staticdev = \ - ${libdir}/libssp*.a - -FILES_libgfortran = ${libdir}/libgfortran.so.* -FILES_libgfortran-dev = \ - ${libdir}/libgfortran.a \ - ${libdir}/libgfortran.so \ - ${libdir}/libgfortranbegin.a - -FILES_libmudflap = ${libdir}/libmudflap*.so.* -FILES_libmudflap-dev = \ - ${libdir}/libmudflap*.so \ -
[OE-core] [PATCH 19/28] libgcc: Move common code to libgcc.inc
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/gcc/libgcc.inc| 143 +++ meta/recipes-devtools/gcc/libgcc_4.7.bb | 144 +-- meta/recipes-devtools/gcc/libgcc_4.8.bb | 145 +--- 3 files changed, 145 insertions(+), 287 deletions(-) create mode 100644 meta/recipes-devtools/gcc/libgcc.inc diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc new file mode 100644 index 000..fe98238 --- /dev/null +++ b/meta/recipes-devtools/gcc/libgcc.inc @@ -0,0 +1,143 @@ +INHIBIT_DEFAULT_DEPS = 1 + +DEPENDS = virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ + +PACKAGES = \ + ${PN} \ + ${PN}-dev \ + ${PN}-dbg \ + libgcov-dev \ + + +FILES_${PN} = ${base_libdir}/libgcc*.so.* +FILES_${PN}-dev = \ + ${base_libdir}/libgcc*.so \ + ${libdir}/${TARGET_SYS}/${BINV}/*crt* \ + ${libdir}/${TARGET_SYS}/${BINV}/64 \ + ${libdir}/${TARGET_SYS}/${BINV}/32 \ + ${libdir}/${TARGET_SYS}/${BINV}/x32 \ + ${libdir}/${TARGET_SYS}/${BINV}/n32 \ + ${libdir}/${TARGET_SYS}/${BINV}/libgcc* +FILES_libgcov-dev = \ + ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \ + +FILES_${PN}-dbg += ${base_libdir}/.debug/ + +do_configure () { + target=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` + install -d ${D}${base_libdir} ${D}${libdir} + cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$target/* ${B} + mkdir -p ${B}/${BPN} + cd ${B}/${BPN} + chmod a+x ${S}/${BPN}/configure + ${S}/${BPN}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} +} + +do_compile () { + target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` + cd ${B}/${BPN} + oe_runmake MULTIBUILDTOP=${B}/$target/${BPN}/ +} + +do_install () { + target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` + cd ${B}/${BPN} + oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/${BPN}/ install + + # Move libgcc_s into /lib + mkdir -p ${D}${base_libdir} + 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 + fi + + # install the runtime in /usr/lib/ not in /usr/lib/gcc on target + # so that cross-gcc can find it in the sysroot + + mv ${D}${libdir}/gcc/* ${D}${libdir} + rm -rf ${D}${libdir}/gcc/ + # unwind.h is installed here which is shipped in gcc-cross + # as well as target gcc and they are identical so we dont + # ship one with libgcc here + rm -rf ${D}${libdir}/${TARGET_SYS}/${BINV}/include +} + +do_package[depends] += virtual/${MLPREFIX}libc:do_packagedata +do_package_write_ipk[depends] += virtual/${MLPREFIX}libc:do_packagedata +do_package_write_deb[depends] += virtual/${MLPREFIX}libc:do_packagedata +do_package_write_rpm[depends] += virtual/${MLPREFIX}libc:do_packagedata + +BBCLASSEXTEND = nativesdk + +INSANE_SKIP_${PN}-dev = staticdev +INSANE_SKIP_${MLPREFIX}libgcov-dev = staticdev + +addtask multilib_install after do_install before do_package do_populate_sysroot +# this makes multilib gcc files findable for target gcc +# e.g. +#/usr/lib/i586-pokymllib32-linux/4.7/ +# by creating this symlink to it +#/usr/lib64/x86_64-poky-linux/4.7/32 + +python do_multilib_install() { +import re + +multilibs = d.getVar('MULTILIB_VARIANTS', True) +if not multilibs or bb.data.inherits_class('nativesdk', d): +return + +binv = d.getVar('BINV', True) + +mlprefix = d.getVar('MLPREFIX', True) +if ('%slibgcc' % mlprefix) != d.getVar('PN', True): +return + +if mlprefix: +orig_tune = d.getVar('DEFAULTTUNE_MULTILIB_ORIGINAL', True) +orig_tune_params = get_tune_parameters(orig_tune, d) +orig_tune_baselib = orig_tune_params['baselib'] +orig_tune_bitness = orig_tune_baselib.replace('lib', '') +if not orig_tune_bitness: +orig_tune_bitness = '32' + +src = '../../../' + orig_tune_baselib + '/' + \ +d.getVar('TARGET_SYS_MULTILIB_ORIGINAL', True) + '/' + binv + '/' + +dest = d.getVar('D', True) + d.getVar('libdir', True) + '/' + \ +d.getVar('TARGET_SYS', True) + '/' + binv + '/' + orig_tune_bitness + +if os.path.lexists(dest): +os.unlink(dest) +os.symlink(src, dest) +return + + +for ml in multilibs.split(): +tune = d.getVar('DEFAULTTUNE_virtclass-multilib-' + ml, True) +if not tune: +bb.warn('DEFAULTTUNE_virtclass-multilib-%s is not defined. Skipping...' % ml) +continue + +tune_parameters = get_tune_parameters(tune, d) +tune_baselib = tune_parameters['baselib'] +if not tune_baselib: +bb.warn(Tune %s doesn't have a baselib set. Skipping... % tune) +continue + +tune_arch =
[OE-core] [PATCH 25/28] gcc-common.inc: Drop unused LIBGCCS_VAR variable
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/gcc/gcc-cross.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index a09fd54..25a3142 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -25,9 +25,6 @@ EXTRA_OECONF_PATHS = \ ARCH_FLAGS_FOR_TARGET += -isystem${STAGING_DIR_TARGET}${target_includedir} -LIBGCCS_VAR = -lgcc_s -LIBGCCS_VAR_avr32 = - do_configure_prepend () { sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure } -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 26/28] bitbake.conf: Work around dev symlink problems on darwin
On darwin, we have: libxxx.dylib - libxxx.Y.dylib compared to Linux which has: libxxx.so - libxxx.so.Y Our ordering of PACKAGES with -dev first and then ${PN} makes it impossible to match the files correctly using simple globbing. This makes darwin targets completely broken since both the libs and the dev symlinks end up in ${PN}-dev. Whilst this commit is a hack, it at least puts the files into ${PN} and allows the builds to be used. Symlinks don't take up much space so this isn't the end of the world. I'm open to better solutions to this. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/conf/bitbake.conf | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 4535f68..45a5221 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -259,14 +259,17 @@ RPROVIDES = MULTI_PROVIDER_WHITELIST = virtual/libintl virtual/libintl-native virtual/nativesdk-libintl virtual/xserver virtual/update-alternatives-native virtual/update-alternatives SOLIBS = .so.* -SOLIBS_darwin = .*.dylib -SOLIBS_darwin8 = .*.dylib -SOLIBS_darwin9 = .*.dylib +SOLIBS_darwin = .dylib +SOLIBS_darwin8 = .dylib +SOLIBS_darwin9 = .dylib SOLIBSDEV = .so -SOLIBSDEV_darwin = .dylib -SOLIBSDEV_darwin8 = .dylib -SOLIBSDEV_darwin9 = .dylib +# Due to the ordering of PACKAGES and the naming of the dev symlinks on darwin, +# we can't make the symlinks end up in the -dev packages easily at this point. This hack +# at least means builds aren't completely broken and symlinks don't take up much space. +SOLIBSDEV_darwin = .dylibbroken +SOLIBSDEV_darwin8 = .dylibbroken +SOLIBSDEV_darwin9 = .dylibbroken PACKAGE_BEFORE_PN ?= PACKAGES = ${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 16/28] gcc-cross: Fold common configuration into gcc-cross.inc
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/gcc/gcc-cross.inc| 12 meta/recipes-devtools/gcc/gcc-cross_4.7.bb | 11 --- meta/recipes-devtools/gcc/gcc-cross_4.8.bb | 11 --- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index 2913df7..c3542e2 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -108,3 +108,15 @@ STOP } EXTRA_OECONF_append_sh4 = --with-multilib-list= --enable-incomplete-targets + +EXTRA_OECONF += --disable-libunwind-exceptions \ + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ + --with-system-zlib + +EXTRA_OECONF_PATHS = \ + --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \ + --with-sysroot=${STAGING_DIR_TARGET} \ + --with-build-sysroot=${STAGING_DIR_TARGET} + + +ARCH_FLAGS_FOR_TARGET += -isystem${STAGING_DIR_TARGET}${target_includedir} diff --git a/meta/recipes-devtools/gcc/gcc-cross_4.7.bb b/meta/recipes-devtools/gcc/gcc-cross_4.7.bb index b02ea13..b43cca0 100644 --- a/meta/recipes-devtools/gcc/gcc-cross_4.7.bb +++ b/meta/recipes-devtools/gcc/gcc-cross_4.7.bb @@ -1,14 +1,3 @@ require recipes-devtools/gcc/gcc-${PV}.inc require gcc-cross.inc -EXTRA_OECONF += --disable-libunwind-exceptions \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ - --with-system-zlib - -EXTRA_OECONF_PATHS = \ - --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \ - --with-sysroot=${STAGING_DIR_TARGET} \ - --with-build-sysroot=${STAGING_DIR_TARGET} - - -ARCH_FLAGS_FOR_TARGET += -isystem${STAGING_DIR_TARGET}${target_includedir} diff --git a/meta/recipes-devtools/gcc/gcc-cross_4.8.bb b/meta/recipes-devtools/gcc/gcc-cross_4.8.bb index b02ea13..b43cca0 100644 --- a/meta/recipes-devtools/gcc/gcc-cross_4.8.bb +++ b/meta/recipes-devtools/gcc/gcc-cross_4.8.bb @@ -1,14 +1,3 @@ require recipes-devtools/gcc/gcc-${PV}.inc require gcc-cross.inc -EXTRA_OECONF += --disable-libunwind-exceptions \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ - --with-system-zlib - -EXTRA_OECONF_PATHS = \ - --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \ - --with-sysroot=${STAGING_DIR_TARGET} \ - --with-build-sysroot=${STAGING_DIR_TARGET} - - -ARCH_FLAGS_FOR_TARGET += -isystem${STAGING_DIR_TARGET}${target_includedir} -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 20/28] gcc-target: Combine gcc-target-configure.inc, gcc-target-package.inc and other common code
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/gcc/gcc-configure-target.inc | 8 -- meta/recipes-devtools/gcc/gcc-package-target.inc | 142 --- meta/recipes-devtools/gcc/gcc-target.inc | 153 + meta/recipes-devtools/gcc/gcc_4.7.bb | 5 +- meta/recipes-devtools/gcc/gcc_4.8.bb | 5 +- 5 files changed, 155 insertions(+), 158 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-configure-target.inc delete mode 100644 meta/recipes-devtools/gcc/gcc-package-target.inc create mode 100644 meta/recipes-devtools/gcc/gcc-target.inc diff --git a/meta/recipes-devtools/gcc/gcc-configure-target.inc b/meta/recipes-devtools/gcc/gcc-configure-target.inc deleted file mode 100644 index 5f608d6..000 --- a/meta/recipes-devtools/gcc/gcc-configure-target.inc +++ /dev/null @@ -1,8 +0,0 @@ -GCCMULTILIB = --enable-multilib -require gcc-configure-common.inc - -EXTRA_OECONF_PATHS = \ ---with-sysroot=/ \ ---with-build-sysroot=${STAGING_DIR_TARGET} \ ---with-native-system-header-dir=${STAGING_DIR_TARGET}${target_includedir} \ ---with-gxx-include-dir=${includedir}/c++/ --enable-dependency-tracking diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc deleted file mode 100644 index 95a92c1..000 --- a/meta/recipes-devtools/gcc/gcc-package-target.inc +++ /dev/null @@ -1,142 +0,0 @@ -PACKAGES = \ - ${PN} ${PN}-plugins ${PN}-symlinks \ - g++ g++-symlinks \ - cpp cpp-symlinks \ - g77 g77-symlinks \ - gfortran gfortran-symlinks \ - gcov gcov-symlinks \ - ${PN}-plugin-dev \ - ${PN}-doc \ - ${PN}-dev \ - ${PN}-dbg \ - - -FILES_${PN} = \ - ${bindir}/${TARGET_PREFIX}gcc* \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc* \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto*${SOLIBSDEV} \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/include \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \ - -INSANE_SKIP_${PN} += dev-so - -FILES_${PN}-dbg += \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/.debug/ \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/.debug/ \ - -FILES_${PN}-dev = \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ - -FILES_${PN}-plugin-dev = \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/gengtype \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/gtype.state \ - -FILES_${PN}-symlinks = \ - ${bindir}/cc \ - ${bindir}/gcc \ - ${bindir}/gccbug \ - - -FILES_${PN}-plugins = \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin \ - -ALLOW_EMPTY_${PN}-plugins = 1 - -FILES_g77 = \ - ${bindir}/${TARGET_PREFIX}g77 \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \ - -FILES_g77-symlinks = \ - ${bindir}/g77 \ - ${bindir}/f77 \ - -FILES_gfortran = \ - ${bindir}/${TARGET_PREFIX}gfortran \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \ - -FILES_gfortran-symlinks = \ - ${bindir}/gfortran \ - ${bindir}/f95 - -FILES_cpp = \ - ${bindir}/${TARGET_PREFIX}cpp \ - ${base_libdir}/cpp \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1 -FILES_cpp-symlinks = ${bindir}/cpp - -FILES_gcov = ${bindir}/${TARGET_PREFIX}gcov -FILES_gcov-symlinks = ${bindir}/gcov - -FILES_g++ = \ - ${bindir}/${TARGET_PREFIX}g++ \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \ - -FILES_g++-symlinks = \ - ${bindir}/c++ \ - ${bindir}/g++ \ - - - -FILES_${PN}-doc = \ - ${infodir} \ - ${mandir} \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \ - - -do_install () { - oe_runmake 'DESTDIR=${D}' install-host - - # Cleanup some of the ${libdir}{,exec}/gcc stuff ... - rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools - rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools - rm -rf ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la - rmdir ${D}${includedir} - - # Hack around specs file assumptions - test -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs - - # Cleanup manpages.. - rm -rf ${D}${mandir}/man7 - - cd ${D}${bindir} - - # We care about g++ not c++ - rm -f *c++ - - # We don't care about the gcc-version ones for this - rm -f *gcc-?.?* - - # We use libiberty from binutils - find ${D}${libdir} -name libiberty.a | xargs rm -f - find ${D}${libdir} -name libiberty.h | xargs rm -f - - # Not sure why we end up with these but we don't want them... - rm -f ${TARGET_PREFIX}${TARGET_PREFIX}* - -
[OE-core] [PATCH 28/28] chrpath: Add support for relocating darwin binaries
On darwin, install_name_tool can be used to relocate binaries/libraries. This adds support for adjusting them with relative paths rather than hardcoded ones. The Linux code is factored out into a function but is otherwise unchanged. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/classes/chrpath.bbclass | 138 +++ 1 file changed, 88 insertions(+), 50 deletions(-) diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass index 0c7ab77..61a24b3 100644 --- a/meta/classes/chrpath.bbclass +++ b/meta/classes/chrpath.bbclass @@ -1,18 +1,103 @@ CHRPATH_BIN ?= chrpath PREPROCESS_RELOCATE_DIRS ?= -def process_dir (directory, d): +def process_file_linux(cmd, fpath, basedir, tmpdir, d): import subprocess as sub + +p = sub.Popen([cmd, '-l', fpath],stdout=sub.PIPE,stderr=sub.PIPE) +err, out = p.communicate() +# If returned succesfully, process stderr for results +if p.returncode != 0: +return + +# Throw away everything other than the rpath list +curr_rpath = err.partition(RPATH=)[2] +#bb.note(Current rpath for %s is %s % (fpath, curr_rpath.strip())) +rpaths = curr_rpath.split(:) +new_rpaths = [] +for rpath in rpaths: +# If rpath is already dynamic copy it to new_rpath and continue +if rpath.find($ORIGIN) != -1: +new_rpaths.append(rpath.strip()) +continue +rpath = os.path.normpath(rpath) +# If the rpath shares a root with base_prefix determine a new dynamic rpath from the +# base_prefix shared root +if rpath.find(basedir) != -1: +depth = fpath.partition(basedir)[2].count('/') +libpath = rpath.partition(basedir)[2].strip() +# otherwise (i.e. cross packages) determine a shared root based on the TMPDIR +# NOTE: This will not work reliably for cross packages, particularly in the case +# where your TMPDIR is a short path (i.e. /usr/poky) as chrpath cannot insert an +# rpath longer than that which is already set. +elif rpath.find(tmpdir) != -1: +depth = fpath.rpartition(tmpdir)[2].count('/') +libpath = rpath.partition(tmpdir)[2].strip() +else: +new_rpaths.append(rpath.strip()) +return +base = $ORIGIN +while depth 1: +base += /.. +depth-=1 +new_rpaths.append(%s%s % (base, libpath)) + +# if we have modified some rpaths call chrpath to update the binary +if len(new_rpaths): +args = :.join(new_rpaths) +#bb.note(Setting rpath for %s to %s %(fpath, args)) +p = sub.Popen([cmd, '-r', args, fpath],stdout=sub.PIPE,stderr=sub.PIPE) +out, err = p.communicate() +if p.returncode != 0: +bb.error(%s: chrpath command failed with exit code %d:\n%s%s % (d.getVar('PN', True), p.returncode, out, err)) +raise bb.build.FuncFailed + +def process_file_darwin(cmd, fpath, basedir, tmpdir, d): +import subprocess as sub + +p = sub.Popen([d.expand(${HOST_PREFIX}otool), '-L', fpath],stdout=sub.PIPE,stderr=sub.PIPE) +err, out = p.communicate() +# If returned succesfully, process stderr for results +if p.returncode != 0: +return +for l in err.split(\n): +if (compatibility not in l: +continue +rpath = l.partition((compatibility)[0].strip() +if rpath.find(basedir) != -1: +depth = fpath.partition(basedir)[2].count('/') +libpath = rpath.partition(basedir)[2].strip() +else: +continue + +base = @loader_path +while depth 1: +base += /.. +depth-=1 +base = base + libpath +p = sub.Popen([d.expand(${HOST_PREFIX}install_name_tool), '-change', rpath, base, fpath],stdout=sub.PIPE,stderr=sub.PIPE) +err, out = p.communicate() + +def process_dir (directory, d): import stat cmd = d.expand('${CHRPATH_BIN}') tmpdir = os.path.normpath(d.getVar('TMPDIR')) basedir = os.path.normpath(d.expand('${base_prefix}')) +hostos = d.getVar(HOST_OS, True) #bb.debug(Checking %s for binaries to process % directory) if not os.path.exists(directory): return +if linux in hostos: +process_file = process_file_linux +elif darwin in hostos: +process_file = process_file_darwin +else: +# Relocations not supported +return + dirs = os.listdir(directory) for file in dirs: fpath = directory + / + file @@ -35,55 +120,8 @@ def process_dir (directory, d): else: # Temporarily make the file writeable so we can chrpath it os.chmod(fpath, perms|stat.S_IRWXU) - -p = sub.Popen([cmd, '-l', fpath],stdout=sub.PIPE,stderr=sub.PIPE) -err, out = p.communicate() -# If returned succesfully, process stderr
[OE-core] [PATCH 10/28] gcc: Drop gcc-cross4.inc, its pointless now
The include was useful historically, its not anymore so lets remove it. This should have no functional change except on any layers directly depending on it or gcc-cross.inc but even then it would only impact sh4 and is easily fixed if there was a problem. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/gcc/gcc-cross.inc| 2 ++ meta/recipes-devtools/gcc/gcc-cross4.inc | 3 --- meta/recipes-devtools/gcc/gcc-cross_4.7.bb | 2 +- meta/recipes-devtools/gcc/gcc-cross_4.8.bb | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-cross4.inc diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index 9d29f56..2913df7 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -106,3 +106,5 @@ STOP chmod +x ${B}/${TARGET_PREFIX}testgcc } + +EXTRA_OECONF_append_sh4 = --with-multilib-list= --enable-incomplete-targets diff --git a/meta/recipes-devtools/gcc/gcc-cross4.inc b/meta/recipes-devtools/gcc/gcc-cross4.inc deleted file mode 100644 index 4a20818..000 --- a/meta/recipes-devtools/gcc/gcc-cross4.inc +++ /dev/null @@ -1,3 +0,0 @@ -require gcc-cross.inc - -EXTRA_OECONF_append_sh4 = --with-multilib-list= --enable-incomplete-targets diff --git a/meta/recipes-devtools/gcc/gcc-cross_4.7.bb b/meta/recipes-devtools/gcc/gcc-cross_4.7.bb index d605235..b02ea13 100644 --- a/meta/recipes-devtools/gcc/gcc-cross_4.7.bb +++ b/meta/recipes-devtools/gcc/gcc-cross_4.7.bb @@ -1,5 +1,5 @@ require recipes-devtools/gcc/gcc-${PV}.inc -require gcc-cross4.inc +require gcc-cross.inc EXTRA_OECONF += --disable-libunwind-exceptions \ --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ diff --git a/meta/recipes-devtools/gcc/gcc-cross_4.8.bb b/meta/recipes-devtools/gcc/gcc-cross_4.8.bb index d605235..b02ea13 100644 --- a/meta/recipes-devtools/gcc/gcc-cross_4.8.bb +++ b/meta/recipes-devtools/gcc/gcc-cross_4.8.bb @@ -1,5 +1,5 @@ require recipes-devtools/gcc/gcc-${PV}.inc -require gcc-cross4.inc +require gcc-cross.inc EXTRA_OECONF += --disable-libunwind-exceptions \ --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/28] gcc-configure-sdk.inc: Don't build target-libgcc
I don't understand why we're building the target libgcc in the canadian-cross build since it should have been built elsewhere. The compiler configuration isn't correct to build a working target libgcc in all cases anyway. To avoid various weird build errors, stop building it. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/gcc/gcc-configure-sdk.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc index 51c0217..6c55bc7 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc @@ -43,5 +43,5 @@ do_configure () { } do_compile () { - oe_runmake all-host all-target-libgcc + oe_runmake all-host } -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/28] gettext: Improve USE_NLS handling for nativesdk/crosssdk/cross-canadian
The gettext handling of USE_NLS has become a bit tricky to understand, or alter from the SDK context. This patch introduces a SDKUSE_NLS which can be set to configure a given SDK/ADT to use NLS or not. This is independent of the target system NLS usage. The code in gettext.bbclass is therefore simplified and the classes themselves now set USE_NLS to appropriate values. No NLS is used for native, cross and crosssdk since it is never used there and would just increase build time. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/classes/cross-canadian.bbclass | 2 ++ meta/classes/cross.bbclass | 2 ++ meta/classes/crosssdk.bbclass | 2 ++ meta/classes/gettext.bbclass| 8 +++- meta/classes/native.bbclass | 2 ++ meta/classes/nativesdk.bbclass | 2 ++ meta/conf/bitbake.conf | 1 + 7 files changed, 14 insertions(+), 5 deletions(-) diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index 7ab36ac..fa2ab70 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -94,3 +94,5 @@ SHLIBSDIRS = ${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}/ SHLIBSDIR = ${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}/shlibs/ do_populate_sysroot[stamp-extra-info] = + +USE_NLS = ${SDKUSE_NLS} diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index 54584fe..f6e7dc1 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -75,3 +75,5 @@ cross_virtclass_handler[eventmask] = bb.event.RecipePreFinalise do_install () { oe_runmake 'DESTDIR=${D}' install } + +USE_NLS = no diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index 810f61d..635c0c4 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass @@ -30,3 +30,5 @@ do_populate_sysroot[stamp-extra-info] = # Need to force this to ensure consitency accross architectures EXTRA_OECONF_FPU = + +USE_NLS = no diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass index 17c894f..03b89b2 100644 --- a/meta/classes/gettext.bbclass +++ b/meta/classes/gettext.bbclass @@ -1,17 +1,15 @@ def gettext_dependencies(d): -if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'native', 'nativesdk', 'cross'): -return if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'): return -if oe.utils.inherits(d, 'native', 'cross'): +if d.getVar('USE_NLS', True) == 'no': return gettext-minimal-native return d.getVar('DEPENDS_GETTEXT', False) def gettext_oeconf(d): -if oe.utils.inherits(d, 'native', 'cross'): +if d.getVar('USE_NLS', True) == 'no': return '--disable-nls' # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set -if (d.getVar('USE_NLS', True) == 'no' or d.getVar('INHIBIT_DEFAULT_DEPS', True)) and not oe.utils.inherits(d, 'nativesdk', 'cross-canadian'): +if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'): return '--disable-nls' return --enable-nls diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 04f0d06..102dfb8 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -158,3 +158,5 @@ do_package_write_deb[noexec] = 1 do_package_write_rpm[noexec] = 1 do_populate_sysroot[stamp-extra-info] = + +USE_NLS = no diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index 96e1b42..5b9d1f5 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -89,3 +89,5 @@ addhandler nativesdk_virtclass_handler nativesdk_virtclass_handler[eventmask] = bb.event.RecipePreFinalise do_populate_sysroot[stamp-extra-info] = + +USE_NLS = ${SDKUSE_NLS} diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 07eb473..8ae3ad2 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -110,6 +110,7 @@ TUNE_FEATURES ??= ${TUNE_FEATURES_tune-${DEFAULTTUNE}} LIBCEXTENSION ??= ABIEXTENSION ??= USE_NLS ??= yes +SDKUSE_NLS ??= yes TARGET_ARCH = ${TUNE_ARCH} TARGET_OS = linux${LIBCEXTENSION}${ABIEXTENSION} -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/28] gcc-cross-canadian-4.8: Enable PARALLEL_MAKE
This disabling of PARALLEL_MAKE has been forward ported for gcc-cross-canadian since at least 2009-09 and gcc 4.3.3, probably older. I've tested this with high values of parallel make and it all seems to work and we usually build gcc with parallel make so it seems unlikely there are issues. Lets therefore enable it. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb index 53c4632..278a529 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb @@ -20,7 +20,5 @@ EXTRA_OECONF += --disable-libunwind-exceptions --disable-libssp \ # to find libmpfr # export LD_LIBRARY_PATH = {STAGING_DIR_HOST}${layout_exec_prefix} -PARALLEL_MAKE = - # gcc 4.7 needs -isystem export ARCH_FLAGS_FOR_TARGET = --sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir} -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 27/28] Drop darwin8/darwin9 usage
There were darwin8/darwin9 overrides spinkled in the code from times gone by. Lets settle on the darwin override and remove the others since its pointless duplication. We always inject darwin into OVERRIDES if needed in the darwin8/9 cases. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/conf/bitbake.conf | 4 meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb | 2 +- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb| 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 45a5221..05259b2 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -260,16 +260,12 @@ MULTI_PROVIDER_WHITELIST = virtual/libintl virtual/libintl-native virtual/nativ SOLIBS = .so.* SOLIBS_darwin = .dylib -SOLIBS_darwin8 = .dylib -SOLIBS_darwin9 = .dylib SOLIBSDEV = .so # Due to the ordering of PACKAGES and the naming of the dev symlinks on darwin, # we can't make the symlinks end up in the -dev packages easily at this point. This hack # at least means builds aren't completely broken and symlinks don't take up much space. SOLIBSDEV_darwin = .dylibbroken -SOLIBSDEV_darwin8 = .dylibbroken -SOLIBSDEV_darwin9 = .dylibbroken PACKAGE_BEFORE_PN ?= PACKAGES = ${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb index 63fea28..84fb95d 100644 --- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb @@ -22,7 +22,7 @@ RDEPENDS_${PN} = \ nativesdk-automake \ -RDEPENDS_${PN}_darwin8 = \ +RDEPENDS_${PN}_darwin = \ odcctools-cross-canadian \ llvm-cross-canadian \ nativesdk-pkgconfig \ diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb index d231268..928a0cd 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb @@ -10,7 +10,6 @@ SRC_URI[sha256sum] = b984aaf1fe888d6a4cf8c2e8d397207879599b5368f1d33232c1ec9d68 EXTRA_OECONF += --libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd EXTRA_OECONF_darwin = --libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs -EXTRA_OECONF_darwin8 = --libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs do_configure_prepend () { cp ${WORKDIR}/acinclude.m4 ${S}/ -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 15/28] bitbake.conf/classes/gcc: Don't hardcode -nativesdk
Hardcoding -nativesdk as the sdk package architecture is inflexible. We may have multiple different target OS and we need a way to be able to separate them. Turning this into a configurable value allows the flexibility we need to build different SDKMACHINEs with different OS targets. The commit should have no behaviour change, just makes things more configurable. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/classes/cross-canadian.bbclass | 16 meta/classes/crosssdk.bbclass | 2 +- meta/classes/nativesdk.bbclass | 2 +- meta/conf/bitbake.conf | 3 ++- meta/recipes-devtools/gcc/gcc-configure-runtime.inc | 8 meta/recipes-devtools/gcc/libgcc_4.7.bb | 6 +++--- meta/recipes-devtools/gcc/libgcc_4.8.bb | 6 +++--- 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index fa2ab70..87dd994 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -14,25 +14,25 @@ STAGING_BINDIR_TOOLCHAIN = ${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${S # # Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS # -PACKAGE_ARCH = ${SDK_ARCH}-nativesdk +PACKAGE_ARCH = ${SDK_ARCH}-${SDKPKGSUFFIX} python () { archs = d.getVar('PACKAGE_ARCHS', True).split() sdkarchs = [] for arch in archs: -sdkarchs.append(arch + '-nativesdk') +sdkarchs.append(arch + '-${SDKPKGSUFFIX}') d.setVar('PACKAGE_ARCHS', .join(sdkarchs)) } MULTIMACH_TARGET_SYS = ${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS} INHIBIT_DEFAULT_DEPS = 1 -STAGING_DIR_HOST = ${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS} +STAGING_DIR_HOST = ${STAGING_DIR}/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS} -TOOLCHAIN_OPTIONS = --sysroot=${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS} +TOOLCHAIN_OPTIONS = --sysroot=${STAGING_DIR}/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS} PATH_append = :${TMPDIR}/sysroots/${HOST_ARCH}/${bindir_cross} -PKGDATA_DIR = ${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS} -PKGHIST_DIR = ${TMPDIR}/pkghistory/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}/ +PKGDATA_DIR = ${TMPDIR}/pkgdata/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS} +PKGHIST_DIR = ${TMPDIR}/pkghistory/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}/ HOST_ARCH = ${SDK_ARCH} HOST_VENDOR = ${SDK_VENDOR} @@ -90,8 +90,8 @@ export PKG_CONFIG_DIR = ${STAGING_DIR_HOST}${layout_libdir}/pkgconfig export PKG_CONFIG_SYSROOT_DIR = ${STAGING_DIR_HOST} # Cross-canadian packages need to pull in nativesdk dynamic libs -SHLIBSDIRS = ${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}/shlibs/ ${TMPDIR}/pkgdata/all-${HOST_VENDOR}-${HOST_OS}/shlibs/ -SHLIBSDIR = ${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}/shlibs/ +SHLIBSDIRS = ${TMPDIR}/pkgdata/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}/shlibs/ ${TMPDIR}/pkgdata/all-${HOST_VENDOR}-${HOST_OS}/shlibs/ +SHLIBSDIR = ${TMPDIR}/pkgdata/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}/shlibs/ do_populate_sysroot[stamp-extra-info] = diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index 635c0c4..bcc285b 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass @@ -7,7 +7,7 @@ python () { d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH', True)) } -STAGING_DIR_TARGET = ${STAGING_DIR}/${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS} +STAGING_DIR_TARGET = ${STAGING_DIR}/${SDK_ARCH}-${SDKPKGSUFFIX}${SDK_VENDOR}-${SDK_OS} STAGING_BINDIR_TOOLCHAIN = ${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS} TARGET_ARCH = ${SDK_ARCH} diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index 0d5cba4..26d1e4a 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -11,7 +11,7 @@ CLASSOVERRIDE = class-nativesdk # # Update PACKAGE_ARCH and PACKAGE_ARCHS # -PACKAGE_ARCH = ${SDK_ARCH}-nativesdk +PACKAGE_ARCH = ${SDK_ARCH}-${SDKPKGSUFFIX} PACKAGE_ARCHS = ${SDK_PACKAGE_ARCHS} # diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 8ae3ad2..4535f68 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -127,7 +127,8 @@ SDK_VENDOR = -oesdk SDK_SYS = ${SDK_ARCH}${SDK_VENDOR}${@['-' + d.getVar('SDK_OS', True), ''][d.getVar('SDK_OS', True) == ('' or 'custom')]} SDK_PREFIX = ${SDK_SYS}- SDK_CC_ARCH = ${BUILD_CC_ARCH} -SDK_PACKAGE_ARCHS = all any noarch ${SDK_ARCH}-nativesdk +SDKPKGSUFFIX = nativesdk +SDK_PACKAGE_ARCHS = all any noarch ${SDK_ARCH}-${SDKPKGSUFFIX} SDK_LD_ARCH = ${BUILD_LD_ARCH} SDK_AS_ARCH = ${BUILD_AS_ARCH} diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
[OE-core] [PATCH 07/28] gcc-package-sdk.inc: Use relative symlinks in libexec dir
We already use relative links for other gcc libexec links, this changes the sdk do_install to match elsewhere and use relative symlinks too. This makes things slightly easier in the SDK installation process and standardises. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/gcc/gcc-package-sdk.inc | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gcc/gcc-package-sdk.inc b/meta/recipes-devtools/gcc/gcc-package-sdk.inc index bb6dfde..b546d5c 100644 --- a/meta/recipes-devtools/gcc/gcc-package-sdk.inc +++ b/meta/recipes-devtools/gcc/gcc-package-sdk.inc @@ -28,6 +28,9 @@ FILES_${PN}-doc = \ ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \ +# Compute how to get from libexecdir to bindir in python (easier than shell) +BINRELPATH = ${@oe.path.relative(d.expand(${libexecdir}/gcc/${TARGET_SYS}/${BINV}), d.expand(${bindir}))} + do_install () { oe_runmake 'DESTDIR=${D}' install-host @@ -64,7 +67,7 @@ do_install () { continue fi - ln -sf ${bindir}/${TARGET_PREFIX}$t $dest$t + ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t done chown -R root:root ${D} -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 14/28] Revert nativesdk: inherit relocatable
This reverts commit f93ddea31fcf18833c9bc6e93d93ad223c62eded. We never run nativesdk binaries so it doesn't make sense to use the relocatable class. The chrpath calls at packaging time will ensure the binaries are relocated in the final packages. The binaries in the sysroot are never used. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/classes/nativesdk.bbclass | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index 5b9d1f5..0d5cba4 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -1,5 +1,3 @@ -inherit relocatable - # SDK packages are built either explicitly by the user, # or indirectly via dependency. No need to be in 'world'. EXCLUDE_FROM_WORLD = 1 -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/28] Toolchain tweaks
Playing with meta-mingw, it was clear that there were some simple changes we could make to the core that would improve things for non-linux SDKs. This series includes those changes. Since I like pain, I also attempted a darwin build and have included some tweaks for that too. When looking at the gcc recipes, it also became clear that we have way too many include files and the whole thing was a bit of a maze. The series has some changes in to combine various files together and simplify things. I appreciate this may complicate moving things into meta-oe such as gcc 4.7. I would propose when we do that, we put them into recipes-gcc-version and include a snapshot of the .inc files at that time. The alternative is the continual copy and paste growth of the .bb files (libgcc being a more extreme example) which I don't think lends itself to future maintenance of the recipes. There are some layers which for example use gcc-cross4.inc, they should just be able to switch directly to gcc-cross.inc. I think this applies to meta-arago-extras. This also leads the way to possibly further unify and clean up some of the configuration (e.g. the do_configure_prepends) but I will leave that for another series when someone has some further time to spend on it. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH][for-dylan] bluez4: fix network Connect parameter validation
On 08/22/2013 04:46 AM, Burton, Ross wrote: On 21 August 2013 23:47, Peter A. Bigot p...@pabigot.com wrote: The incorrect validation prevents connection to the NAP service on another device. Is this intended for master as well as dylan? At the moment, no. I have not been actively developing under master yet so have not tested it there. However, if Yocto 1.5 will still provide bluez4-101 (which was the last bluez4 release) the patch will be needed. I thought there was some discussion of moving to bluez5 with a compatibility layer (again which I have not personally tested). Peter ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)!
On Thu, Aug 22, 2013 at 7:20 AM, Richard Purdie richard.pur...@linuxfoundation.org wrote: On Thu, 2013-08-22 at 10:07 +0100, Paul Eggleton wrote: On Wednesday 21 August 2013 22:58:55 Saul Wold wrote: Marko Lindqvist (3): texinfo: correct dont-depend-on-help2man.patch SDL2: add recipe boost: fix build when PARALLEL_MAKE is not set Otavio Salvador (1): distro_features_check.bbclass: Allow checking of required/conflicting features I should have asked this earlier - why does this need to be a separate bbclass? The code doesn't do anything if the variables aren't set, so it can't be because it could have an impact on existing setups that don't set them. FWIW I do have a worry about the shear weight of the core these days as we're building up piles of anonymous python for example. In many ways I therefore like the idea of having more classes which get included when they're needed. That's why I splitted it in a class. I agree with your concern about base growing ;-) -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)!
On Thursday 22 August 2013 11:20:46 Richard Purdie wrote: On Thu, 2013-08-22 at 10:07 +0100, Paul Eggleton wrote: On Wednesday 21 August 2013 22:58:55 Saul Wold wrote: Marko Lindqvist (3): texinfo: correct dont-depend-on-help2man.patch SDL2: add recipe boost: fix build when PARALLEL_MAKE is not set Otavio Salvador (1): distro_features_check.bbclass: Allow checking of required/conflicting features I should have asked this earlier - why does this need to be a separate bbclass? The code doesn't do anything if the variables aren't set, so it can't be because it could have an impact on existing setups that don't set them. FWIW I do have a worry about the shear weight of the core these days as we're building up piles of anonymous python for example. In many ways I therefore like the idea of having more classes which get included when they're needed. For something like this though it just increases complexity for users - unlike other optional class-supported functionality it's not even clear from the variable name that you'll need to inherit the class before they can be used. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] qemu-native build regularly failing
On Thursday 22 August 2013 15:56:39 Marko Lindqvist wrote: On 21 August 2013 19:33, Marko Lindqvist cazf...@gmail.com wrote: On 21 August 2013 01:15, Marko Lindqvist cazf...@gmail.com wrote: On 21 August 2013 00:16, Paul Eggleton paul.eggle...@linux.intel.com wrote: On Tuesday 20 August 2013 23:26:44 Marko Lindqvist wrote: On 20 August 2013 16:32, Paul Eggleton paul.eggle...@linux.intel.com wrote: On Tuesday 20 August 2013 15:51:21 Marko Lindqvist wrote: Build of qemu-native regularly fails with: | LINK sh4-softmmu/qemu-system-sh4 | | /usr/lib/x86_64-linux-gnu/libXext.so.6: undefined reference to `_XEatDataWords' | collect2: error: ld returned 1 exit status This might be some dependency missing, as building first some packets (+ more importantly their dependencies) that do not depend on qemu and only then qemu dependant image success. Do you have something else causing libxext-native to be built by any chance? Yes, it seems to be difference between the tree where build fails and the one where build success that former has no libxext-native built. Further, I tested just building libxext-native before building qemu-native, and then the build succeded. The problem is we want qemu-native to be buildable both on systems without X11 and systems with X11, so the dependency has to be floating, and this is more or less acceptable for a native recipe - there's only a problem when libxext- native needs to be built. I can't see a lot of value in building libxext- native in any case - what is causing it to be built on your system? Cheers, Paul I'm still running more tests - this seems to be complicated matter. For one, I just got successful build from empty tree by building qemu-native directly. That was build targeted to arm, while failing builds have been for x86 (native is amd64). Also, I think (but cannot be 100% sure any more) build has succeeded on trees where nothing depends on libxext-native but still *something* was needed to be built before qemu-native. It seems libxext-native is not needed. Rather this seems like problem with build parallelism. - Sometimes bitbake qemu-native to empty tree success at once - When it first fails (but other tasks get executed while it tries to build), it then success by forcing configure rerun building ( bitbake qemu-native -c configure -f bitbake qemu-native ) I think next step is to get config.log of the succesful and failed build to compare. --- success-qemu/qemu-1.5.0/config-host.h 2013-08-22 15:45:10.323126880 +0300 +++ failed-qemu/qemu-1.5.0/config-host.h2013-08-22 15:32:23.515101072 +0300 @@ -26,6 +26,7 @@ #define CONFIG_UUID 1 #define QEMU_VERSION 1.5.0 #define QEMU_PKGVERSION +#define CONFIG_SDL 1 #define CONFIG_CURSES 1 #define CONFIG_ATFILE 1 #define CONFIG_UTIMENSAT 1 @@ -55,6 +56,7 @@ #define CONFIG_MADVISE 1 #define CONFIG_POSIX_MADVISE 1 #define CONFIG_SIGEV_THREAD_ID 1 +#define CONFIG_GLX 1 #define CONFIG_UNAME_RELEASE #define CONFIG_ZERO_MALLOC 1 #define CONFIG_QOM_CAST_DEBUG 1 As this diff is success - failed, CONFIG_GLX and CONFIG_SDL are defined on first build ending to failure, but not on forced reconfigure that then build succesfully. You'd probably need to dig into the actual configure check that enables these automatically. I was about to suggest maybe libsdl-native was present in the failing case, but then the current libsdl recipe in OE-Core doesn't provide libsdl-native so that probably isn't it... Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] e2fsprogs: only update the icache for ext2_inode
We only read the cache when: bufsize == sizeof(struct ext2_inode) then we should only update the cache in the same condition, otherwise there would be errors, for example: cache[0]: cached ino 14 when bufsize = 128 by ext2fs_write_inode_full() cache[1]: cached ino 14 when bufsize = 156 by ext2fs_read_inode_full() Then update the cache: cache[0]: cached ino 15 when bufsize = 156 by ext2fs_read_inode_full() Then the ino 14 would hit the cache[1] when bufsize = 128 (but it was cached by bufsize = 156), so there would be errors. [YOCTO #3848] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- .../e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch| 69 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |1 + 2 files changed, 70 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch new file mode 100644 index 000..ad4e343 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch @@ -0,0 +1,69 @@ +inode.c: only update the icache for ext2_inode + +We only read the cache when: + +bufsize == sizeof(struct ext2_inode) + +then we should only update the cache in the same condition, otherwise +there would be errors, for example: + +cache[0]: cached ino 14 when bufsize = 128 by ext2fs_write_inode_full() +cache[1]: cached ino 14 when bufsize = 156 by ext2fs_read_inode_full() + +Then update the cache: +cache[0]: cached ino 15 when bufsize = 156 by ext2fs_read_inode_full() + +Then the ino 14 would hit the cache[1] when bufsize = 128 (but it was +cached by bufsize = 156), so there would be errors. + +Note: the upstream has changed the icache lot, so this patch is +inappropriate for the upstream, we can drop this patch when we update +the package. + +Upstream-Status: [Inappropriate] + +Signed-off-by: Robert Yang liezhi.y...@windriver.com +--- + lib/ext2fs/inode.c | 20 + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/lib/ext2fs/inode.c b/lib/ext2fs/inode.c +--- a/lib/ext2fs/inode.c b/lib/ext2fs/inode.c +@@ -612,10 +612,12 @@ errcode_t ext2fs_read_inode_full(ext2_filsys fs, ext2_ino_t ino, + #endif + + /* Update the inode cache */ +- fs-icache-cache_last = (fs-icache-cache_last + 1) % +- fs-icache-cache_size; +- fs-icache-cache[fs-icache-cache_last].ino = ino; +- fs-icache-cache[fs-icache-cache_last].inode = *inode; ++ if (bufsize == sizeof(struct ext2_inode)) { ++ fs-icache-cache_last = (fs-icache-cache_last + 1) % ++ fs-icache-cache_size; ++ fs-icache-cache[fs-icache-cache_last].ino = ino; ++ fs-icache-cache[fs-icache-cache_last].inode = *inode; ++ } + + return 0; + } +@@ -648,10 +650,12 @@ errcode_t ext2fs_write_inode_full(ext2_filsys fs, ext2_ino_t ino, + + /* Check to see if the inode cache needs to be updated */ + if (fs-icache) { +- for (i=0; i fs-icache-cache_size; i++) { +- if (fs-icache-cache[i].ino == ino) { +- fs-icache-cache[i].inode = *inode; +- break; ++ if (bufsize == sizeof(struct ext2_inode)) { ++ for (i=0; i fs-icache-cache_size; i++) { ++ if (fs-icache-cache[i].ino == ino) { ++ fs-icache-cache[i].inode = *inode; ++ break; ++ } + } + } + } else { +-- +1.8.1.2 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb index 5d65bbc..b063bc0 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb @@ -5,6 +5,7 @@ SRC_URI += file://acinclude.m4 \ file://remove.ldconfig.call.patch \ file://debugfs-too-short.patch \ file://debugfs-sparse-copy.patch \ +file://fix-icache.patch \ SRC_URI[md5sum] = 8ef664b6eb698aa6b733df59b17b9ed4 -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] e2fsprogs: add populate-extfs.sh
This script is originally from Darren Hart, it will be used for creating the ext* filesystem from a given directory, which will replace the genext2fs in image_types.bbclass at the moment, we may use the mke2fs to replace this script again when it has the initial directory support. Changes of the script: * Rename it from mkdebugfs.sh to populate-extfs.sh * Add a simple usage * Add checking for the number of the parameters * Add the regular empty file and fifo file type * Set mode, uid and gid for the file * Save the command lines to a file and batch run them * Change the error message * Improve the performance * Add the support for hardlink [YOCTO #3848] Signed-off-by: Darren Hart dvh...@linux.intel.com Signed-off-by: Robert Yang liezhi.y...@windriver.com --- .../e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh | 96 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |1 + 2 files changed, 97 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh new file mode 100644 index 000..9eff030 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh @@ -0,0 +1,96 @@ +#!/bin/sh + +do_usage () { + cat _EOF +Usage: populate-extfs.sh source device +Create an ext2/ext3/ext4 filesystem from a directory or file + + source: The source directory or file + device: The target device + +_EOF + exit 1 +} + +[ $# -ne 2 ] do_usage + +SRCDIR=${1%%/} +DEVICE=$2 +DEBUGFS=debugfs + +{ + CWD=/ + find $SRCDIR | while read FILE; do +TGT=${FILE##*/} +DIR=${FILE#$SRCDIR} +DIR=${DIR%$TGT} + + # Skip the root dir + [ ! -z $DIR ] || continue + [ ! -z $TGT ] || continue + + if [ $DIR != $CWD ]; then + echo cd $DIR + CWD=$DIR + fi + + # Only stat once since stat is a time consuming command + STAT=$(stat -c TYPE=\%F\;DEVNO=\0x%t 0x%T\;MODE=\%f\;U=\%u\;G=\%g\ $FILE) + eval $STAT + + case $TYPE in + directory) + echo mkdir $TGT + ;; + regular file | regular empty file) + echo write $FILE $TGT + ;; + symbolic link) + LINK_TGT=$(readlink $FILE) + echo symlink $TGT $LINK_TGT + ;; + block special file) + echo mknod $TGT b $DEVNO + ;; + character special file) + echo mknod $TGT c $DEVNO + ;; + fifo) + echo mknod $TGT p + ;; + *) + echo Unknown/unhandled file type '$TYPE' file: $FILE 12 + ;; + esac + + # Set the file mode + echo sif $TGT mode 0x$MODE + + # Set uid and gid + echo sif $TGT uid $U + echo sif $TGT gid $G + done + + # Handle the hard links. + # Save the hard links to a file, use the inode number as the filename, for example: + # If a and b's inode number is 6775928, save a and b to /tmp/tmp.VrCwHh5gdt/6775928. + INODE_DIR=`mktemp -d` || exit 1 + for i in `find $SRCDIR -type f -links +1 -printf 'INODE=%i###FN=%p\n'`; do + eval `echo $i | sed 's$###$ $'` + echo ${FN#$SRCDIR} $INODE_DIR/$INODE + done + # Use the debugfs' ln and sif links_count to handle them. + for i in `ls $INODE_DIR`; do + # The link source + SRC=`head -1 $INODE_DIR/$i` + # Remove the files and link them again except the first one + for TGT in `sed -n -e '1!p' $INODE_DIR/$i`; do + echo rm $TGT + echo ln $SRC $TGT + done + LN_CNT=`cat $INODE_DIR/$i | wc -l` + # Set the links count + echo sif $SRC links_count $LN_CNT + done + rm -fr $INODE_DIR +} | $DEBUGFS -w -f - $DEVICE diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb index 2dc9dab..8b69b22 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb @@ -45,6 +45,7 @@ do_install_append () { mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir} mv ${D}${base_libdir}/pkgconfig ${D}${libdir} fi + install -m 0755 ${WORKDIR}/populate-extfs.sh ${D}${bindir} } RDEPENDS_e2fsprogs = e2fsprogs-badblocks --
[OE-core] [PATCH 0/6] replace genext2fs with populate-extfs.sh
* The benefits: - Really support ext4 - Support the sparse file (we lost the sparse file in the image in the past, the sparse file became into the common file) - Fix the error reported by fsck: (ext2/ext3) Inode 1025, i_size is 16384, should be 17408. - Have a uniform code for ext2/3/4 generation * Impact - Build time: a) If we build fresh core-image-sato, there is nearly no impact. b) If we do the image generation, which means: $ bitbake core-image-sato $ bitbake core-image-sato -ccleansstate $ bitbake core-image-sato About 40 extra seconds are needed, here is my test result: Before the patches: 4m53s After the patches: 5m35s This is because the genext2fs is much faster than the populate-extfs.sh, we will replace this script by the mke2fs when it supports create the filesystem from a initial directory. - Disk space (take core-image-sato as an example) a) The image file size is the same as before (519M) b) The disk usage is a little different: (du -sh) before now ext2: 356M 379M ext3: 372M 395M ext4: 372M 380M I have done some simple runtime testing on core-image-sato based on ext2/3/4, they worked well. * The fsck.extX -fn image.extX shows it is OK. // Robert The following changes since commit b2ff1add530b1fec2fb7f385227a03db47015c37: poky.conf: Don't force the addition of extra DISTRO_FEATURES (2013-08-20 22:58:04 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib robert/extX http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/extX Robert Yang (6): e2fsprogs: the max length of debugfs argument is too short e2fsprogs: let debugfs do sparse copy e2fsprogs: only update the icache for ext2_inode e2fsprogs: properly set up extent header in do_write e2fsprogs: add populate-extfs.sh image_types.bbclass: replace genext2fs with populate-extfs.sh meta/classes/image_types.bbclass | 46 +++--- .../e2fsprogs-1.42.8/debugfs-extent-header.patch | 47 +++ .../e2fsprogs-1.42.8/debugfs-sparse-copy.patch | 147 .../e2fsprogs-1.42.8/debugfs-too-short.patch | 41 ++ .../e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch| 69 + .../e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh | 96 + .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |6 + 7 files changed, 424 insertions(+), 28 deletions(-) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-extent-header.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] e2fsprogs: let debugfs do sparse copy
Let debugfs do sparse copy when src is a sparse file, just like cp --sparse=auto This patch has been reviewed by the linux-ext4 mailing list, but isn't merged atm. [YOCTO #3848] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- .../e2fsprogs-1.42.8/debugfs-sparse-copy.patch | 147 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |1 + 2 files changed, 148 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file mode 100644 index 000..c87bcbf --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch @@ -0,0 +1,147 @@ +debugfs.c: do sparse copy when src is a sparse file + +Let debugfs do sparse copy when src is a sparse file, just like +cp --sparse=auto + +* For the: + #define IO_BUFSIZE 64*1024 + this is a suggested value from gnu coreutils: + http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob;f=src/ioblksize.h;h=1ae93255e7d0ccf0855208c7ae5888209997bf16;hb=HEAD + +* Use malloc() to allocate memory for the buffer since put 64K (or + more) on the stack seems not a good idea. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang liezhi.y...@windriver.com +Acked-by: Darren Hart dvh...@linux.intel.com +--- + debugfs/debugfs.c | 61 +++ + 1 file changed, 57 insertions(+), 4 deletions(-) + +diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c +--- a/debugfs/debugfs.c b/debugfs/debugfs.c +@@ -41,6 +41,16 @@ extern char *optarg; + #define BUFSIZ 8192 + #endif + ++/* 64KiB is the minimium blksize to best minimize system call overhead. */ ++#ifndef IO_BUFSIZE ++#define IO_BUFSIZE 64*1024 ++#endif ++ ++/* Block size for `st_blocks' */ ++#ifndef S_BLKSIZE ++#define S_BLKSIZE 512 ++#endif ++ + ss_request_table *extra_cmds; + const char *debug_prog_name; + int sci_idx; +@@ -1575,22 +1585,36 @@ void do_find_free_inode(int argc, char *argv[]) + } + + #ifndef READ_ONLY +-static errcode_t copy_file(int fd, ext2_ino_t newfile) ++static errcode_t copy_file(int fd, ext2_ino_t newfile, int bufsize, int make_holes) + { + ext2_file_t e2_file; + errcode_t retval; + int got; + unsigned intwritten; +- charbuf[8192]; ++ char*buf; + char*ptr; ++ char*zero_buf; ++ int cmp; + + retval = ext2fs_file_open(current_fs, newfile, + EXT2_FILE_WRITE, e2_file); + if (retval) + return retval; + ++ if (!(buf = (char *) malloc(bufsize))){ ++ com_err(copy_file, errno, can't allocate buffer\n); ++ return; ++ } ++ ++/* This is used for checking whether the whole block is zero */ ++ retval = ext2fs_get_memzero(bufsize, zero_buf); ++ if (retval) { ++ com_err(copy_file, retval, can't allocate buffer\n); ++ return retval; ++ } ++ + while (1) { +- got = read(fd, buf, sizeof(buf)); ++ got = read(fd, buf, bufsize); + if (got == 0) + break; + if (got 0) { +@@ -1598,6 +1622,21 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile) + goto fail; + } + ptr = buf; ++ ++ /* Sparse copy */ ++ if (make_holes) { ++ /* Check whether all is zero */ ++ cmp = memcmp(ptr, zero_buf, got); ++ if (cmp == 0) { ++ /* The whole block is zero, make a hole */ ++ retval = ext2fs_file_lseek(e2_file, got, EXT2_SEEK_CUR, NULL); ++ if (retval) ++ goto fail; ++ got = 0; ++ } ++ } ++ ++ /* Normal copy */ + while (got 0) { + retval = ext2fs_file_write(e2_file, ptr, + got, written); +@@ -1608,10 +1647,14 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile) + ptr += written; + } + } ++ free(buf); ++ ext2fs_free_mem(zero_buf); + retval = ext2fs_file_close(e2_file); + return retval; + + fail: ++ free(buf); ++ ext2fs_free_mem(zero_buf); + (void) ext2fs_file_close(e2_file); + return retval; + } +@@ -1624,6 +1667,8 @@ void do_write(int argc, char *argv[]) + ext2_ino_t newfile; + errcode_t retval; + struct ext2_inode inode; ++ int bufsize = IO_BUFSIZE; ++ int make_holes = 0; + +
[OE-core] [PATCH 4/6] e2fsprogs: properly set up extent header in do_write
do_write doesn't fully set up the first extent header on a new inode, so if we write a 0-length file, and don't write any data to the new file, we end up creating something that looks corrupt to kernelspace: EXT4-fs error (device loop0): ext4_ext_check_inode:464: inode #12: comm ls: bad header/extent: invalid magic - magic 0, entries 0, max 0(0), depth 0(0) Do something similar to ext4_ext_tree_init() here, and fill out the first extent header upon creation to avoid this. [YOCTO #3848] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- .../e2fsprogs-1.42.8/debugfs-extent-header.patch | 47 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |2 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-extent-header.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-extent-header.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-extent-header.patch new file mode 100644 index 000..ae44730 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-extent-header.patch @@ -0,0 +1,47 @@ +debugfs: properly set up extent header in do_write + +do_write doesn't fully set up the first extent header on a new +inode, so if we write a 0-length file, and don't write any data +to the new file, we end up creating something that looks corrupt +to kernelspace: + +EXT4-fs error (device loop0): ext4_ext_check_inode:464: inode #12: comm ls: bad header/extent: invalid magic - magic 0, entries 0, max 0(0), depth 0(0) + +Do something similar to ext4_ext_tree_init() here, and +fill out the first extent header upon creation to avoid this. + +Upstream-Status: Backport + +Reported-by: Robert Yang liezhi.y...@windriver.com +Signed-off-by: Eric Sandeen sand...@redhat.com +--- + debugfs/debugfs.c | 13 - + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c +--- a/debugfs/debugfs.c b/debugfs/debugfs.c +@@ -1726,8 +1726,19 @@ void do_write(int argc, char *argv[]) + inode.i_links_count = 1; + inode.i_size = statbuf.st_size; + if (current_fs-super-s_feature_incompat +- EXT3_FEATURE_INCOMPAT_EXTENTS) ++ EXT3_FEATURE_INCOMPAT_EXTENTS) { ++ int i; ++ struct ext3_extent_header *eh; ++ ++ eh = (struct ext3_extent_header *) inode.i_block[0]; ++ eh-eh_depth = 0; ++ eh-eh_entries = 0; ++ eh-eh_magic = EXT3_EXT_MAGIC; ++ i = (sizeof(inode.i_block) - sizeof(*eh)) / ++ sizeof(struct ext3_extent); ++ eh-eh_max = ext2fs_cpu_to_le16(i); + inode.i_flags |= EXT4_EXTENTS_FL; ++ } + if (debugfs_write_new_inode(newfile, inode, argv[0])) { + close(fd); + return; +-- +1.8.1.2 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb index b063bc0..2dc9dab 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb @@ -6,6 +6,8 @@ SRC_URI += file://acinclude.m4 \ file://debugfs-too-short.patch \ file://debugfs-sparse-copy.patch \ file://fix-icache.patch \ +file://debugfs-extent-header.patch \ +file://populate-extfs.sh \ SRC_URI[md5sum] = 8ef664b6eb698aa6b733df59b17b9ed4 -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] e2fsprogs: the max length of debugfs argument is too short
The max length of debugfs argument is 256 which is too short, the arguments are two paths, the PATH_MAX is 4096 according to /usr/include/linux/limits.h, so use BUFSIZ (which is 8192 on Linux systems), that's also what the ss library uses. This patch has been reviewed by the linux-ext4 mailing list, but isn't merged atm. [YOCTO #3848] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- .../e2fsprogs-1.42.8/debugfs-too-short.patch | 41 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch new file mode 100644 index 000..607305b --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch @@ -0,0 +1,41 @@ +debugfs.c: the max length of debugfs argument is too short + +The max length of debugfs argument is 256 which is too short, the +arguments are two paths, the PATH_MAX is 4096 according to +/usr/include/linux/limits.h, so use BUFSIZ (which is 8192 on Linux +systems), that's also what the ss library uses. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang liezhi.y...@windriver.com +Acked-by: Darren Hart dvh...@linux.intel.com +--- + debugfs/debugfs.c | 6 +- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c +--- a/debugfs/debugfs.c b/debugfs/debugfs.c +@@ -37,6 +37,10 @@ extern char *optarg; + #include ../version.h + #include jfs_user.h + ++#ifndef BUFSIZ ++#define BUFSIZ 8192 ++#endif ++ + ss_request_table *extra_cmds; + const char *debug_prog_name; + int sci_idx; +@@ -2311,7 +2315,7 @@ void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[]) + static int source_file(const char *cmd_file, int ss_idx) + { + FILE*f; +- charbuf[256]; ++ charbuf[BUFSIZ]; + char*cp; + int exit_status = 0; + int retval; +-- +1.8.1.2 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb index d231268..f97de7f 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb @@ -3,6 +3,7 @@ require e2fsprogs.inc SRC_URI += file://acinclude.m4 \ file://remove.ldconfig.call.patch \ +file://debugfs-too-short.patch \ SRC_URI[md5sum] = 8ef664b6eb698aa6b733df59b17b9ed4 -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] image_types.bbclass: replace genext2fs with populate-extfs.sh
* The benefits: - Really support ext4 - Support the sparse file (we lost the sparse file in the image in the past, the sparse file became into the common file) - Fix the error reported by fsck: (ext2/ext3) Inode 1025, i_size is 16384, should be 17408. - Have a uniform code for ext2/3/4 generation * Comments from Darren Hart: Basically, genext2fs doesn't support creating ext4 filesystems. It creates, as I understand it, an ext2 filesystem, then adds a journal, and sets some bits. It can't support the newer features like extents. So what we end up with is a bit of a hack for a filesystem. The ext tools (e2fsprogs) unfortunately don't provide an integrated solution for generating prepopulated filesystem images as many other mkfs* tools do. One thing missing was symlink support in libext2fs. I added that support and demonstrated a script which uses the e2fsprogs debugfs tool that can populate the newly formatted filesystem from a directory and without root privileges. [YOCTO #3848] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/classes/image_types.bbclass | 46 +++--- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 0e5a9a8..c168ed5 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -141,34 +141,24 @@ IMAGE_CMD_sum.jffs2 = ${IMAGE_CMD_jffs2} sumtool -i ${DEPLOY_DIR_IMAGE}/${IM IMAGE_CMD_cramfs = mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD} -IMAGE_CMD_ext2 () { - rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} - genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2 - mv ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 - rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} -} +oe_mkext234fs () { + fstype=$1 + extra_imagecmd= -IMAGE_CMD_ext3 () { - genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 - tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 -} + if [ $# -gt 1 ]; then + shift + extra_imagecmd=$@ + fi -oe_mkext4fs () { - genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} $1 - tune2fs -O extents,uninit_bg,dir_index,has_journal,filetype $1 - e2fsck -yfDC0 $1 || chk=$? - case $chk in - 0|1|2) - ;; - *) - return $chk - ;; - esac + # Create a sparse image block + dd if=/dev/zero of=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.$fstype seek=$ROOTFS_SIZE count=0 bs=1k + mkfs.$fstype -F $extra_imagecmd ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.$fstype + populate-extfs.sh ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.$fstype } -IMAGE_CMD_ext4 () { - oe_mkext4fs ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 -} +IMAGE_CMD_ext2 = oe_mkext234fs ext2 ${EXTRA_IMAGECMD} +IMAGE_CMD_ext3 = oe_mkext234fs ext3 ${EXTRA_IMAGECMD} +IMAGE_CMD_ext4 = oe_mkext234fs ext4 ${EXTRA_IMAGECMD} IMAGE_CMD_btrfs () { mkfs.btrfs -b `expr ${ROOTFS_SIZE} \* 1024` ${EXTRA_IMAGECMD} -r ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.btrfs @@ -218,7 +208,7 @@ JFFS2_ENDIANNESS ?= ${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--little- JFFS2_ERASEBLOCK ?= 0x4 EXTRA_IMAGECMD_jffs2 ?= --pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLOCK} --no-cleanmarkers -# Change these if you want default genext2fs behavior (i.e. create minimal inode number) +# Change these if you want default mkfs behavior (i.e. create minimal inode number) EXTRA_IMAGECMD_ext2 ?= -i 8192 EXTRA_IMAGECMD_ext3 ?= -i 8192 EXTRA_IMAGECMD_ext4 ?= -i 8192 @@ -229,9 +219,9 @@ IMAGE_DEPENDS = IMAGE_DEPENDS_jffs2 = mtd-utils-native IMAGE_DEPENDS_sum.jffs2 = mtd-utils-native IMAGE_DEPENDS_cramfs = cramfs-native -IMAGE_DEPENDS_ext2 = genext2fs-native -IMAGE_DEPENDS_ext3 = genext2fs-native e2fsprogs-native -IMAGE_DEPENDS_ext4 = genext2fs-native e2fsprogs-native +IMAGE_DEPENDS_ext2 = e2fsprogs-native +IMAGE_DEPENDS_ext3 = e2fsprogs-native +IMAGE_DEPENDS_ext4 = e2fsprogs-native IMAGE_DEPENDS_btrfs = btrfs-tools-native IMAGE_DEPENDS_squashfs = squashfs-tools-native IMAGE_DEPENDS_squashfs-xz = squashfs-tools-native -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gcc-4.8: Add two patches to deal with cross-canadian build failures
See the patch headers for more information about the cross-canadian build failures these patches avoid. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc index 9d92eda..e66bdaf 100644 --- a/meta/recipes-devtools/gcc/gcc-4.8.inc +++ b/meta/recipes-devtools/gcc/gcc-4.8.inc @@ -72,6 +72,8 @@ SRC_URI = ${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://0040-fix-g++-sysroot.patch \ file://0041-libtool-avoid-libdir.patch \ file://0042-pr57748.patch \ + file://0043-cpp.patch \ + file://0044-gengtypes.patch \ SRC_URI[md5sum] = 3b2386c114cd74185aa3754b58a79304 SRC_URI[sha256sum] = 545b44be3ad9f2c4e90e6880f5c9d4f0a8f0e5f67e1ffb0d45da9fa01bb05813 diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0043-cpp.patch b/meta/recipes-devtools/gcc/gcc-4.8/0043-cpp.patch new file mode 100644 index 000..eaf8646 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.8/0043-cpp.patch @@ -0,0 +1,40 @@ +The OE environment sets and exports CPP as being the target gcc. When building +gcc-cross-canadian for a mingw targetted sdk, the following can be found in +build.x86_64-pokysdk-mingw32.i586-poky-linux/build-x86_64-linux/libiberty/config.log: + +configure:3641: checking for _FILE_OFFSET_BITS value needed for large files +configure:3666: gcc -c -isystem/media/build1/poky/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe conftest.c 5 +configure:3666: $? = 0 +configure:3698: result: no +configure:3786: checking how to run the C preprocessor +configure:3856: result: x86_64-pokysdk-mingw32-gcc -E --sysroot=/media/build1/poky/build/tmp/sysroots/x86_64-nativesdk-mingw32-pokysdk-mingw32 +configure:3876: x86_64-pokysdk-mingw32-gcc -E --sysroot=/media/build1/poky/build/tmp/sysroots/x86_64-nativesdk-mingw32-pokysdk-mingw32 conftest.c +configure:3876: $? = 0 + +Note this is a *build* target (in build-x86_64-linux) so it should be using +the host gcc, not x86_64-pokysdk-mingw32-gcc. Since the mingw32 headers are +very different, using the wrong cpp is a real problem. It is leaking into +configure through the CPP variable. Ultimately this leads to build failures +related to not being able to include a process.h file for pem-unix.c. + +The fix is to ensure we export a sane CPP value into the build environment when +using build targets. We could define a CPP_FOR_BUILD value which may be the version +which needs to be upstreamed but for now, this fix is good enough to avoid the +problem. + +RP 22/08/2013 + +Upstream-Status: Pending + +Index: gcc-4.8.1/Makefile.in +=== +--- gcc-4.8.1.orig/Makefile.in 2013-03-30 11:25:03.0 + gcc-4.8.1/Makefile.in 2013-08-13 12:03:17.15192 + +@@ -149,6 +149,7 @@ + AR=$(AR_FOR_BUILD); export AR; \ + AS=$(AS_FOR_BUILD); export AS; \ + CC=$(CC_FOR_BUILD); export CC; \ ++ CPP=$(CC_FOR_BUILD) -E; export CPP; \ + CFLAGS=$(CFLAGS_FOR_BUILD); export CFLAGS; \ + CONFIG_SHELL=$(SHELL); export CONFIG_SHELL; \ + CXX=$(CXX_FOR_BUILD); export CXX; \ diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0044-gengtypes.patch b/meta/recipes-devtools/gcc/gcc-4.8/0044-gengtypes.patch new file mode 100644 index 000..e38761d --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.8/0044-gengtypes.patch @@ -0,0 +1,97 @@ +gengtype is generated for both the build system and the target. -DGENERATOR_FILE +was added in the patch http://gcc.gnu.org/ml/gcc-patches/2012-07/msg00273.html +and was applied to both versions of gengtype. + +Unfortunately the presence of this flag triggers the build configuration (bconfig.h) +to be included for the target build of gengtype. Compiling gengtype with the target +compiler and bconfig.h can result in errors if the build and target systems are +dissimilar. An example case this fails is cross compiling gcc on linux for a darwin +target system: + +In file included from /media/build1/poky/build/tmp/work-shared/gcc-4.8.1-r0/gcc-4.8.1/gcc/gengtype-parse.c:25:0: +| /media/build1/poky/build/tmp/work-shared/gcc-4.8.1-r0/gcc-4.8.1/gcc/gengtype-parse.c: In function 'void parse_error(const char*, ...)': +| /media/build1/poky/build/tmp/work-shared/gcc-4.8.1-r0/gcc-4.8.1/gcc/system.h:93:53: error: 'fputc_unlocked' was not declared in this scope +| # define fputc(C, Stream) fputc_unlocked (C, Stream) + +which occurs since auto-build.h and auto-host.h have differnet values of +HAVE_FPUTC_UNLOCKED: + +#define HAVE_FPUTC_UNLOCKED 1 +/* #undef HAVE_FPUTS_UNLOCKED */ + +The obvious fix is to only include the flag on build/ targets which this patch does, however +this also leads to compile errors due to const_tree being undefined but used in double_int.h + +I added a GENERATOR_FILE2 flag to workaround those in the +target case and allow the build to succeed. + +Only the build/gengtypes
[OE-core] RFC: Web browsing and HTML in OE-Core
We've slowly been shaking out the definition of OE-Core and as part of that we removed web and web-gtk which were the only browsers in there and were admittedly a bit limited/broken. There is no doubt that web technology has an increasingly important role in the future and in embedded devices (e.g. kiosk type devices, digital signs and so on). With that in mind, I think some kind of HTML support in OE-Core is important going forward. Equally, I dislike having things there which we cannot test. I know some people have looked into this and it appears midori is the best option for something with a small number of additional dependencies. I therefore currently think this is something we should make a decision to include since it gives us significantly better coverage of things like webkit which are a already in the core yet totally untested at present. I'm open to opinions, equally we do need to make a decision on this soon since we're nearly at the feature freeze point. Thoughts? Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] RFC: Web browsing and HTML in OE-Core
On Thu, 2013-08-22 at 15:04 +0100, Richard Purdie wrote: With that in mind, I think some kind of HTML support in OE-Core is important going forward. Equally, I dislike having things there which we cannot test. I know some people have looked into this and it appears midori is the best option for something with a small number of additional dependencies. I therefore currently think this is something we should make a decision to include since it gives us significantly better coverage of things like webkit which are a already in the core yet totally untested at present. WebKit itself comes with a bunch of test wrappers (and tests!) for different platforms and if the aim of the exercise is to test webkit then it seems like maybe we should just be installing and using those. Midori would be fine for testing the parts of webkit that it uses, but obviously it doesn't exercise anything other than the Gtk port which still leaves you with a bit of a hole in your coverage. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] RFC: Web browsing and HTML in OE-Core
2013/8/22 Richard Purdie richard.pur...@linuxfoundation.org: We've slowly been shaking out the definition of OE-Core and as part of that we removed web and web-gtk which were the only browsers in there and were admittedly a bit limited/broken. There is no doubt that web technology has an increasingly important role in the future and in embedded devices (e.g. kiosk type devices, digital signs and so on). With that in mind, I think some kind of HTML support in OE-Core is important going forward. Equally, I dislike having things there which we cannot test. I know some people have looked into this and it appears midori is the best option for something with a small number of additional dependencies. I therefore currently think this is something we should make a decision to include since it gives us significantly better coverage of things like webkit which are a already in the core yet totally untested at present. I'm open to opinions, equally we do need to make a decision on this soon since we're nearly at the feature freeze point. Thoughts? Hi, just some thoughts: Qt provides an example application that uses webkit called fancybrowser This demo it is located at the package qt4-examples (/usr/bin/qt4/examples/webkit/fancybrowser/ in the target sysroot). -- Regards Samuel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] qemu-native build regularly failing
On 08/22/2013 06:03 AM, Paul Eggleton wrote: On Thursday 22 August 2013 15:56:39 Marko Lindqvist wrote: On 21 August 2013 19:33, Marko Lindqvist cazf...@gmail.com wrote: On 21 August 2013 01:15, Marko Lindqvist cazf...@gmail.com wrote: On 21 August 2013 00:16, Paul Eggleton paul.eggle...@linux.intel.com wrote: On Tuesday 20 August 2013 23:26:44 Marko Lindqvist wrote: On 20 August 2013 16:32, Paul Eggleton paul.eggle...@linux.intel.com wrote: On Tuesday 20 August 2013 15:51:21 Marko Lindqvist wrote: Build of qemu-native regularly fails with: | LINK sh4-softmmu/qemu-system-sh4 | | /usr/lib/x86_64-linux-gnu/libXext.so.6: undefined reference to `_XEatDataWords' | collect2: error: ld returned 1 exit status This might be some dependency missing, as building first some packets (+ more importantly their dependencies) that do not depend on qemu and only then qemu dependant image success. Do you have something else causing libxext-native to be built by any chance? Yes, it seems to be difference between the tree where build fails and the one where build success that former has no libxext-native built. Further, I tested just building libxext-native before building qemu-native, and then the build succeded. The problem is we want qemu-native to be buildable both on systems without X11 and systems with X11, so the dependency has to be floating, and this is more or less acceptable for a native recipe - there's only a problem when libxext- native needs to be built. I can't see a lot of value in building libxext- native in any case - what is causing it to be built on your system? Cheers, Paul I'm still running more tests - this seems to be complicated matter. For one, I just got successful build from empty tree by building qemu-native directly. That was build targeted to arm, while failing builds have been for x86 (native is amd64). Also, I think (but cannot be 100% sure any more) build has succeeded on trees where nothing depends on libxext-native but still *something* was needed to be built before qemu-native. It seems libxext-native is not needed. Rather this seems like problem with build parallelism. - Sometimes bitbake qemu-native to empty tree success at once - When it first fails (but other tasks get executed while it tries to build), it then success by forcing configure rerun building ( bitbake qemu-native -c configure -f bitbake qemu-native ) I think next step is to get config.log of the succesful and failed build to compare. --- success-qemu/qemu-1.5.0/config-host.h 2013-08-22 15:45:10.323126880 +0300 +++ failed-qemu/qemu-1.5.0/config-host.h2013-08-22 15:32:23.515101072 +0300 @@ -26,6 +26,7 @@ #define CONFIG_UUID 1 #define QEMU_VERSION 1.5.0 #define QEMU_PKGVERSION +#define CONFIG_SDL 1 #define CONFIG_CURSES 1 #define CONFIG_ATFILE 1 #define CONFIG_UTIMENSAT 1 @@ -55,6 +56,7 @@ #define CONFIG_MADVISE 1 #define CONFIG_POSIX_MADVISE 1 #define CONFIG_SIGEV_THREAD_ID 1 +#define CONFIG_GLX 1 #define CONFIG_UNAME_RELEASE #define CONFIG_ZERO_MALLOC 1 #define CONFIG_QOM_CAST_DEBUG 1 As this diff is success - failed, CONFIG_GLX and CONFIG_SDL are defined on first build ending to failure, but not on forced reconfigure that then build succesfully. You'd probably need to dig into the actual configure check that enables these automatically. I was about to suggest maybe libsdl-native was present in the failing case, but then the current libsdl recipe in OE-Core doesn't provide libsdl-native so that probably isn't it... Something that we did not ask here, is what is your host OS? We just had a very similar issue Fedora 19, since qemu had a floating dependency on some X libraries specifically libX11 and libXext and X11 is newer on F19, it was causing problems if you happen to have libX11-native built. We just updated libX11 and in our testing it seems to have fix this issue. Check out the patches. Sau! Cheers, Paul ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] runqemu-ifup: when tunctl can't be found, say what package builds it
If runqemu is used without actually building any qemu images (i.e. you downloaded the images) it's likely that qemu-helper-native hasn't been built. Instead of just saying what command can't be found, tell the user how to solve their problem. Signed-off-by: Ross Burton ross.bur...@intel.com --- scripts/runqemu-ifup |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/runqemu-ifup b/scripts/runqemu-ifup index 5f6a437..140dd88 100755 --- a/scripts/runqemu-ifup +++ b/scripts/runqemu-ifup @@ -53,7 +53,7 @@ NATIVE_SYSROOT_DIR=$3 TUNCTL=$NATIVE_SYSROOT_DIR/usr/bin/tunctl if [ ! -x $TUNCTL ]; then - echo Error: Unable to find tunctl binary in '$NATIVE_SYSROOT_DIR/usr/bin' +echo Error: Unable to find tunctl binary in '$NATIVE_SYSROOT_DIR/usr/bin', please bitbake qemu-helper-native exit 1 fi -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/6] e2fsprogs: the max length of debugfs argument is too short
On Thu, 2013-08-22 at 09:13 -0400, Robert Yang wrote: The max length of debugfs argument is 256 which is too short, the arguments are two paths, the PATH_MAX is 4096 according to /usr/include/linux/limits.h, so use BUFSIZ (which is 8192 on Linux systems), that's also what the ss library uses. This patch has been reviewed by the linux-ext4 mailing list, but isn't merged atm. [YOCTO #3848] Signed-off-by: Robert Yang liezhi.y...@windriver.com Acked-by: Darren Hart dvh...@linux.intel.com --- .../e2fsprogs-1.42.8/debugfs-too-short.patch | 41 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch new file mode 100644 index 000..607305b --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch @@ -0,0 +1,41 @@ +debugfs.c: the max length of debugfs argument is too short + +The max length of debugfs argument is 256 which is too short, the +arguments are two paths, the PATH_MAX is 4096 according to +/usr/include/linux/limits.h, so use BUFSIZ (which is 8192 on Linux +systems), that's also what the ss library uses. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang liezhi.y...@windriver.com +Acked-by: Darren Hart dvh...@linux.intel.com +--- + debugfs/debugfs.c | 6 +- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c +--- a/debugfs/debugfs.c b/debugfs/debugfs.c +@@ -37,6 +37,10 @@ extern char *optarg; + #include ../version.h + #include jfs_user.h + ++#ifndef BUFSIZ ++#define BUFSIZ 8192 ++#endif ++ + ss_request_table *extra_cmds; + const char *debug_prog_name; + int sci_idx; +@@ -2311,7 +2315,7 @@ void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[]) + static int source_file(const char *cmd_file, int ss_idx) + { + FILE*f; +-charbuf[256]; ++charbuf[BUFSIZ]; + char*cp; + int exit_status = 0; + int retval; +-- +1.8.1.2 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb index d231268..f97de7f 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb @@ -3,6 +3,7 @@ require e2fsprogs.inc SRC_URI += file://acinclude.m4 \ file://remove.ldconfig.call.patch \ +file://debugfs-too-short.patch \ SRC_URI[md5sum] = 8ef664b6eb698aa6b733df59b17b9ed4 -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/6] e2fsprogs: let debugfs do sparse copy
On Thu, 2013-08-22 at 09:13 -0400, Robert Yang wrote: Let debugfs do sparse copy when src is a sparse file, just like cp --sparse=auto This patch has been reviewed by the linux-ext4 mailing list, but isn't merged atm. [YOCTO #3848] Minor whitespace nit below, but will likely be caught by upstream. -- Darren Signed-off-by: Robert Yang liezhi.y...@windriver.com --- .../e2fsprogs-1.42.8/debugfs-sparse-copy.patch | 147 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |1 + 2 files changed, 148 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file mode 100644 index 000..c87bcbf --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch @@ -0,0 +1,147 @@ +debugfs.c: do sparse copy when src is a sparse file + +Let debugfs do sparse copy when src is a sparse file, just like +cp --sparse=auto + +* For the: + #define IO_BUFSIZE 64*1024 + this is a suggested value from gnu coreutils: + http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob;f=src/ioblksize.h;h=1ae93255e7d0ccf0855208c7ae5888209997bf16;hb=HEAD + +* Use malloc() to allocate memory for the buffer since put 64K (or + more) on the stack seems not a good idea. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang liezhi.y...@windriver.com +Acked-by: Darren Hart dvh...@linux.intel.com +--- + debugfs/debugfs.c | 61 +++ + 1 file changed, 57 insertions(+), 4 deletions(-) + +diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c +--- a/debugfs/debugfs.c b/debugfs/debugfs.c +@@ -41,6 +41,16 @@ extern char *optarg; + #define BUFSIZ 8192 + #endif + ++/* 64KiB is the minimium blksize to best minimize system call overhead. */ ++#ifndef IO_BUFSIZE ++#define IO_BUFSIZE 64*1024 ++#endif ++ ++/* Block size for `st_blocks' */ ++#ifndef S_BLKSIZE ++#define S_BLKSIZE 512 ++#endif ++ + ss_request_table *extra_cmds; + const char *debug_prog_name; + int sci_idx; +@@ -1575,22 +1585,36 @@ void do_find_free_inode(int argc, char *argv[]) + } + + #ifndef READ_ONLY +-static errcode_t copy_file(int fd, ext2_ino_t newfile) ++static errcode_t copy_file(int fd, ext2_ino_t newfile, int bufsize, int make_holes) + { + ext2_file_t e2_file; + errcode_t retval; + int got; + unsigned intwritten; +-charbuf[8192]; ++char*buf; + char*ptr; ++char*zero_buf; ++int cmp; + + retval = ext2fs_file_open(current_fs, newfile, + EXT2_FILE_WRITE, e2_file); + if (retval) + return retval; + ++if (!(buf = (char *) malloc(bufsize))){ ++com_err(copy_file, errno, can't allocate buffer\n); ++return; ++} ++ ++/* This is used for checking whether the whole block is zero */ Whitespace/indentation error ^ ++retval = ext2fs_get_memzero(bufsize, zero_buf); ++if (retval) { ++com_err(copy_file, retval, can't allocate buffer\n); ++return retval; ++} ++ + while (1) { +-got = read(fd, buf, sizeof(buf)); ++got = read(fd, buf, bufsize); + if (got == 0) + break; + if (got 0) { +@@ -1598,6 +1622,21 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile) + goto fail; + } + ptr = buf; ++ ++/* Sparse copy */ ++if (make_holes) { ++/* Check whether all is zero */ ++cmp = memcmp(ptr, zero_buf, got); ++if (cmp == 0) { ++ /* The whole block is zero, make a hole */ ++retval = ext2fs_file_lseek(e2_file, got, EXT2_SEEK_CUR, NULL); ++if (retval) ++goto fail; ++got = 0; ++} ++} ++ ++/* Normal copy */ + while (got 0) { + retval = ext2fs_file_write(e2_file, ptr, +got, written); +@@ -1608,10 +1647,14 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile) + ptr += written; + } + } ++free(buf); ++ext2fs_free_mem(zero_buf); + retval = ext2fs_file_close(e2_file); + return retval; + + fail: ++free(buf); ++ext2fs_free_mem(zero_buf); + (void) ext2fs_file_close(e2_file); + return retval; + } +@@ -1624,6 +1667,8 @@ void do_write(int argc,
Re: [OE-core] [PATCH] runqemu-ifup: when tunctl can't be found, say what package builds it
On Thu, Aug 22, 2013 at 03:36:18PM +0100, Ross Burton wrote: If runqemu is used without actually building any qemu images (i.e. you downloaded the images) it's likely that qemu-helper-native hasn't been built. Instead of just saying what command can't be found, tell the user how to solve their problem. Signed-off-by: Ross Burton ross.bur...@intel.com --- scripts/runqemu-ifup |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/runqemu-ifup b/scripts/runqemu-ifup index 5f6a437..140dd88 100755 --- a/scripts/runqemu-ifup +++ b/scripts/runqemu-ifup @@ -53,7 +53,7 @@ NATIVE_SYSROOT_DIR=$3 TUNCTL=$NATIVE_SYSROOT_DIR/usr/bin/tunctl if [ ! -x $TUNCTL ]; then - echo Error: Unable to find tunctl binary in '$NATIVE_SYSROOT_DIR/usr/bin' +echo Error: Unable to find tunctl binary in '$NATIVE_SYSROOT_DIR/usr/bin', please bitbake qemu-helper-native ^ inconsistent whitespace exit 1 fi -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] default-providers: Set the preferred provider for bluez
There is a need for a default provider for bluez now that bluez5 recipe is also present. Fixes this warnings: NOTE: multiple providers are available for runtime libasound-module-bluez (bluez4, bluez5) NOTE: consider defining a PREFERRED_PROVIDER entry to match libasound-module-bluez Fixes [YOCTO #5030]. Signed-off-by: Cristian Iorga cristian.io...@intel.com --- meta/conf/distro/include/default-providers.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 67cc5f5..9255fd6 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -39,3 +39,4 @@ PREFERRED_PROVIDER_console-tools ?= kbd PREFERRED_PROVIDER_gzip-native ?= pigz-native PREFERRED_PROVIDER_make ?= make PREFERRED_PROVIDER_udev ?= ${@base_contains('DISTRO_FEATURES','systemd','systemd','udev',d)} +PREFERRED_PROVIDER_bluez4 ?= bluez4 -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gpgme: update to 1.4.3
Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- .../gpgme/gpgme-1.4.2/disable_gpgconf_check.patch | 39 -- .../gpgme/gpgme-1.4.3/disable_gpgconf_check.patch | 39 ++ meta/recipes-support/gpgme/gpgme_1.4.2.bb | 29 meta/recipes-support/gpgme/gpgme_1.4.3.bb | 30 + 4 files changed, 69 insertions(+), 68 deletions(-) delete mode 100644 meta/recipes-support/gpgme/gpgme-1.4.2/disable_gpgconf_check.patch create mode 100644 meta/recipes-support/gpgme/gpgme-1.4.3/disable_gpgconf_check.patch delete mode 100644 meta/recipes-support/gpgme/gpgme_1.4.2.bb create mode 100644 meta/recipes-support/gpgme/gpgme_1.4.3.bb diff --git a/meta/recipes-support/gpgme/gpgme-1.4.2/disable_gpgconf_check.patch b/meta/recipes-support/gpgme/gpgme-1.4.2/disable_gpgconf_check.patch deleted file mode 100644 index df09530..000 --- a/meta/recipes-support/gpgme/gpgme-1.4.2/disable_gpgconf_check.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1.2.0, gpgme will check if gpgconf g13(from 1.3.0) exist, and cause -configure failure if not founding them in cross-compile environment. We can -add the gnupg-native to get them, but still have some issues: - -1. need add new package: libksba, update libassuan(not in sato), and extend - native support in some other packages(libgcrypt, libgpg-error, pth...) -2. Even we have gnupg, the g13 only exist in development branch, so that we - still have the g13 check failure in configure. - -I have searched the compile log, and found gpgconf/g13 are not used. So use a -simple method here, throw a warning mesg rather than an error here just like in -non-cross-compile environment. - -Signed-off-by: Zhai Edwin edwin.z...@intel.com - -Upstream-Status: Inappropriate [embedded specific] - -Index: gpgme-1.3.0/configure.ac -=== gpgme-1.3.0.orig/configure.ac 2010-07-21 09:38:09.0 +0800 -+++ gpgme-1.3.0/configure.ac 2010-07-21 09:39:19.0 +0800 -@@ -574,7 +574,7 @@ - *** Could not find gpgconf, install gpgconf or use --with-gpgconf=PATH to enable it - ***]) - else -- AC_MSG_ERROR([ -+ AC_MSG_WARN([ - *** - *** Can not determine path to gpgconf when cross-compiling, use --with-gpgconf=PATH - ***]) -@@ -670,7 +670,7 @@ - *** Could not find g13, install g13 or use --with-g13=PATH to enable it - ***]) - else -- AC_MSG_ERROR([ -+ AC_MSG_WARN([ - *** - *** Can not determine path to g13 when cross-compiling, use --with-g13=PATH - ***]) diff --git a/meta/recipes-support/gpgme/gpgme-1.4.3/disable_gpgconf_check.patch b/meta/recipes-support/gpgme/gpgme-1.4.3/disable_gpgconf_check.patch new file mode 100644 index 000..df09530 --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme-1.4.3/disable_gpgconf_check.patch @@ -0,0 +1,39 @@ +From 1.2.0, gpgme will check if gpgconf g13(from 1.3.0) exist, and cause +configure failure if not founding them in cross-compile environment. We can +add the gnupg-native to get them, but still have some issues: + +1. need add new package: libksba, update libassuan(not in sato), and extend + native support in some other packages(libgcrypt, libgpg-error, pth...) +2. Even we have gnupg, the g13 only exist in development branch, so that we + still have the g13 check failure in configure. + +I have searched the compile log, and found gpgconf/g13 are not used. So use a +simple method here, throw a warning mesg rather than an error here just like in +non-cross-compile environment. + +Signed-off-by: Zhai Edwin edwin.z...@intel.com + +Upstream-Status: Inappropriate [embedded specific] + +Index: gpgme-1.3.0/configure.ac +=== +--- gpgme-1.3.0.orig/configure.ac 2010-07-21 09:38:09.0 +0800 gpgme-1.3.0/configure.ac 2010-07-21 09:39:19.0 +0800 +@@ -574,7 +574,7 @@ + *** Could not find gpgconf, install gpgconf or use --with-gpgconf=PATH to enable it + ***]) + else +- AC_MSG_ERROR([ ++ AC_MSG_WARN([ + *** + *** Can not determine path to gpgconf when cross-compiling, use --with-gpgconf=PATH + ***]) +@@ -670,7 +670,7 @@ + *** Could not find g13, install g13 or use --with-g13=PATH to enable it + ***]) + else +- AC_MSG_ERROR([ ++ AC_MSG_WARN([ + *** + *** Can not determine path to g13 when cross-compiling, use --with-g13=PATH + ***]) diff --git a/meta/recipes-support/gpgme/gpgme_1.4.2.bb b/meta/recipes-support/gpgme/gpgme_1.4.2.bb deleted file mode 100644 index 040cdf4..000 --- a/meta/recipes-support/gpgme/gpgme_1.4.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = High-level GnuPG encryption/signing API -DESCRIPTION = GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a High-Level Crypto API for encryption, decryption, signing, signature verification and key management -HOMEPAGE =
Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)!
On 22 August 2013 06:58, Saul Wold s...@linux.intel.com wrote: Cristian Iorga (4): packagegroup-self-hosted: pcmanfm integration This also adds xprop. Is that a dependency of something else, or should it be removed? build-appliance-image: changing the icon theme to sato You'll want to keep hicolor-icon-theme installed, as it provides the skeleton structure for icons. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] [Patch V2] YB5030: Multiple providers are available for runtime libasound-module-bluez (bluez4, bluez5) warning
V2 has a better commit message. The following changes since commit 06f1ebf206911ffe223483da945189a287f20b7d: poky.conf: add Debian 7.1 to SANITY_TESTED_DISTROS (2013-08-22 12:54:39 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ciorga/bluez5_fixes http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ciorga/bluez5_fixes Cristian Iorga (1): default-providers: Set the preferred provider for bluez meta/conf/distro/include/default-providers.inc | 1 + 1 file changed, 1 insertion(+) -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mkfontscale: This no longer needs a full libx11, xproto suffices
configure just looks for xproto so we can drop the libx11 dependency and reduce the amount we build for some small performance improvements and less of the -native stack. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb index 3d248d1..e4cbd69 100644 --- a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb +++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb @@ -8,7 +8,7 @@ font name (XLFD) is generated, and is written together with the file \ name to a file fonts.scale in the directory. The resulting fonts.scale \ is used by the mkfontdir program. -DEPENDS += zlib libfontenc freetype virtual/libx11 +DEPENDS += zlib libfontenc freetype xproto BBCLASSEXTEND = native ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] Build Appliance: pcmanfm integration
On 20 August 2013 17:05, Cristian Iorga cristian.io...@intel.com wrote: +xprop \ As discussed on Jabber, this should be a rdepends of xdg-utils. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] mkfontscale: This no longer needs a full libx11, xproto suffices
From 241ba8ad72afe7010568d0b3b574244f424817fb Mon Sep 17 00:00:00 2001 From: Richard Purdie richard.pur...@linuxfoundation.org Date: Thu, 22 Aug 2013 15:49:08 + Subject: mkfontscale: This no longer needs a full libx11, xproto suffices configure just looks for xproto so we can drop the libx11 dependency and reduce the amount we build for some small performance improvements and less of the -native stack. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb index 3d248d1..65f74c2 100644 --- a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb +++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb @@ -8,7 +8,7 @@ font name (XLFD) is generated, and is written together with the file \ name to a file fonts.scale in the directory. The resulting fonts.scale \ is used by the mkfontdir program. -DEPENDS += zlib libfontenc freetype virtual/libx11 +DEPENDS = util-macros-native zlib libfontenc freetype xproto BBCLASSEXTEND = native ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 00/31] Updated for Final Review
Richard, I updated a few of the commit messages and removed the Python3 patch set along with a couple other patches which include the Build Appliance related ones and cpan patch (I will have an alternate fix soon) Sau! The following changes since commit 4c5756149754d0b18b14595db335f8f5e14cc0a3: busybox.inc: Avoid error when SYSLOG is not enabled (2013-08-22 15:10:06 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/stage http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage Cristian Iorga (1): builder: register directories with pcmanfm Jonathan Liu (3): xf86-video-intel: remove duplicate xf86driproto from DEPENDS xf86-video-vesa: remove duplicate xf86driproto from DEPENDS mesa: enable additional drivers for gallium-llvm x86/x86-64 Kai Kang (3): bc: add patch to fix segmentation fault libx11: upgrade to 1.6.1 libx11-diet: upgrade to 1.6.1 Khem Raj (1): eglibc: Update SRC_URI and fix unpackaged empty dir Lauren Post (2): directfb: Upgrade to 1.6.3 directfb: add fusion patch for hangs Mark Hatle (11): image.bbclass: Add basic support for PACKAGE_EXCLUDE python-smartpm: Add support for excluding package from the install package_rpm.bbclass: Add support for PACKAGE_EXCLUDE to RPM installs python-smartpm: Add support to disable installing recommends package_rpm.bbclass: NO_RECOMMENDATIONS support package_deb.bbclass: Use the WORKDIR not SYSROOT for temp files package_deb: Add support for NO_RECOMMENDATIONS and PACKAGE_EXCLUDE opkg: Add --no-install-recommends option. package_ipk: Add support for NO_RECOMMENDATIONS opkg: Add support for excluding packages from the install package_ipk: Add support for PACKAGE_EXCLUDE Marko Lindqvist (3): texinfo: correct dont-depend-on-help2man.patch SDL2: add recipe boost: fix build when PARALLEL_MAKE is not set Otavio Salvador (1): distro_features_check.bbclass: Allow checking of required/conflicting features Paul Eggleton (1): gst-plugins-good: fix orc enabling via PACKAGECONFIG Roy.Li (1): shadow: backport a patch to make newgrp work Saul Wold (3): libsdl: Backport xData32 patch for x11 update valgrind: Backport patch for eglibc 2.18 gnupg: Update to 2.0.21 Yevhen Kyriukha (1): connman: fix systemd support for connman-* packages. meta/classes/distro_features_check.bbclass | 28 ++ meta/classes/image.bbclass | 39 ++--- meta/classes/package_deb.bbclass | 34 +--- meta/classes/package_ipk.bbclass | 2 + meta/classes/package_rpm.bbclass | 8 ++ meta/classes/rootfs_deb.bbclass| 8 +- meta/conf/bitbake.conf | 1 + meta/conf/documentation.conf | 9 ++ meta/recipes-connectivity/connman/connman.inc | 8 ++ .../eglibc/cross-localedef-native_2.18.bb | 6 +- meta/recipes-core/eglibc/eglibc-package.inc| 4 + meta/recipes-core/eglibc/eglibc_2.18.bb| 6 +- meta/recipes-devtools/opkg/opkg/add-exclude.patch | 99 ++ .../opkg/opkg/no-install-recommends.patch | 78 + meta/recipes-devtools/opkg/opkg_svn.bb | 5 +- .../smart-config-ignore-all-recommends.patch | 24 ++ .../smart-flag-exclude-packages.patch | 70 +++ .../python/python-smartpm_1.4.1.bb | 2 + .../valgrind/valgrind-3.8.1/eglibc-2.18.patch | 27 ++ meta/recipes-devtools/valgrind/valgrind_3.8.1.bb | 1 + meta/recipes-extended/bc/bc_1.06.bb| 3 +- .../bc/files/fix-segment-fault.patch | 28 ++ .../shadow/files/fix-etc-gshadow-reading.patch | 36 meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 1 + .../texinfo-5.1/dont-depend-on-help2man.patch | 43 -- .../builder/files/builder_hob_start.sh | 9 ++ meta/recipes-graphics/directfb/directfb.inc| 2 +- .../directfb/directfb/fusion.patch | 36 .../recipes-graphics/directfb/directfb/mesa9.patch | 29 --- .../{directfb_1.6.1.bb = directfb_1.6.3.bb} | 5 +- .../libsdl-1.2.15/libsdl-1.2.15-xdata32.patch | 19 + meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 3 +- meta/recipes-graphics/libsdl2/libsdl2_2.0.0.bb | 56 meta/recipes-graphics/mesa/mesa.inc| 4 + .../xorg-driver/xf86-video-intel_2.21.13.bb| 2 +- .../xorg-driver/xf86-video-vesa_2.3.2.bb | 2 +- .../{libx11-diet_1.5.0.bb = libx11-diet_1.6.1.bb} | 7 +- meta/recipes-graphics/xorg-lib/libx11.inc | 3 +- .../xorg-lib/libx11/disable_tests.patch| 9 +- .../xorg-lib/libx11/keysymdef_include.patch| 42 - meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 13 --- meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb
Re: [OE-core] [PATCH 1/5] [v4] openssh: Add systemd support
On 22 August 2013 08:19, Shakeel, Muhammad muhammad_shak...@mentor.com wrote: sed -i 's,/bin/,${base_bindir}/,g' ${D}${systemd_unitdir}/system/sshd.socket ${D}${systemd_unitdir}/system/sshd@.service Instead of replacing path fragments, make the source file use a symbol such as @BASE_BINDIR@ @SBIN@ etc. (for all patches) Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] Build Appliance: pcmanfm integration
ACK, fixing now. Thanks, Ross. -Original Message- From: Burton, Ross [mailto:ross.bur...@intel.com] Sent: Thursday, August 22, 2013 6:52 PM To: Iorga, Cristian Cc: OE-core Subject: Re: [OE-core] [PATCH 1/3] Build Appliance: pcmanfm integration On 20 August 2013 17:05, Cristian Iorga cristian.io...@intel.com wrote: +xprop \ As discussed on Jabber, this should be a rdepends of xdg-utils. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [v4][PATCH 2/2] directfb: Add fusion patch for hangs on exit
directfb: Add fusion patch for hangs on exit with following tests: direct_test, fusion_skirmish Signed-off-by: Lauren Post lauren.p...@freescale.com --- meta/recipes-graphics/directfb/directfb.inc|3 +- .../directfb/directfb/fusion.patch | 36 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100755 meta/recipes-graphics/directfb/directfb/fusion.patch diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index 60b12f7..a23209f 100644 --- a/meta/recipes-graphics/directfb/directfb.inc +++ b/meta/recipes-graphics/directfb/directfb.inc @@ -14,7 +14,8 @@ DEPENDS = jpeg libpng freetype zlib tslib INC_PR = r0 SRC_URI = http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \ - file://configurefix.patch + file://configurefix.patch \ + file://fusion.patch S = ${WORKDIR}/DirectFB-${PV} diff --git a/meta/recipes-graphics/directfb/directfb/fusion.patch b/meta/recipes-graphics/directfb/directfb/fusion.patch new file mode 100755 index 000..1f81a67 --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb/fusion.patch @@ -0,0 +1,36 @@ +directfb: Fix for hangs in direct_test, fusion_skirmish on exit + +Upstream-Status: Pending +Signed-off-by: Lauren Post lauren.p...@freescale.com + +--- a/lib/fusion/fusion.c 2013-01-18 22:57:11.0 +0800 b/lib/fusion/fusion.c 2013-07-04 10:42:56.502699119 +0800 +@@ -2853,9 +2853,14 @@ + direct_mutex_lock( world-event_dispatcher_mutex ); + + while (1) { +- if (!world-event_dispatcher_buffers) ++ if (!world-event_dispatcher_buffers){ + direct_waitqueue_wait( world-event_dispatcher_cond, world-event_dispatcher_mutex ); +- ++if (world-dispatch_stop) { ++ D_DEBUG_AT( Fusion_Main_Dispatch, - IGNORING (dispatch_stop!)\n ); ++ direct_mutex_unlock( world-event_dispatcher_mutex ); ++ return NULL; ++} ++ } +buf = (FusionEventDispatcherBuffer *)world-event_dispatcher_buffers; +D_MAGIC_ASSERT( buf, FusionEventDispatcherBuffer ); + +@@ -2872,6 +2877,11 @@ + //D_INFO(waiting...\n); + D_ASSERT( buf-read_pos == buf-write_pos ); + direct_waitqueue_wait( world-event_dispatcher_cond, world-event_dispatcher_mutex ); ++if (world-dispatch_stop) { ++ D_DEBUG_AT( Fusion_Main_Dispatch, - IGNORING (dispatch_stop!)\n ); ++ direct_mutex_unlock( world-event_dispatcher_mutex ); ++ return NULL; ++} +} + +buf = (FusionEventDispatcherBuffer *)world-event_dispatcher_buffers; -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [v4][PATCH 1/2] directfb: Upgrade to 1.6.3
directfb: Upgrade to 1.6.3 Remove mesa patch as 1.6.3 provides compatibility with mesa Signed-off-by: Lauren Post lauren.p...@freescale.com --- meta/recipes-graphics/directfb/directfb.inc|3 +- .../recipes-graphics/directfb/directfb/mesa9.patch | 29 .../{directfb_1.6.1.bb = directfb_1.6.3.bb} |5 ++-- 3 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 meta/recipes-graphics/directfb/directfb/mesa9.patch rename meta/recipes-graphics/directfb/{directfb_1.6.1.bb = directfb_1.6.3.bb} (76%) diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index 7295c35..60b12f7 100644 --- a/meta/recipes-graphics/directfb/directfb.inc +++ b/meta/recipes-graphics/directfb/directfb.inc @@ -14,8 +14,7 @@ DEPENDS = jpeg libpng freetype zlib tslib INC_PR = r0 SRC_URI = http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \ - file://configurefix.patch \ - file://mesa9.patch + file://configurefix.patch S = ${WORKDIR}/DirectFB-${PV} diff --git a/meta/recipes-graphics/directfb/directfb/mesa9.patch b/meta/recipes-graphics/directfb/directfb/mesa9.patch deleted file mode 100644 index 43fd5c2..000 --- a/meta/recipes-graphics/directfb/directfb/mesa9.patch +++ /dev/null @@ -1,29 +0,0 @@ -Patch from upstream to fix build against Mesa 9. - -Upstream-Status: Backport -Signed-off-by: Ross Burton ross.bur...@intel.com - -From 54beba0715a4fead2a0aa5477977347f81fc2bc0 Mon Sep 17 00:00:00 2001 -From: Andreas Shimokawa a...@directfb.org -Date: Wed, 24 Oct 2012 18:01:15 +0200 -Subject: [PATCH] mesa: fix compatibility with mesa 9.0 - - systems/mesa/mesa_surface_pool.c |2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/systems/mesa/mesa_surface_pool.c b/systems/mesa/mesa_surface_pool.c -index 0a588bb..bfb5ff3 100644 a/systems/mesa/mesa_surface_pool.c -+++ b/systems/mesa/mesa_surface_pool.c -@@ -297,7 +297,7 @@ mesaAllocateBuffer( CoreSurfacePool *pool, - alloc-bo = gbm_bo_create( mesa-gbm, surface-config.size.w, surface-config.size.h, GBM_BO_FORMAT_ARGB, - GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING ); - alloc-handle = gbm_bo_get_handle( alloc-bo ).u32; -- alloc-pitch = gbm_bo_get_pitch( alloc-bo ); -+ alloc-pitch = gbm_bo_get_stride( alloc-bo ); - - alloc-image = eglCreateImageKHR( mesa-dpy, NULL, EGL_NATIVE_PIXMAP_KHR, alloc-bo, NULL ); - --- -1.7.9.5 diff --git a/meta/recipes-graphics/directfb/directfb_1.6.1.bb b/meta/recipes-graphics/directfb/directfb_1.6.3.bb similarity index 76% rename from meta/recipes-graphics/directfb/directfb_1.6.1.bb rename to meta/recipes-graphics/directfb/directfb_1.6.3.bb index 1230d12..277e9a9 100644 --- a/meta/recipes-graphics/directfb/directfb_1.6.1.bb +++ b/meta/recipes-graphics/directfb/directfb_1.6.3.bb @@ -22,6 +22,5 @@ EXTRA_OECONF = \ LEAD_SONAME = libdirectfb-1.6.so.0 -SRC_URI[md5sum] = 76d3066e75664aa79204af545f2f3c65 -SRC_URI[sha256sum] = f47575ea35dd8a30e548c04bf52d8565756d0bed45d1cf9f8afac1cf9b521c45 - +SRC_URI[md5sum] = 641e8e999c017770da647f9b5b890906 +SRC_URI[sha256sum] = 7a96aced0f69b2ec0810e9923068e61c21e6b19dd593e09394c872414df75e70 -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 0/4] YB2370: Build Appliance integrates a filemanager
PCManFM filemanager is integrated in Build Appliance; It will handle folders and files navigation from within Hob. The following changes since commit 02521a40d36d06d269ec14ce9000f2941d6980af: busybox.inc: Avoid error when SYSLOG is not enabled (2013-08-22 15:11:13 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ciorga/YB2370 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ciorga/YB2370 Cristian Iorga (4): xdg-utils: add runtime dependency on xprop Build Appliance: pcmanfm integration build-appliance-image: changing the icon theme to sato builder: register directories with pcmanfm meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 5 - meta/recipes-extended/xdg-utils/xdg-utils_1.1.0-rc1.bb | 1 + meta/recipes-graphics/builder/files/builder_hob_start.sh| 9 + 3 files changed, 14 insertions(+), 1 deletion(-) -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 3/4] build-appliance-image: changing the icon theme to sato
Hicolor icon theme does not properly displays icons for folders. Sato icon theme is working correctly. Also, settings-daemon needs to be added to image in order to properly display folder icons. Signed-off-by: Cristian Iorga cristian.io...@intel.com --- meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 2d35c16..17dc980 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -123,7 +123,8 @@ RDEPENDS_packagegroup-self-hosted-extended = \ grep \ groff \ gzip \ -hicolor-icon-theme \ +settings-daemon \ +sato-icon-theme \ libaio \ libusb1 \ libxml2 \ -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 4/4] builder: register directories with pcmanfm
Register directories to be opened with PCManFM filemanager using xdg-open in Build Appliance. Signed-off-by: Cristian Iorga cristian.io...@intel.com --- meta/recipes-graphics/builder/files/builder_hob_start.sh | 9 + 1 file changed, 9 insertions(+) diff --git a/meta/recipes-graphics/builder/files/builder_hob_start.sh b/meta/recipes-graphics/builder/files/builder_hob_start.sh index 40616f5..b3a0540 100644 --- a/meta/recipes-graphics/builder/files/builder_hob_start.sh +++ b/meta/recipes-graphics/builder/files/builder_hob_start.sh @@ -9,6 +9,15 @@ export PSEUDO_LOCALSTATEDIR=/home/builder/pseudo export PSEUDO_LIBDIR=/usr/lib/pseudo/lib64 export GIT_PROXY_COMMAND=/home/builder/poky/scripts/oe-git-proxy +#start pcmanfm in daemon mode to allow asynchronous launch +pcmanfm -d + +#register folders to open with PCManFM filemanager +if [ ! -d /home/ubik/tmp/.local/share/applications ]; then +mkdir -p /home/builder/.local/share/applications/ +xdg-mime default pcmanfm.desktop inode/directory +fi + cd /home/builder/poky . ./oe-init-build-env -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/4] Build Appliance: pcmanfm integration
PCManFm file manager is integrated in Build Appliance; xdg-utils is also integrated for file association support. Signed-off-by: Cristian Iorga cristian.io...@intel.com --- meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 6a0722a..2d35c16 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -38,11 +38,13 @@ RDEPENDS_packagegroup-self-hosted-host-tools = \ hdparm \ iptables \ lsb \ +xdg-utils \ mc \ mc-fish \ mc-helpers \ mc-helpers-perl \ mc-helpers-python \ +pcmanfm \ parted \ pseudo \ screen \ -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core