[OE-core] [PATCH 0/1] ltp: Don't link against libfl
The following changes since commit 5f81d9d1fa537445d5da49e12de1e16300e94552: bitbake: runqueue: Use SIGCHLD instead of polling waitpid (2014-03-10 11:10:02 -0700) are available in the git repository at: git://git.pokylinux.org/poky-contrib chonglu/ltp http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/ltp Chong Lu (1): ltp: Don't link against libfl .../ltp/ltp/ltp-Do-not-link-against-libfl.patch| 31 ++ meta/recipes-extended/ltp/ltp_20140115.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-extended/ltp/ltp/ltp-Do-not-link-against-libfl.patch -- 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] ltp: Don't link against libfl
We have already defined yywrap function in scan.l file. After this, we no longer need to link against libfl. Since we are using --as-needed by default in linker, which means we end up with errors like libfl.so: undefined reference to `yylex' Signed-off-by: Chong Lu chong...@windriver.com --- .../ltp/ltp/ltp-Do-not-link-against-libfl.patch| 31 ++ meta/recipes-extended/ltp/ltp_20140115.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-extended/ltp/ltp/ltp-Do-not-link-against-libfl.patch diff --git a/meta/recipes-extended/ltp/ltp/ltp-Do-not-link-against-libfl.patch b/meta/recipes-extended/ltp/ltp/ltp-Do-not-link-against-libfl.patch new file mode 100644 index 000..3e4aa73 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/ltp-Do-not-link-against-libfl.patch @@ -0,0 +1,31 @@ +From 5bda9c0af56869c6ff2c25d38ea087179c946bc6 Mon Sep 17 00:00:00 2001 +From: Chong Lu chong...@windriver.com +Date: Tue, 11 Mar 2014 14:47:22 +0800 +Subject: [PATCH] ltp: Don't link against libfl + +We have already defined yywrap function in scan.l file. After this, we no longer need to +link against libfl and so no longer get errors about undefined references to yylex. + +Upstream-status: Pending + +Signed-off-by: Chong Lu chong...@windriver.com +--- + pan/Makefile |2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pan/Makefile b/pan/Makefile +index 4cc6466..a4b575b 100644 +--- a/pan/Makefile b/pan/Makefile +@@ -31,7 +31,7 @@ CPPFLAGS += -Wno-error + + CPPFLAGS += -I$(abs_srcdir) + +-LDLIBS+= -lm $(LEXLIB) ++LDLIBS+= -lm + + LFLAGS+= -l + +-- +1.7.9.5 + diff --git a/meta/recipes-extended/ltp/ltp_20140115.bb b/meta/recipes-extended/ltp/ltp_20140115.bb index 2a3999b..c2ee9fb 100644 --- a/meta/recipes-extended/ltp/ltp_20140115.bb +++ b/meta/recipes-extended/ltp/ltp_20140115.bb @@ -26,6 +26,7 @@ SRC_URI = git://github.com/linux-test-project/ltp.git \ file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \ file://regen-makefile.patch \ file://ffsb-remove-hardcoded-configure.patch \ +file://ltp-Do-not-link-against-libfl.patch \ S = ${WORKDIR}/git -- 1.8.1.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [dora]Re: Failure in license.bbclass
It seems dora has some patches of oe-pkgdata-util not rebased from poky, such as: commit 6ce287937e86a43d696e3615aa18d439928b7691 Author: Paul Eggleton paul.eggle...@linux.intel.com Date: Fri Oct 18 14:52:10 2013 +0100 scripts/oe-pkgdata-util: add ability to find a recipe from a target package //Hongxu On 03/11/2014 04:48 PM, Jussi Laako wrote: Hi, Your recent (from November) change to license.bbclass in Yocto Dora release completely breaks COPY_LIC_DIRS. Running the command manually for any package results in command line syntax error: jussi@porkkala:/home/scratch/jussi/poky/build oe-pkgdata-util lookup-recipe /home/scratch/jussi/poky/build/tmp/sysroots/cubox-i/pkgdata alsa-conf-base syntax: oe-pkgdata-util glob [-d] pkgdatadir vendor-os pkglist globs read-value [-d] pkgdatadir vendor-os value-name package-name_package_architecture Best regards, - Jussi -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [dora]Re: Failure in license.bbclass
Hi Hongxu, The person you need to CC is Robert Yang since he maintains the dora branch. FWIW I hadn't anticipated this patch being backported, but I guess if functionality now in dora relies upon it we have no choice :( Cheers, Paul On Tuesday 11 March 2014 17:16:05 Hongxu Jia wrote: It seems dora has some patches of oe-pkgdata-util not rebased from poky, such as: commit 6ce287937e86a43d696e3615aa18d439928b7691 Author: Paul Eggleton paul.eggle...@linux.intel.com Date: Fri Oct 18 14:52:10 2013 +0100 scripts/oe-pkgdata-util: add ability to find a recipe from a target package //Hongxu On 03/11/2014 04:48 PM, Jussi Laako wrote: Hi, Your recent (from November) change to license.bbclass in Yocto Dora release completely breaks COPY_LIC_DIRS. Running the command manually for any package results in command line syntax error: jussi@porkkala:/home/scratch/jussi/poky/build oe-pkgdata-util lookup-recipe /home/scratch/jussi/poky/build/tmp/sysroots/cubox-i/pkgdata alsa-conf-base syntax: oe-pkgdata-util glob [-d] pkgdatadir vendor-os pkglist globs read-value [-d] pkgdatadir vendor-os value-name package-name_package_architecture Best regards, - Jussi -- 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] package_deb: Map TARGET_ARCH x86_64 to DPKG_ARCH amd64
Without this patch packages are generated as x86_64. Which cannot be installed by default. root@qt5022:~# dpkg -i alsa-utils_1.0.27.2-r0_x86-64.deb dpkg: error processing alsa-utils_1.0.27.2-r0_x86-64.deb (--install): package architecture (x86-64) does not match system (amd64) Errors were encountered while processing: alsa-utils_1.0.27.2-r0_x86-64.deb Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@gmail.com --- meta/classes/package_deb.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 6a8e080..b391e5c 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -430,6 +430,8 @@ python () { darch = d.getVar('DPKG_ARCH', True) if darch in [x86, i486, i586, i686, pentium]: d.setVar('DPKG_ARCH', 'i386') +elif darch == x86_64: + d.setVar('DPKG_ARCH', 'amd64') elif darch == arm: d.setVar('DPKG_ARCH', 'armel') } -- 1.9.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [dora]Re: Failure in license.bbclass
On 03/11/2014 06:02 PM, Paul Eggleton wrote: Hi Hongxu, The person you need to CC is Robert Yang since he maintains the dora branch. FWIW I hadn't anticipated this patch being backported, but I guess if functionality now in dora relies upon it we have no choice :( I'm sorry to say that it seems that we can't backport this patch since we need at least the following patches, it is not a good idea to backport it: d69931d scripts/oe-pkgdata-util: fix global name 'debug' is not defined 6ce2879 scripts/oe-pkgdata-util: add ability to find a recipe from a target package 948a714 scripts/oe-pkgdata-util: add ability to look up runtime package names 48755f1 scripts/oe-pkgdata-util: add ability to search for a target path 4ec1f8c scripts/oe-pkgdata-util: check path arguments to ensure they exist 8b42409 scripts/oe-pkgdata-util: improve help text and command line parsing 9ce903b scripts/oe-pkgdata-util: remove remnants of former pkgdata structure It is because I backported this commit: (I'm sorry about that) commit e58a1499accd74d3e6fe4f899711d4c680ebc18f Author: Hongxu Jia hongxu@windriver.com Date: Wed Nov 20 18:35:39 2013 +0800 license.bbclass: fix copying license directories failed It is used for fixing this bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=5572 Enalbe COPY_LIC_MANIFEST and COPY_LIC_DIRS: No kernel license is installed in image But it used the oe-pkgdata-util lookup-recipe which is only on master branch, I think that we'd better: 1) Revert this commit, then it works with minor problems. Or 2) Fix the oe-pkgdata-util lookup-recipe on dora. // Robert Cheers, Paul On Tuesday 11 March 2014 17:16:05 Hongxu Jia wrote: It seems dora has some patches of oe-pkgdata-util not rebased from poky, such as: commit 6ce287937e86a43d696e3615aa18d439928b7691 Author: Paul Eggleton paul.eggle...@linux.intel.com Date: Fri Oct 18 14:52:10 2013 +0100 scripts/oe-pkgdata-util: add ability to find a recipe from a target package //Hongxu On 03/11/2014 04:48 PM, Jussi Laako wrote: Hi, Your recent (from November) change to license.bbclass in Yocto Dora release completely breaks COPY_LIC_DIRS. Running the command manually for any package results in command line syntax error: jussi@porkkala:/home/scratch/jussi/poky/build oe-pkgdata-util lookup-recipe /home/scratch/jussi/poky/build/tmp/sysroots/cubox-i/pkgdata alsa-conf-base syntax: oe-pkgdata-util glob [-d] pkgdatadir vendor-os pkglist globs read-value [-d] pkgdatadir vendor-os value-name package-name_package_architecture Best regards, - Jussi -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] oeqa/utils/qemurunner: use the right kill call so we don't send SIGTERM to bitbake-worker
After recent bitbake-worker changes [1] this was killing the bitbake-worker, which isn't what we want and kill(-pid) was the wrong call anyway. runqemu.pid is the right PGID as the process was started with preexec_fn=setpgrp (so no need to do os.getpgid(self.runqemu.pid)) [1] http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=15688798520896690561824b2fdc227c8a365c82 Signed-off-by: Stefan Stanacar stefanx.stana...@intel.com --- meta/lib/oeqa/utils/qemurunner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index c664d00..f1a7e24 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -162,13 +162,13 @@ class QemuRunner: if self.runqemu: bb.note(Sending SIGTERM to runqemu) -os.kill(-self.runqemu.pid,signal.SIGTERM) +os.killpg(self.runqemu.pid, signal.SIGTERM) endtime = time.time() + self.runqemutime while self.runqemu.poll() is None and time.time() endtime: time.sleep(1) if self.runqemu.poll() is None: bb.note(Sending SIGKILL to runqemu) -os.kill(-self.runqemu.pid,signal.SIGKILL) +os.killpg(self.runqemu.pid, signal.SIGKILL) self.runqemu = None if self.server_socket: self.server_socket.close() -- 1.8.5.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [dora][PATCH] avahi: handle SO_REUSEPORT not being available
Linux 3.9 doesn't have the SO_REUSEPORT option so instead of failing to start when built with =3.9 kernel headers but booted on 3.9 kernels, continue as if SO_REUSEPORT wasn't available. (From OE-Core rev: 85e89da55f778ad3713460cb0df1435d82e94510) Signed-off-by: Ross Burton ross.bur...@intel.com Signed-off-by: Saul Wold s...@linux.intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-connectivity/avahi/avahi.inc |1 + .../avahi/files/reuseport-check.patch | 30 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-connectivity/avahi/files/reuseport-check.patch diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index cf063db..02dd5ed 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -25,6 +25,7 @@ SRC_URI = http://avahi.org/download/avahi-${PV}.tar.gz \ file://avahi_fix_install_issue.patch \ file://fix_for_automake_1.12.x.patch \ file://out-of-tree.patch \ + file://reuseport-check.patch \ USERADD_PACKAGES = avahi-daemon avahi-autoipd diff --git a/meta/recipes-connectivity/avahi/files/reuseport-check.patch b/meta/recipes-connectivity/avahi/files/reuseport-check.patch new file mode 100644 index 000..bb81c2c --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/reuseport-check.patch @@ -0,0 +1,30 @@ +Fix avahi-daemon when running on kernel 3.9 (patch taken from Ubuntu). + +Upstream-Status: Pending (unmaintained upstream) +Signed-off-by: Ross Burton ross.bur...@intel.com + +Description: SO_REUSEPORT may not exist in running kernel + When userspace defines SO_REUSEPORT we will attempt to enable socket + port number reuse. However if the running kernel does not support + this call it will fail preventing daemon startup. If this call is + present but fails ENOPROTOOPT then we know that actually the kernel + does not support it and we should continue as if we did not have the + call at all. (LP: #1228204) + . + This patch could be removed from the debian package after jessie release. +Author: Andy Whitcroft a...@canonical.com + +Index: avahi-0.6.31/avahi-core/socket.c +=== +--- avahi-0.6.31.orig/avahi-core/socket.c 2013-09-20 16:36:50.0 +0100 avahi-0.6.31/avahi-core/socket.c 2013-09-20 16:38:23.781863644 +0100 +@@ -177,7 +177,8 @@ + yes = 1; + if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, yes, sizeof(yes)) 0) { + avahi_log_warn(SO_REUSEPORT failed: %s, strerror(errno)); +-return -1; ++if (errno != ENOPROTOOPT) ++return -1; + } + #endif + -- 1.7.10.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] State of bitbake world, Failed tasks 2014-03-07
Biggest difference from last e-mail is aclocal changes which can possibly explain increased number of do_configure failures, I've asked Richard to delay merging B!=S change until we resolve or at least analyze these new failures, so any help with would be highly appreciated. I'll send slightly newer report in few minutes. http://www.openembedded.org/wiki/Bitbake_World_Status == Failed tasks 2014-03-07 == === common (18) === * meta-openembedded/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb, do_compile * meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb, do_configure * meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb, do_configure * meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb, do_compile * meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb, do_compile * meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb, do_compile * meta-openembedded/meta-oe/recipes-connectivity/daq/daq_2.0.2.bb, do_install * meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb, do_compile * meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb, do_compile * meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb, do_compile * meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb, do_compile * meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb, do_configure * meta-openembedded/meta-oe/recipes-navigation/monav/monav_0.3.bb, do_compile * meta-openembedded/meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb, do_compile * meta-openembedded/meta-oe/recipes-support/asio/asio_1.4.1.bb, do_compile * meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb, do_install * meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.02.97.bb, do_compile * openembedded-core/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb, do_configure === common-x86 (11) === * meta-browser/recipes-mozilla/firefox/firefox_10.0.11esr.bb, do_compile * meta-openembedded/meta-efl/recipes-efl/e17/eve_svn.bb, do_compile * meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.24.bb, do_compile * meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb, do_configure * meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb, do_compile * meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_git.bb, do_configure * meta-openembedded/meta-oe/recipes-support/emacs/emacs_23.4.bb, do_compile * meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.3.0.bb, do_configure * meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb, do_configure * meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb, do_configure * openembedded-core/meta/recipes-bsp/grub/grub_2.00.bb, do_package === qemuarm (4) === * meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.18.4.bb, do_compile * meta-openembedded/meta-oe/recipes-support/mongodb/mongodb_git.bb, do_compile * openembedded-core/meta/recipes-bsp/grub/grub_git.bb, do_package * openembedded-core/meta/recipes-gnome/gtk+/gtk+_2.24.22.bb, do_compile === qemux86 (1) === * meta-openembedded/meta-initramfs/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.10.bb, do_compile === qemux86_64 (1) === * meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb, do_configure === Number of failed tasks === {| class=wikitable |- ||qemuarm ||22 ||http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches//log.world.20140306_000713.log/ |- ||qemux86 ||31 ||http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches//log.world.20140306_164853.log/ |- ||qemux86_64||30 ||http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches//log.world.20140307_122924.log/ |} -- 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] State of bitbake world, Failed tasks 2014-03-11
On Tue, Mar 11, 2014 at 02:45:04PM +0100, Martin Jansa wrote: Biggest difference from last e-mail is aclocal changes which can possibly explain increased number of do_configure failures, I've asked Richard to delay merging B!=S change until we resolve or at least analyze these new failures, so any help with would be highly appreciated. I'll send slightly newer report in few minutes. http://www.openembedded.org/wiki/Bitbake_World_Status == Failed tasks 2014-03-11 == === common (24) === * meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.24.bb, do_compile * meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb, do_configure * meta-openembedded/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb, do_compile * meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb, do_configure * meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb, do_configure * meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_2.1.2.bb, do_compile * meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb, do_compile * meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb, do_compile * meta-openembedded/meta-oe/recipes-connectivity/daq/daq_2.0.2.bb, do_install * meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb, do_compile * meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb, do_compile * meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb, do_compile * meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb, do_compile * meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_git.bb, do_configure * meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb, do_compile * meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb, do_configure * meta-openembedded/meta-oe/recipes-navigation/monav/monav_0.3.bb, do_compile * meta-openembedded/meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb, do_compile * meta-openembedded/meta-oe/recipes-support/asio/asio_1.4.1.bb, do_compile * meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb, do_install * meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.02.97.bb, do_compile * meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.3.0.bb, do_configure * meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb, do_configure * meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb, do_configure === common-x86 (4) === * meta-browser/recipes-mozilla/firefox/firefox_10.0.11esr.bb, do_compile * meta-openembedded/meta-efl/recipes-efl/e17/eve_svn.bb, do_compile * meta-openembedded/meta-oe/recipes-support/emacs/emacs_23.4.bb, do_compile * openembedded-core/meta/recipes-bsp/grub/grub_2.00.bb, do_package === qemuarm (3) === * meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.18.4.bb, do_compile * meta-openembedded/meta-oe/recipes-support/mongodb/mongodb_git.bb, do_compile * openembedded-core/meta/recipes-bsp/grub/grub_git.bb, do_package === qemux86 (1) === * meta-openembedded/meta-initramfs/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.10.bb, do_compile === qemux86_64 (1) === * meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb, do_configure === Number of failed tasks === {| class=wikitable |- ||qemuarm ||27 ||http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches//log.world.20140308_101600.log/ |- ||qemux86 ||30 ||http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches//log.world.20140309_065255.log/ |- ||qemux86_64||29 ||http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches//log.world.20140310_024804.log/ |} -- 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] lsbtest: fix comparison bashism
== is a bashism use = instead. Signed-off-by: Stefan Stanacar stefanx.stana...@intel.com --- meta/recipes-extended/lsb/lsbtest/LSB_Test.sh | 4 ++-- meta/recipes-extended/lsb/lsbtest_1.0.bb | 8 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh index 12f0054..ab79985 100644 --- a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh +++ b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh @@ -272,12 +272,12 @@ then fi if ! `grep -F -q noarch-suse ${PLATFORM_FILE}`; then - if [ ${ARCH} == i686 ];then + if [ ${ARCH} = i686 ];then echo i486-suse ${PLATFORM_FILE} echo i486-noarch ${PLATFORM_FILE} echo i486-pc ${PLATFORM_FILE} echo noarch-suse ${PLATFORM_FILE} - elif [ ${ARCH} == x86_64 ]; then + elif [ ${ARCH} = x86_64 ]; then echo i486-suse ${PLATFORM_FILE} echo i486-noarch ${PLATFORM_FILE} echo i486-pc ${PLATFORM_FILE} diff --git a/meta/recipes-extended/lsb/lsbtest_1.0.bb b/meta/recipes-extended/lsb/lsbtest_1.0.bb index a877beb..f61251e 100644 --- a/meta/recipes-extended/lsb/lsbtest_1.0.bb +++ b/meta/recipes-extended/lsb/lsbtest_1.0.bb @@ -19,15 +19,15 @@ do_install() { install -d ${D}/opt/lsb-test install -m 0644 ${S}/packages_list ${D}/opt/lsb-test/packages_list install -m 0644 ${S}/session ${D}/opt/lsb-test/session - if [ ${TARGET_ARCH} == i586 ];then + if [ ${TARGET_ARCH} = i586 ];then sed -i -e 's/lsbarch/ia32/g' -e 's/targetarch/i486/g' ${D}/opt/lsb-test/packages_list sed -i -e 's/targetarch/x86/g' ${D}/opt/lsb-test/session fi - if [ ${TARGET_ARCH} == x86_64 ];then + if [ ${TARGET_ARCH} = x86_64 ];then sed -i -e 's/lsbarch/amd64/g' -e 's/targetarch/x86_64/g' ${D}/opt/lsb-test/packages_list sed -i -e 's/targetarch/x86-64/g' ${D}/opt/lsb-test/session fi - if [ ${TARGET_ARCH} == powerpc ];then + if [ ${TARGET_ARCH} = powerpc ];then sed -i -e 's/lsbarch/ppc32/g' -e 's/targetarch/ppc/g' ${D}/opt/lsb-test/packages_list sed -i -e 's/targetarch/PPC32/g' ${D}/opt/lsb-test/session fi @@ -37,7 +37,7 @@ do_install() { # in the package_list when MLIB=lib64 is being used. # Otherwise, by default, the ppc32 LSB packages # will be downloaded by LSB_Test.sh - if [ ${TARGET_ARCH} == powerpc64 ];then + if [ ${TARGET_ARCH} = powerpc64 ];then if [ ${PN} != ${BPN} ];then sed -i -e 's/lsbarch/ppc64/g' -e 's/targetarch/ppc64/g' ${D}/opt/lsb-test/packages_list sed -i -e 's/targetarch/PPC64/g' ${D}/opt/lsb-test/session -- 1.8.5.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2 v2] bind: Update to 9.9.5
Remove CVE patches that are in bind Updated COPYRIGHT includes date changes the NetBSD Copyright Modifies the Base BSD License to 3-Clause (removes advertising clause)w Add patch to disable running tests on host Add python-core to RDEPENDS for dnssec-checkds and dnssec-coverage and fix path to python Signed-off-by: Saul Wold s...@linux.intel.com --- .../bind-9.8.1-CVE-2012-5166.patch | 0 .../{bind-9.8.1 = bind}/bind-CVE-2011-4313.patch | 0 .../{bind-9.8.1 = bind}/bind-CVE-2012-1667.patch | 0 .../{bind-9.8.1 = bind}/bind-CVE-2012-3817.patch | 0 .../{bind-9.8.1 = bind}/bind-CVE-2013-2266.patch | 0 .../bind-Fix-CVE-2012-4244.patch| 0 .../bind/{bind-9.8.1 = bind}/conf.patch| 0 .../bind/{bind-9.8.1 = bind}/cross-build-fix.patch | 0 .../bind/bind/dont-test-on-host.patch | 13 + .../make-etc-initd-bind-stop-work.patch | 0 .../mips1-not-support-opcode.diff | 0 .../bind/{bind_9.8.1.bb = bind_9.9.5.bb} | 21 + 12 files changed, 22 insertions(+), 12 deletions(-) rename meta/recipes-connectivity/bind/{bind-9.8.1 = bind}/bind-9.8.1-CVE-2012-5166.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.8.1 = bind}/bind-CVE-2011-4313.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.8.1 = bind}/bind-CVE-2012-1667.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.8.1 = bind}/bind-CVE-2012-3817.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.8.1 = bind}/bind-CVE-2013-2266.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.8.1 = bind}/bind-Fix-CVE-2012-4244.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.8.1 = bind}/conf.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.8.1 = bind}/cross-build-fix.patch (100%) create mode 100644 meta/recipes-connectivity/bind/bind/dont-test-on-host.patch rename meta/recipes-connectivity/bind/{bind-9.8.1 = bind}/make-etc-initd-bind-stop-work.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.8.1 = bind}/mips1-not-support-opcode.diff (100%) rename meta/recipes-connectivity/bind/{bind_9.8.1.bb = bind_9.9.5.bb} (76%) diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-9.8.1-CVE-2012-5166.patch b/meta/recipes-connectivity/bind/bind/bind-9.8.1-CVE-2012-5166.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-9.8.1-CVE-2012-5166.patch rename to meta/recipes-connectivity/bind/bind/bind-9.8.1-CVE-2012-5166.patch diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2011-4313.patch b/meta/recipes-connectivity/bind/bind/bind-CVE-2011-4313.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2011-4313.patch rename to meta/recipes-connectivity/bind/bind/bind-CVE-2011-4313.patch diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-1667.patch b/meta/recipes-connectivity/bind/bind/bind-CVE-2012-1667.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-1667.patch rename to meta/recipes-connectivity/bind/bind/bind-CVE-2012-1667.patch diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-3817.patch b/meta/recipes-connectivity/bind/bind/bind-CVE-2012-3817.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2012-3817.patch rename to meta/recipes-connectivity/bind/bind/bind-CVE-2012-3817.patch diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2013-2266.patch b/meta/recipes-connectivity/bind/bind/bind-CVE-2013-2266.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-CVE-2013-2266.patch rename to meta/recipes-connectivity/bind/bind/bind-CVE-2013-2266.patch diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/bind-Fix-CVE-2012-4244.patch b/meta/recipes-connectivity/bind/bind/bind-Fix-CVE-2012-4244.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.8.1/bind-Fix-CVE-2012-4244.patch rename to meta/recipes-connectivity/bind/bind/bind-Fix-CVE-2012-4244.patch diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/conf.patch b/meta/recipes-connectivity/bind/bind/conf.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.8.1/conf.patch rename to meta/recipes-connectivity/bind/bind/conf.patch diff --git a/meta/recipes-connectivity/bind/bind-9.8.1/cross-build-fix.patch b/meta/recipes-connectivity/bind/bind/cross-build-fix.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.8.1/cross-build-fix.patch rename to meta/recipes-connectivity/bind/bind/cross-build-fix.patch diff --git a/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch b/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch new file mode 100644 index 000..8920740 --- /dev/null +++ b/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch @@ -0,0 +1,13 @@
[OE-core] [PATCH 0/6 V3] refactor the archiver*.bbclass
=== V3: * Do the unpack, patch and configure in another WORKDIR as RP and Ross suggested, so that it would not affact the default build dependencies, thanks for Ross' prototype. * Don't archive the logs (temp/log.do*), mainly because of: - We can easily get the log via reset the T rather than use the archiver. - If we need archive the logs, we must let the task to run as the last one, but it's hard to do this. === V2: * Fix the warning between different machines which is reported by Martin * Fix the error when the archiver.bbclass is not inherited but ARCHIVER_MODE[type] = srpm is set, reported by Ross. * Fix the archiving for gcc staff which uses the shared source according to the recently changes of prefuncs and postfuncs in bitbake, so it only works well with bitbake's up to date master branch, if we want to backport it, we also need backport the pre/postfuncs related patches. === V1: * The archive*.bbclass didn't work, and there were a few problems, for example: 1) There were a few duplicated code 2) There was no src_dir.org (or orig), but the diff command still use it, and it is not easy to fix this issue if we don't change a lot of the code. 3) It didn't archive the source for the native or gcc 4) The work flow is not very well 5) The subprocess.call('fakeroot cp ' should be removed 6) And others ... * So that we have to refactor it, the benefits are: 1) Fix the problems and make it work well. 2) Reduce more than 400 lines in total. 3) Make it easy to use. // Robert The following changes since commit 23f7decb84922a3467c5b10b013e66596926b5cf: .templateconf: New file for customized template defaults (2014-03-11 08:11:07 -0700) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/archiver_v3 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/archiver_v3 Robert Yang (6): classes/archive*.bbclass: remove archive-*-source.bbclass archiver.bbclass: refactor it package_rpm.bbclass: archive the source to srpm package archiver.bbclass: move a few code to copyleft_compliance.bbclass local.conf.sample.extended: update for the archiver patch.bbclass: do_patch: unset TMPDIR from environment meta/classes/archive-configured-source.bbclass | 65 -- meta/classes/archive-original-source.bbclass | 65 -- meta/classes/archive-patched-source.bbclass| 65 -- meta/classes/archiver.bbclass | 791 + meta/classes/copyleft_compliance.bbclass | 55 +- meta/classes/package_rpm.bbclass | 33 +- meta/classes/patch.bbclass | 1 + meta/conf/local.conf.sample.extended | 63 +- 8 files changed, 367 insertions(+), 771 deletions(-) delete mode 100644 meta/classes/archive-configured-source.bbclass delete mode 100644 meta/classes/archive-original-source.bbclass delete mode 100644 meta/classes/archive-patched-source.bbclass -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] archiver.bbclass: move a few code to copyleft_compliance.bbclass
Move the code which is only used by copyleft_compliance.bbclass from archiver.bbclassc, and remove the inherit archiver from copyleft_compliance.bbclass. The archiver.bbclass is used for archiving various types of sources, but the copyleft_compliance.bbclass is used for analysing the license, they don't have much relationships. [YOCTO #4986] [YOCTO #5113] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/classes/archiver.bbclass| 19 --- meta/classes/copyleft_compliance.bbclass | 55 ++-- 2 files changed, 53 insertions(+), 21 deletions(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index b1109dc..54b498d 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -35,25 +35,6 @@ do_ar_original[dirs] = ${ARCHIVER_OUTDIR} ${ARCHIVER_WORKDIR} # This is a convenience for the shell script to use it -COPYLEFT_LICENSE_INCLUDE ?= 'GPL* LGPL*' -COPYLEFT_LICENSE_INCLUDE[type] = 'list' -COPYLEFT_LICENSE_INCLUDE[doc] = 'Space separated list of globs which include licenses' - -COPYLEFT_LICENSE_EXCLUDE ?= 'CLOSED Proprietary' -COPYLEFT_LICENSE_EXCLUDE[type] = 'list' -COPYLEFT_LICENSE_EXCLUDE[doc] = 'Space separated list of globs which exclude licenses' - -COPYLEFT_RECIPE_TYPE ?= '${@copyleft_recipe_type(d)}' -COPYLEFT_RECIPE_TYPE[doc] = 'The type of the current recipe (e.g. target, native, cross)' - -COPYLEFT_RECIPE_TYPES ?= 'target' -COPYLEFT_RECIPE_TYPES[type] = 'list' -COPYLEFT_RECIPE_TYPES[doc] = 'Space separated list of recipe types to include' - -COPYLEFT_AVAILABLE_RECIPE_TYPES = 'target native nativesdk cross crosssdk cross-canadian' -COPYLEFT_AVAILABLE_RECIPE_TYPES[type] = 'list' -COPYLEFT_AVAILABLE_RECIPE_TYPES[doc] = 'Space separated list of available recipe types' - python () { pn = d.getVar('PN', True) diff --git a/meta/classes/copyleft_compliance.bbclass b/meta/classes/copyleft_compliance.bbclass index 32aa757..b47c2c9 100644 --- a/meta/classes/copyleft_compliance.bbclass +++ b/meta/classes/copyleft_compliance.bbclass @@ -6,11 +6,62 @@ # # vi:sts=4:sw=4:et -# Need the copyleft_should_include -inherit archiver +COPYLEFT_LICENSE_INCLUDE ?= 'GPL* LGPL*' +COPYLEFT_LICENSE_INCLUDE[type] = 'list' +COPYLEFT_LICENSE_INCLUDE[doc] = 'Space separated list of globs which include licenses' + +COPYLEFT_LICENSE_EXCLUDE ?= 'CLOSED Proprietary' +COPYLEFT_LICENSE_EXCLUDE[type] = 'list' +COPYLEFT_LICENSE_EXCLUDE[doc] = 'Space separated list of globs which exclude licenses' + +COPYLEFT_RECIPE_TYPE ?= '${@copyleft_recipe_type(d)}' +COPYLEFT_RECIPE_TYPE[doc] = 'The type of the current recipe (e.g. target, native, cross)' + +COPYLEFT_RECIPE_TYPES ?= 'target' +COPYLEFT_RECIPE_TYPES[type] = 'list' +COPYLEFT_RECIPE_TYPES[doc] = 'Space separated list of recipe types to include' + +COPYLEFT_AVAILABLE_RECIPE_TYPES = 'target native nativesdk cross crosssdk cross-canadian' +COPYLEFT_AVAILABLE_RECIPE_TYPES[type] = 'list' +COPYLEFT_AVAILABLE_RECIPE_TYPES[doc] = 'Space separated list of available recipe types' COPYLEFT_SOURCES_DIR ?= '${DEPLOY_DIR}/copyleft_sources' +def copyleft_recipe_type(d): +for recipe_type in oe.data.typed_value('COPYLEFT_AVAILABLE_RECIPE_TYPES', d): +if oe.utils.inherits(d, recipe_type): +return recipe_type +return 'target' + +def copyleft_should_include(d): + +Determine if this recipe's sources should be deployed for compliance + +import ast +import oe.license +from fnmatch import fnmatchcase as fnmatch + +recipe_type = d.getVar('COPYLEFT_RECIPE_TYPE', True) +if recipe_type not in oe.data.typed_value('COPYLEFT_RECIPE_TYPES', d): +return False, 'recipe type %s is excluded' % recipe_type + +include = oe.data.typed_value('COPYLEFT_LICENSE_INCLUDE', d) +exclude = oe.data.typed_value('COPYLEFT_LICENSE_EXCLUDE', d) + +try: +is_included, reason = oe.license.is_included(d.getVar('LICENSE', True), include, exclude) +except oe.license.LicenseError as exc: +bb.fatal('%s: %s' % (d.getVar('PF', True), exc)) +else: +if is_included: +if reason: +return True, 'recipe has included licenses: %s' % ', '.join(reason) +else: +return False, 'recipe does not include a copyleft license' +else: +return False, 'recipe has excluded licenses: %s' % ', '.join(reason) + + python do_prepare_copyleft_sources () { Populate a tree of the recipe sources and emit patch series files import os.path -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] package_rpm.bbclass: archive the source to srpm package
The archiver.bbclass will put the sources to ARCHIVER_OUTDIR according to configuration, then the rpmbuild -bs will create the srpm. [YOCTO #4986] [YOCTO #5113] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/classes/package_rpm.bbclass | 33 - 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index bce5648..9e63878 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -6,7 +6,6 @@ RPM=rpm RPMBUILD=rpmbuild PKGWRITEDIRRPM = ${WORKDIR}/deploy-rpms -PKGWRITEDIRSRPM = ${DEPLOY_DIR}/sources/deploy-srpm # Maintaining the perfile dependencies has singificant overhead when writing the # packages. When set, this value merges them for efficiency. @@ -87,23 +86,26 @@ python write_specfile () { # append information for logs and patches to %prep def add_prep(d,spec_files_bottom): -if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) == 'srpm': +if d.getVarFlag('ARCHIVER_MODE', 'srpm', True) == '1' and bb.data.inherits_class('archiver', d): spec_files_bottom.append('%%prep -n %s' % d.getVar('PN', True) ) spec_files_bottom.append('%s' % echo \include logs and patches, Please check them in SOURCES\) spec_files_bottom.append('') # append the name of tarball to key word 'SOURCE' in xxx.spec. def tail_source(d): -if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) == 'srpm': -source_list = get_package(d) +if d.getVarFlag('ARCHIVER_MODE', 'srpm', True) == '1' and bb.data.inherits_class('archiver', d): +ar_outdir = d.getVar('ARCHIVER_OUTDIR', True) +if not os.path.exists(ar_outdir): +return +source_list = os.listdir(ar_outdir) source_number = 0 -workdir = d.getVar('WORKDIR', True) for source in source_list: # The rpmbuild doesn't need the root permission, but it needs # to know the file's user and group name, the only user and # group in fakeroot is root when working in fakeroot. -os.chown(%s/%s % (workdir, source), 0, 0) -spec_preamble_top.append('Source' + str(source_number) + ': %s' % source) +f = os.path.join(ar_outdir, source) +os.chown(f, 0, 0) +spec_preamble_top.append('Source%s: %s' % (source_number, source)) source_number += 1 # We need a simple way to remove the MLPREFIX from the package name, # and dependency information... @@ -611,15 +613,6 @@ python write_specfile () { } python do_package_rpm () { -def creat_srpm_dir(d): -if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) == 'srpm': -clean_licenses = get_licenses(d) -pkgwritesrpmdir = bb.data.expand('${PKGWRITEDIRSRPM}/${PACKAGE_ARCH_EXTEND}', d) -pkgwritesrpmdir = pkgwritesrpmdir + '/' + clean_licenses -bb.utils.mkdirhier(pkgwritesrpmdir) -os.chmod(pkgwritesrpmdir, 0755) -return pkgwritesrpmdir - # We need a simple way to remove the MLPREFIX from the package name, # and dependency information... def strip_multilib(name, d): @@ -687,16 +680,14 @@ python do_package_rpm () { cmd = cmd + --define 'debug_package %{nil}' cmd = cmd + --define '_rpmfc_magic_path + magicfile + ' cmd = cmd + --define '_tmppath + workdir + ' -if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) == 'srpm': -cmd = cmd + --define '_sourcedir + workdir + ' -cmdsrpm = cmd + --define '_srcrpmdir + creat_srpm_dir(d) + ' +if d.getVarFlag('ARCHIVER_MODE', 'srpm', True) == '1' and bb.data.inherits_class('archiver', d): +cmd = cmd + --define '_sourcedir + d.getVar('ARCHIVER_OUTDIR', True) + ' +cmdsrpm = cmd + --define '_srcrpmdir + d.getVar('ARCHIVER_OUTDIR', True) + ' cmdsrpm = cmdsrpm + -bs + outspecfile # Build the .src.rpm d.setVar('SBUILDSPEC', cmdsrpm + \n) d.setVarFlag('SBUILDSPEC', 'func', '1') bb.build.exec_func('SBUILDSPEC', d) -# Remove the source (SOURCE0, SOURCE1 ...) -cmd = cmd + --rmsource cmd = cmd + -bb + outspecfile # Build the rpm package! -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] classes/archive*.bbclass: remove archive-*-source.bbclass
Nearly all of the codes in the following 3 files are the same, we can move the code to archiver.bbclass and remove them: archive-configured-source.bbclass archive-original-source.bbclass archive-patched-source.bbclass [YOCTO #5113] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/classes/archive-configured-source.bbclass | 65 -- meta/classes/archive-original-source.bbclass | 65 -- meta/classes/archive-patched-source.bbclass| 65 -- meta/classes/archiver.bbclass | 63 - 4 files changed, 62 insertions(+), 196 deletions(-) delete mode 100644 meta/classes/archive-configured-source.bbclass delete mode 100644 meta/classes/archive-original-source.bbclass delete mode 100644 meta/classes/archive-patched-source.bbclass diff --git a/meta/classes/archive-configured-source.bbclass b/meta/classes/archive-configured-source.bbclass deleted file mode 100644 index 961a532..000 --- a/meta/classes/archive-configured-source.bbclass +++ /dev/null @@ -1,65 +0,0 @@ -# This file is for getting archiving packages with configured -# sources(archive ${S} after configure stage), logs(archive 'temp' after -# package_write_rpm), dump data and creating diff file(get all -# environment variables and functions in building and mapping all -# content in ${S} including patches to xxx.diff.gz. All archived -# packages will be deployed in ${DEPLOY_DIR}/sources - -inherit archiver - -# Get archiving package with configured sources including patches -addtask do_archive_configured_sources after do_configure - -# Get archiving package with temp(logs) and scripts(.bb and inc files) -addtask do_archive_scripts_logs - -# Get dump date and create diff file -addtask do_dumpdata_create_diff_gz - -python () { -pn = d.getVar('PN', True) -packaging = d.getVar('IMAGE_PKGTYPE', True) - -if tar_filter(d): -return - -d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_' %pn + packaging) -build_deps = ' %s:do_dumpdata_create_diff_gz' %pn - -if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) == 'logs_with_scripts': -d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging) -build_deps += ' %s:do_archive_scripts_logs' %pn - -if not not_tarball(d): -d.appendVarFlag('do_compile', 'depends', ' %s:do_archive_configured_sources' %pn) -build_deps += ' %s:do_archive_configured_sources' %pn - -if bb.data.inherits_class('image', d): -d.appendVarFlag('do_rootfs', 'depends', build_deps) -else: -d.appendVarFlag('do_build', 'depends', build_deps) -} - -ARCHIVE_SSTATE_OUTDIR = ${DEPLOY_DIR}/sources/ -ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR = ${WORKDIR}/script-logs/ -ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR = ${WORKDIR}/diffgz-envdata/ - -SSTATETASKS += do_archive_scripts_logs -do_archive_scripts_logs[sstate-inputdirs] = ${ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR} -do_archive_scripts_logs[sstate-outputdirs] = ${ARCHIVE_SSTATE_OUTDIR} - -python do_archive_scripts_logs_setscene () { -sstate_setscene(d) -} - -addtask do_archive_scripts_logs_setscene - -SSTATETASKS += do_dumpdata_create_diff_gz -do_dumpdata_create_diff_gz[sstate-inputdirs] = ${ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR} -do_dumpdata_create_diff_gz[sstate-outputdirs] = ${ARCHIVE_SSTATE_OUTDIR} - -python do_dumpdata_create_diff_gz_setscene () { -sstate_setscene(d) -} - -addtask do_dumpdata_create_diff_gz_setscene diff --git a/meta/classes/archive-original-source.bbclass b/meta/classes/archive-original-source.bbclass deleted file mode 100644 index e271a08..000 --- a/meta/classes/archive-original-source.bbclass +++ /dev/null @@ -1,65 +0,0 @@ -# This file is for getting archiving packages with original -# sources(archive ${S} after unpack stage), patches, logs(archive 'temp' -# after package_write_rpm), dump data and creating diff file(get all -# environment variables and functions in building and mapping all -# content in ${S} including patches to xxx.diff.gz. All archived packages -# will be deployed in ${DEPLOY_DIR}/sources - -inherit archiver - -# Get original sources archiving package with patches -addtask do_archive_original_sources_patches after do_unpack - -# Get archiving package with temp(logs) and scripts(.bb and inc files) -addtask do_archive_scripts_logs - -# Get dump date and create diff file -addtask do_dumpdata_create_diff_gz - -python () { -pn = d.getVar('PN', True) -packaging = d.getVar('IMAGE_PKGTYPE', True) - -if tar_filter(d): -return - -d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_' %pn + packaging) -build_deps = ' %s:do_dumpdata_create_diff_gz' %pn - -if d.getVar('SOURCE_ARCHIVE_LOG_WITH_SCRIPTS', True) == 'logs_with_scripts': -d.appendVarFlag('do_archive_scripts_logs', 'depends', ' %s:do_package_write_' %pn + packaging)
[OE-core] [PATCH 2/6] archiver.bbclass: refactor it
The archiver didn't work, and there were a few problems, for example: 1) There was no src_dir.org (or orig), but the diff command still use it 2) There were a few duplicated code 3) It didn't archive the source for the native or gcc 4) The work flow is not very well 5) The subprocess.call('fakeroot cp ' should be removed 6) And others ... So that we have to refactor it, the benefits are: 1) Fix the problems and make it work well. 2) Reduce more than 300 lines 3) Make it easy to use. Hre are the explanation about the bbclass: This bbclass is used for creating archive for: 1) original (or unpacked) source: ARCHIVER_MODE[src] = original 2) patched source: ARCHIVER_MODE[src] = patched (default) 3) configured source: ARCHIVER_MODE[src] = configured 4) The patches between do_unpack and do_patch: ARCHIVER_MODE[diff] = 1 And you can set the one that you'd like to exclude from the diff: ARCHIVER_MODE[diff-exclude] ?= .pc autom4te.cache patches 5) The environment data, similar to 'bitbake -e recipe': ARCHIVER_MODE[dumpdata] = 1 6) The recipe (.bb and .inc): ARCHIVER_MODE[recipe] = 1 All of the above can be packed into a .src.rpm package: (when PACKAGES != ) ARCHIVER_MODE[srpm] = 1 [YOCTO #4986] [YOCTO #5113] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/classes/archiver.bbclass | 819 ++ 1 file changed, 265 insertions(+), 554 deletions(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 43373ae..b1109dc 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -1,20 +1,38 @@ # ex:ts=4:sw=4:sts=4:et # -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- # -# This file is used for archiving sources, patches, and logs to a -# tarball. It also output building environment to xxx.dump.data and -# create xxx.diff.gz to record all content in ${S} to a diff file. +# This bbclass is used for creating archive for: +# 1) original (or unpacked) source: ARCHIVER_MODE[src] = original +# 2) patched source: ARCHIVER_MODE[src] = patched (default) +# 3) configured source: ARCHIVER_MODE[src] = configured +# 4) The patches between do_unpack and do_patch: +#ARCHIVER_MODE[diff] = 1 +#And you can set the one that you'd like to exclude from the diff: +#ARCHIVER_MODE[diff-exclude] ?= .pc autom4te.cache patches +# 5) The environment data, similar to 'bitbake -e recipe': +#ARCHIVER_MODE[dumpdata] = 1 +# 6) The recipe (.bb and .inc): ARCHIVER_MODE[recipe] = 1 # +# All of the above can be packed into a .src.rpm package: (when PACKAGES != ) +# ARCHIVER_MODE[srpm] = 1 -ARCHIVE_EXCLUDE_FROM ?= .pc autom4te.cache -ARCHIVE_TYPE ?= tar srpm -PATCHES_ARCHIVE_WITH_SERIES = 'yes' -SOURCE_ARCHIVE_LOG_WITH_SCRIPTS ?= '${@d.getVarFlag('ARCHIVER_MODE', 'log_type') \ -if d.getVarFlag('ARCHIVER_MODE', 'log_type') != 'none' else 'logs_with_scripts'}' -SOURCE_ARCHIVE_PACKAGE_TYPE ?= '${@d.getVarFlag('ARCHIVER_MODE', 'type') \ -if d.getVarFlag('ARCHIVER_MODE', 'log_type') != 'none' else 'tar'}' -FILTER ?= '${@d.getVarFlag('ARCHIVER_MODE', 'filter') \ -if d.getVarFlag('ARCHIVER_MODE', 'filter')!= 'none' else 'no'}' +ARCHIVER_MODE[srpm] ?= 0 +ARCHIVER_MODE[src] ?= patched +ARCHIVER_MODE[diff] ?= 0 +ARCHIVER_MODE[diff-exclude] ?= .pc autom4te.cache patches +ARCHIVER_MODE[dumpdata] ?= 0 +ARCHIVER_MODE[recipe] ?= 0 + +DEPLOY_DIR_SRC ?= ${DEPLOY_DIR}/sources +AR_TOPDIR = ${WORKDIR}/deploy-sources +ARCHIVER_OUTDIR = ${AR_TOPDIR}/${TARGET_SYS}/${PF}/ +ARCHIVER_WORKDIR = ${WORKDIR}/archiver-work/ + +do_dumpdata[dirs] = ${ARCHIVER_OUTDIR} +do_ar_recipe[dirs] = ${ARCHIVER_OUTDIR} +do_ar_original[dirs] = ${ARCHIVER_OUTDIR} ${ARCHIVER_WORKDIR} + +# This is a convenience for the shell script to use it COPYLEFT_LICENSE_INCLUDE ?= 'GPL* LGPL*' @@ -23,7 +41,7 @@ COPYLEFT_LICENSE_INCLUDE[doc] = 'Space separated list of globs which include lic COPYLEFT_LICENSE_EXCLUDE ?= 'CLOSED Proprietary' COPYLEFT_LICENSE_EXCLUDE[type] = 'list' -COPYLEFT_LICENSE_INCLUDE[doc] = 'Space separated list of globs which exclude licenses' +COPYLEFT_LICENSE_EXCLUDE[doc] = 'Space separated list of globs which exclude licenses' COPYLEFT_RECIPE_TYPE ?= '${@copyleft_recipe_type(d)}' COPYLEFT_RECIPE_TYPE[doc] = 'The type of the current recipe (e.g. target, native, cross)' @@ -38,593 +56,286 @@ COPYLEFT_AVAILABLE_RECIPE_TYPES[doc] = 'Space separated list of available recipe python () { pn = d.getVar('PN', True) -packaging = d.getVar('IMAGE_PKGTYPE', True) -if tar_filter(d): -return - -if d.getVar('PACKAGES', True) != '': -d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' %s:do_package_write_%s' % (pn, packaging)) +ar_src = d.getVarFlag('ARCHIVER_MODE', 'src', True) +ar_dumpdata = d.getVarFlag('ARCHIVER_MODE', 'dumpdata', True) +ar_recipe = d.getVarFlag('ARCHIVER_MODE', 'recipe', True) + +if ar_src == original: +
[OE-core] [PATCH 6/6] patch.bbclass: do_patch: unset TMPDIR from environment
The do_patch set TMPDIR via: os.environ['TMPDIR'] = process_tmpdir We need unset it after we use it, otherwise it would affect the env after we run bb.build.exec_func('do_patch', d), and will cause unexpected errors. [YOCTO #5113] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/classes/patch.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index 86c65b3..2c92463 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -177,6 +177,7 @@ python patch_do_patch() { bb.fatal(str(e)) bb.utils.remove(process_tmpdir, True) +os.unsetenv('TMPDIR') } patch_do_patch[vardepsexclude] = PATCHRESOLVE -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] local.conf.sample.extended: update for the archiver
Updated it since we have refactored the archiver.bbclass. [YOCTO #5113] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/conf/local.conf.sample.extended | 63 +--- 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended index 5f10886..aa01917 100644 --- a/meta/conf/local.conf.sample.extended +++ b/meta/conf/local.conf.sample.extended @@ -188,40 +188,35 @@ # when the disk space reduces 50M (or the amount of inode reduces 5k). #BB_DISKMON_WARNINTERVAL = 50M,5K -# Archiving source code, configure what kind of sources will be archived -# and the output format. The output files will be put in -# ${DEPLOY_DIR}/sources/. -# -# You can add the following 3 lines to the conf file to get a quick -# usage: -#ARCHIVER_MODE ?= original -#ARCHIVER_CLASS = ${@'archive-${ARCHIVER_MODE}-source' if ARCHIVER_MODE != 'none' else ''} -#INHERIT += ${ARCHIVER_CLASS} -# -# Detailed configuration: -# What kind of sources will be archived, the ARCHIVER_MODE could be: -# original: the ${S} after do_unpack -# patched : the ${S} after do_patch -# configured: the ${S} after do_configure -#ARCHIVER_MODE ?= original -# -# The output format type, tar or srpm, the default is tar. -#ARCHIVER_MODE[type] ?= tar -# -# Whether include the log file under ${T} and the recipe (.bb and .inc), -# the default is logs_with_scripts. -#ARCHIVER_MODE[log_type] ?= logs_with_scripts -# -# license filter: -# yes: Only the COPYLEFT_LICENSE_INCLUDE recipe will be archived -# no: All kinds of license will be archived -# The default is no -#ARCHIVER_MODE[filter] ?= no -# -# The following lines should be added to your conf file verbatim -# (uncommented though of course): -#ARCHIVER_CLASS = ${@'archive-${ARCHIVER_MODE}-source' if ARCHIVER_MODE != 'none' else ''} -#INHERIT += ${ARCHIVER_CLASS} +# Archive the source and put them to ${DEPLOY_DIR}/sources/. +# +#INHERIT += archiver +# +# The tarball for the patched source will be created by default, and you +# can configure the archiver as follow: +# +# Create archive for: +# 1) original (or unpacked) source: +#ARCHIVER_MODE[src] = original +# 2) patched source: (default) +#ARCHIVER_MODE[src] = patched +# 3) configured source: +#ARCHIVER_MODE[src] = configured +# +# 4) the patches between do_unpack and do_patch: +#ARCHIVER_MODE[diff] = 1 +# set the files that you'd like to exclude from the diff: +#ARCHIVER_MODE[diff-exclude] ?= .pc autom4te.cache patches +# +# 5) the environment data, similar to 'bitbake -e recipe': +#ARCHIVER_MODE[dumpdata] = 1 +# +# 6) the recipe (.bb and .inc): +#ARCHIVER_MODE[recipe] = 1 +# +# Whether output the .src.rpm package: +#ARCHIVER_MODE[srpm] = 1 +# # Remove the old image before the new one generated to save disk space #RM_OLD_IMAGE = 1 -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] populate_sdk_deb: Fix meta-toolchain-sdk with amd64 ARCH
Map SDK_ARCH x86_64 to DEB_SDK_ARCH amd64 Without this patch meta-toolchain-gmae fails to do_populate_sdk | The following packages have unmet dependencies: | nativesdk-packagegroup-sdk-host : Depends: nativesdk-autoconf but it is not installable |Depends: nativesdk-libtool but it is not installable |Depends: nativesdk-shadow but it is not installable |Depends: nativesdk-unfs-server but it is not installable |Depends: nativesdk-makedevs but it is not installable |Depends: nativesdk-automake but it is not installable |Depends: nativesdk-qemu but it is not installable |Depends: nativesdk-pkgconfig but it is not installable |Depends: nativesdk-pseudo but it is not installable |Depends: nativesdk-qemu-helper but it is not installable |Depends: nativesdk-opkg but it is not installable | packagegroup-cross-canadian-qt5022 : Depends: gdb-cross-canadian-x86-64 but it is not installable | Depends: binutils-cross-canadian-x86-64 but it is not installable | Depends: gcc-cross-canadian-x86-64 but it is not installable | Depends: meta-environment-qt5022 but it is not installable Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@gmail.com --- meta/classes/populate_sdk_deb.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass index ebb842b..aa2b6eb 100644 --- a/meta/classes/populate_sdk_deb.bbclass +++ b/meta/classes/populate_sdk_deb.bbclass @@ -6,6 +6,9 @@ DEB_SDK_ARCH = ${@[d.getVar('SDK_ARCH', True), i386]\ [d.getVar('SDK_ARCH', True) in \ [x86, i486, i586, i686, pentium]]} +DEB_SDK_ARCH = ${@[d.getVar('SDK_ARCH', True), amd64]\ +[d.getVar('SDK_ARCH', True) == x86_64]} + do_populate_sdk[lockfiles] += ${DEPLOY_DIR_DEB}/deb.lock populate_sdk_post_deb () { -- 1.9.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] pulseaudio: Upgrade 4.0 - 5.0
bluetooth-proximity has been removed in 5.0 Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc| 2 -- .../pulseaudio/{pulseaudio_4.0.bb = pulseaudio_5.0.bb} | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) rename meta/recipes-multimedia/pulseaudio/{pulseaudio_4.0.bb = pulseaudio_5.0.bb} (63%) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 103f72e..3d35b6b 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -5,7 +5,6 @@ SECTION = libs/multimedia LICENSE = GPLv2+ LGPLv2.1 LIC_FILES_CHKSUM = file://GPL;md5=4325afd396febcb659c36b49533135d4 \ file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=25;md5=e4cc710e40a4d900c2c294167bc58270 \ file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95 DEPENDS = libatomics-ops liboil libsamplerate0 libsndfile1 libtool @@ -145,7 +144,6 @@ RDEPENDS_pulseaudio-module-console-kit =+ consolekit RDEPENDS_pulseaudio-misc += pulseaudio-module-cli-protocol-unix FILES_pulseaudio-module-gconf += ${libexecdir}/pulse/gconf-helper -FILES_pulseaudio-module-bluetooth-proximity += ${libexecdir}/pulse/proximity-helper FILES_pulseaudio-module-alsa-card += ${datadir}/pulseaudio/alsa-mixer RDEPENDS_pulseaudio-server += \ diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_4.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_5.0.bb similarity index 63% rename from meta/recipes-multimedia/pulseaudio/pulseaudio_4.0.bb rename to meta/recipes-multimedia/pulseaudio/pulseaudio_5.0.bb index b419c54..f02359a 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_4.0.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_5.0.bb @@ -2,9 +2,8 @@ require pulseaudio.inc SRC_URI = http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \ file://volatiles.04_pulse - -SRC_URI[md5sum] = 591f211db2790a7e4d222f2dc6858db3 -SRC_URI[sha256sum] = 35ceb36bb1822fe54f0b5e4863b4f486769fdfb8ff2111f01fd8778928f9cdae +SRC_URI[md5sum] = c43749838612f4860465e83ed62ca38e +SRC_URI[sha256sum] = 99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939 do_compile_prepend() { mkdir -p ${S}/libltdl -- 1.9.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] python3: Add ptest support
On 10 March 2014 18:15, Saul Wold s...@linux.intel.com wrote: On 03/06/2014 04:54 PM, Paul Barker wrote: A run-ptest script written in python is added which defines a new TestRunner subclass which prints test results in the required ptest format and then executes python's built-in testsuite using this new TestRunner subclass. The built-in testsuite is included in the python standard library and we ensure we have the complete library by adding ${PN}-modules and ${PN}-misc to the RDEPENDS for the ptest package. We also require libgcc for pthread support. Tested on qemux86. Several tests fail and many skip; further investigation should be done to check that the current status is acceptable. In addition, the testsuite causes an out-of-memory crash when qemu is configured with 256 MB of RAM. The testsuite completes without crashing with 1 GB RAM. Signed-off-by: Paul Barker p...@paulbarker.me.uk --- snip Seems like there is an issue with the multi-lib build. ERROR: QA Issue: lib32-python3: Files/directories were installed but not shipped /usr/lib/python3 /usr/lib/python3/ptest NOTE: recipe lib32-pulseaudio-4.0-r0: task do_package_write_rpm: Started Sau! +# This must come after inherit ptest for the override to take effect +do_install_ptest() { +install -m 0755 -d ${D}/${libdir}/python3/ptest +install -m 0755 ${S}/../run-ptest ${D}/${libdir}/${PN}/ptest +} Should I be using something other than ${libdir} here? I can see ${PTEST_PATH} used in the do_install_ptest function for python2, should I be using that instead? As I think I noted elsewhere, this is the first ptest related patch I've done so I don't really know much beyond what's documented at https://wiki.yoctoproject.org/wiki/Ptest. Cheers, -- Paul Barker Email: p...@paulbarker.me.uk http://www.paulbarker.me.uk -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] gvfs-gdu-volume-monitor: recipe missing DEPENDS on libgnome-keyring
On branch dora of openembedded-core, my compile of gvfs-gdu-volume-monitor failed due to a missing library. I fixed it by added a DEPENDS via bbappend: DEPENDS += libgnome-keyring - Jate S. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] classes: Add gummiboot class
On 3/7/14, 1:57, Stanacar, StefanX stefanx.stana...@intel.com wrote: On Thu, 2014-03-06 at 14:36 -0800, Darren Hart wrote: On 3/6/14, 10:15, Stefan Stanacar stefanx.stana...@intel.com wrote: Adds a gummiboot class similar to grub-efi class and makes the necessary changes so it can be used for live/hddimg images as well. One can set EFI_PROVIDER = gummiboot in local.conf to use gummiboot instead of grub-efi. Gummiboot requires some kernel options that are not enabled by default, so one has to build with KERNEL_FEATURES_append = cfg/efi-ext. cfg/efi is insufficient? cfg/efi doesn't have CONFIG_EFI_STUB=y which is required by gummiboot. cfg/efi-ext adds more than that, it's true. Weird... Although the STUB should probably be in efi rather than efi-ext. I'm surprised gummiboot requires STUB... Since STUB is there to allow the kernel to be booted directly, no bootloader required. I guess gummiboot is slightly less than a boot loader :-) I'd Ack a patch to move STUB from efi-ext to efi. It's also a good idea to enable CONFIG_EFIVARS_FS, which is the newer/better interface than CONFIG_EFI_VARS that cfg/efi-ext enables. Hrm... OK, perhaps time to revisit those fragments and update them for current usage. -- Darren The install scripts have been updated too, keeping the old behaviour around, but accounting for the new boot loader config files (if they exist). It can be argued that the installer and bootimg are a bit wierd and not necessarily correct, but I wanted to have the exact same behviour with gummiboot. With the default EFI_PROVIDER = grub-efi nothing changes, everthing should be just as before. I've tested live boot, install and normal boot on: - FRI2 - genericx86-64 on NUC with: EFI_PROVIDER = gummiboot KERNEL_FEATURES_append = cfg/efi-ext in local.conf. Signed-off-by: Stefan Stanacar stefanx.stana...@intel.com Generally looks good. My only reservation is the same as for 2/3, should we define an EFI interface rather than having to construct function names in the consumers of this class? I don't have a strong opinion here, it just seemed the simplest way atm, then adding another interface. Cheers, Stefan -- Darren --- meta/classes/gummiboot.bbclass | 112 + .../initrdscripts/files/init-install-efi.sh| 51 +++--- 2 files changed, 147 insertions(+), 16 deletions(-) create mode 100644 meta/classes/gummiboot.bbclass diff --git a/meta/classes/gummiboot.bbclass b/meta/classes/gummiboot.bbclass new file mode 100644 index 000..5c11286 --- /dev/null +++ b/meta/classes/gummiboot.bbclass @@ -0,0 +1,112 @@ +EFICLASS_FUNC_PREFIX = gummiboot + +do_bootimg[depends] += gummiboot:do_deploy +do_bootdirectdisk[depends] += gummiboot:do_deploy + +EFIDIR = /EFI/BOOT + +GUMMIBOOT_CFG ?= ${S}/loader.conf +GUMMIBOOT_ENTRIES ?= +GUMMIBOOT_TIMEOUT ?= 10 + +gummiboot_populate() { +DEST=$1 + +EFI_IMAGE=gummibootia32.efi +DEST_EFI_IMAGE=bootia32.efi +if [ ${TARGET_ARCH} = x86_64 ]; then +EFI_IMAGE=gummibootx64.efi +DEST_EFI_IMAGE=bootx64.efi +fi + +install -d ${DEST}${EFIDIR} +# gummiboot requires these paths for configuration files +# they are not customizable so no point in new vars +install -d ${DEST}/loader +install -d ${DEST}/loader/entries +install -m 0644 ${DEPLOY_DIR_IMAGE}/${EFI_IMAGE} ${DEST}${EFIDIR}/${DEST_EFI_IMAGE} +install -m 0644 ${GUMMIBOOT_CFG} ${DEST}/loader/loader.conf +for i in ${GUMMIBOOT_ENTRIES}; do +install -m 0644 ${i} ${DEST}/loader/entries +done +} + +gummiboot_iso_populate() { +iso_dir=$1 +gummiboot_populate $iso_dir +mkdir -p ${EFIIMGDIR}/${EFIDIR} +cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR} +cp $iso_dir/vmlinuz ${EFIIMGDIR} +echo ${DEST_EFI_IMAGE} ${EFIIMGDIR}/startup.nsh +if [ -f $iso_dir/initrd ] ; then +cp $iso_dir/initrd ${EFIIMGDIR} +fi +} + +gummiboot_hddimg_populate() { +gummiboot_populate $1 +} + +python build_gummiboot_cfg() { +s = d.getVar(S, True) +labels = d.getVar('LABELS', True) +if not labels: +bb.debug(1, LABELS not defined, nothing to do) +return + +if labels == []: +bb.debug(1, No labels, nothing to do) +return + +cfile = d.getVar('GUMMIBOOT_CFG', True) +try: + cfgfile = open(cfile, 'w') +except OSError: +raise bb.build.funcFailed('Unable to open %s' % (cfile)) + +cfgfile.write('# Automatically created by OE\n') +cfgfile.write('default %s\n' % (labels.split()[0])) +timeout = d.getVar('GUMMIBOOT_TIMEOUT', True) +if timeout: +cfgfile.write('timeout %s\n' % timeout) +else: +cfgfile.write('timeout 10\n') +
Re: [OE-core] [PATCH] python3: Add ptest support
On 10 March 2014 18:15, Saul Wold s...@linux.intel.com wrote: On 03/06/2014 04:54 PM, Paul Barker wrote: A run-ptest script written in python is added which defines a new TestRunner subclass which prints test results in the required ptest format and then executes python's built-in testsuite using this new TestRunner subclass. snip Seems like there is an issue with the multi-lib build. ERROR: QA Issue: lib32-python3: Files/directories were installed but not shipped /usr/lib/python3 /usr/lib/python3/ptest NOTE: recipe lib32-pulseaudio-4.0-r0: task do_package_write_rpm: Started Sau! +# This must come after inherit ptest for the override to take effect +do_install_ptest() { +install -m 0755 -d ${D}/${libdir}/python3/ptest +install -m 0755 ${S}/../run-ptest ${D}/${libdir}/${PN}/ptest +} Should I be using something other than ${libdir} here? I can see ${PTEST_PATH} used in the do_install_ptest function for python2, should I be using that instead? As I think I noted elsewhere, this is the first ptest related patch I've done so I don't really know much beyond what's documented at https://wiki.yoctoproject.org/wiki/Ptest. I think you may have to add a line like FILES_${PN} += /usr/lib/python3/ptest in the recipe (meta/recipes-devtools/python/python3_3.3.3.bb). ${PTEST_PATH} might be different than the above due to the use of suffix ${PYTHON_MAJMIN}. Alternatively you might they to install ptest stuff here: ${D}${libdir}/python${PYTHON_MAJMIN} Regards, Tudor Cheers, -- Paul Barker -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] oe-setup-builddir: de-bash use . instead of source
Signed-off-by: Saul Wold s...@linux.intel.com --- scripts/oe-setup-builddir | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index e4356f1..ccaae9b 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -41,7 +41,7 @@ if (test -f $BUILDDIR/conf/templateconf.cfg) then TEMPLATECONF=$(cat $BUILDDIR/conf/templateconf.cfg) fi -source $OEROOT/.templateconf +. $OEROOT/.templateconf if ! (test -f $BUILDDIR/conf/templateconf.cfg) then echo $TEMPLATECONF $BUILDDIR/conf/templateconf.cfg -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] Package Upgrades
The following changes since commit 82c773e88aaefd9321481ad297554d5b4a3ae0b2: Revert ncurses: use ln -r to generate relative symlink (2014-03-03 15:52:26 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/package-upgrades http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/package-upgrades Chen Qi (3): sudo: upgrade to 1.8.9p5 grep: upgrade from 2.16 to 2.18 gettext: upgrade from 0.18.3.1 to 0.18.3.2 .../parallel.patch |0 .../COPYING|0 .../Makefile.in.in |0 .../Makevars.template |0 .../aclocal.tgz| Bin 37591 - 37591 bytes .../config.rpath |0 ...conv-m4-remove-the-test-to-convert-euc-jp.patch |0 .../remove-potcdate.sin|0 ...8.3.1.bb = gettext-minimal-native_0.18.3.2.bb} |0 .../{gettext_0.18.3.1.bb = gettext_0.18.3.2.bb} |4 ++-- .../grep/{grep_2.16.bb = grep_2.18.bb}|4 ++-- .../sudo/{sudo_1.8.9p1.bb = sudo_1.8.9p5.bb} |4 ++-- 12 files changed, 6 insertions(+), 6 deletions(-) rename meta/recipes-core/gettext/{gettext-0.18.3.1 = gettext-0.18.3.2}/parallel.patch (100%) rename meta/recipes-core/gettext/{gettext-minimal-0.18.3.1 = gettext-minimal-0.18.3.2}/COPYING (100%) rename meta/recipes-core/gettext/{gettext-minimal-0.18.3.1 = gettext-minimal-0.18.3.2}/Makefile.in.in (100%) rename meta/recipes-core/gettext/{gettext-minimal-0.18.3.1 = gettext-minimal-0.18.3.2}/Makevars.template (100%) rename meta/recipes-core/gettext/{gettext-minimal-0.18.3.1 = gettext-minimal-0.18.3.2}/aclocal.tgz (100%) rename meta/recipes-core/gettext/{gettext-minimal-0.18.3.1 = gettext-minimal-0.18.3.2}/config.rpath (100%) rename meta/recipes-core/gettext/{gettext-minimal-0.18.3.1 = gettext-minimal-0.18.3.2}/iconv-m4-remove-the-test-to-convert-euc-jp.patch (100%) rename meta/recipes-core/gettext/{gettext-minimal-0.18.3.1 = gettext-minimal-0.18.3.2}/remove-potcdate.sin (100%) rename meta/recipes-core/gettext/{gettext-minimal-native_0.18.3.1.bb = gettext-minimal-native_0.18.3.2.bb} (100%) rename meta/recipes-core/gettext/{gettext_0.18.3.1.bb = gettext_0.18.3.2.bb} (97%) rename meta/recipes-extended/grep/{grep_2.16.bb = grep_2.18.bb} (86%) rename meta/recipes-extended/sudo/{sudo_1.8.9p1.bb = sudo_1.8.9p5.bb} (83%) -- 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/3] sudo: upgrade to 1.8.9p5
Upgrade sudo from 1.8.9p1 to 1.8.9p5. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../sudo/{sudo_1.8.9p1.bb = sudo_1.8.9p5.bb} |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/sudo/{sudo_1.8.9p1.bb = sudo_1.8.9p5.bb} (83%) diff --git a/meta/recipes-extended/sudo/sudo_1.8.9p1.bb b/meta/recipes-extended/sudo/sudo_1.8.9p5.bb similarity index 83% rename from meta/recipes-extended/sudo/sudo_1.8.9p1.bb rename to meta/recipes-extended/sudo/sudo_1.8.9p5.bb index b3c2086..b4d18e8 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.9p1.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.9p5.bb @@ -5,8 +5,8 @@ SRC_URI = http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = file://sudo.pam -SRC_URI[md5sum] = 03773c373082843211c96df2c9187146 -SRC_URI[sha256sum] = c22089aa1023233bf27808e8f7611b6b4c4fec2d151616179e1898876703cd51 +SRC_URI[md5sum] = d3f1f1cfca6b2b06b048e1abb7d0227e +SRC_URI[sha256sum] = bc9d5c96de5f8b4d2b014f87a37870aef60d2891c869202454069150a21a5c21 DEPENDS += ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} RDEPENDS_${PN} += ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)} -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] grep: upgrade from 2.16 to 2.18
Upgrade grep from 2.16 to 2.18. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../grep/{grep_2.16.bb = grep_2.18.bb}|4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/grep/{grep_2.16.bb = grep_2.18.bb} (86%) diff --git a/meta/recipes-extended/grep/grep_2.16.bb b/meta/recipes-extended/grep/grep_2.18.bb similarity index 86% rename from meta/recipes-extended/grep/grep_2.16.bb rename to meta/recipes-extended/grep/grep_2.18.bb index be39555..5ffeaf0 100644 --- a/meta/recipes-extended/grep/grep_2.16.bb +++ b/meta/recipes-extended/grep/grep_2.18.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = file://COPYING;md5=8006d9c814277c1bfc4ca22af94b59ee SRC_URI = ${GNU_MIRROR}/grep/grep-${PV}.tar.xz -SRC_URI[md5sum] = 502350a6c8f7c2b12ee58829e760b44d -SRC_URI[sha256sum] = 16dfeb5013d8c9f21f40ccec0936f2c1c6a014c828d30488f0d5c6ef7b551162 +SRC_URI[md5sum] = 7439f8266f50844b56cc3e2721606541 +SRC_URI[sha256sum] = e6436e5077fa1497feccc8feaabd3f507b172369bf120fbc9e4874bba81be720 inherit autotools gettext -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] gettext: upgrade from 0.18.3.1 to 0.18.3.2
Upgrade gettext from 0.18.3.1 to 0.18.3.2. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../parallel.patch |0 .../COPYING|0 .../Makefile.in.in |0 .../Makevars.template |0 .../aclocal.tgz| Bin 37591 - 37591 bytes .../config.rpath |0 ...conv-m4-remove-the-test-to-convert-euc-jp.patch |0 .../remove-potcdate.sin|0 ...8.3.1.bb = gettext-minimal-native_0.18.3.2.bb} |0 .../{gettext_0.18.3.1.bb = gettext_0.18.3.2.bb} |4 ++-- 10 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-core/gettext/{gettext-0.18.3.1 = gettext-0.18.3.2}/parallel.patch (100%) rename meta/recipes-core/gettext/{gettext-minimal-0.18.3.1 = gettext-minimal-0.18.3.2}/COPYING (100%) rename meta/recipes-core/gettext/{gettext-minimal-0.18.3.1 = gettext-minimal-0.18.3.2}/Makefile.in.in (100%) rename meta/recipes-core/gettext/{gettext-minimal-0.18.3.1 = gettext-minimal-0.18.3.2}/Makevars.template (100%) rename meta/recipes-core/gettext/{gettext-minimal-0.18.3.1 = gettext-minimal-0.18.3.2}/aclocal.tgz (100%) rename meta/recipes-core/gettext/{gettext-minimal-0.18.3.1 = gettext-minimal-0.18.3.2}/config.rpath (100%) rename meta/recipes-core/gettext/{gettext-minimal-0.18.3.1 = gettext-minimal-0.18.3.2}/iconv-m4-remove-the-test-to-convert-euc-jp.patch (100%) rename meta/recipes-core/gettext/{gettext-minimal-0.18.3.1 = gettext-minimal-0.18.3.2}/remove-potcdate.sin (100%) rename meta/recipes-core/gettext/{gettext-minimal-native_0.18.3.1.bb = gettext-minimal-native_0.18.3.2.bb} (100%) rename meta/recipes-core/gettext/{gettext_0.18.3.1.bb = gettext_0.18.3.2.bb} (97%) diff --git a/meta/recipes-core/gettext/gettext-0.18.3.1/parallel.patch b/meta/recipes-core/gettext/gettext-0.18.3.2/parallel.patch similarity index 100% rename from meta/recipes-core/gettext/gettext-0.18.3.1/parallel.patch rename to meta/recipes-core/gettext/gettext-0.18.3.2/parallel.patch diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.3.1/COPYING b/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/COPYING similarity index 100% rename from meta/recipes-core/gettext/gettext-minimal-0.18.3.1/COPYING rename to meta/recipes-core/gettext/gettext-minimal-0.18.3.2/COPYING diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.3.1/Makefile.in.in b/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/Makefile.in.in similarity index 100% rename from meta/recipes-core/gettext/gettext-minimal-0.18.3.1/Makefile.in.in rename to meta/recipes-core/gettext/gettext-minimal-0.18.3.2/Makefile.in.in diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.3.1/Makevars.template b/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/Makevars.template similarity index 100% rename from meta/recipes-core/gettext/gettext-minimal-0.18.3.1/Makevars.template rename to meta/recipes-core/gettext/gettext-minimal-0.18.3.2/Makevars.template diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.3.1/aclocal.tgz b/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/aclocal.tgz similarity index 100% rename from meta/recipes-core/gettext/gettext-minimal-0.18.3.1/aclocal.tgz rename to meta/recipes-core/gettext/gettext-minimal-0.18.3.2/aclocal.tgz diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.3.1/config.rpath b/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/config.rpath similarity index 100% rename from meta/recipes-core/gettext/gettext-minimal-0.18.3.1/config.rpath rename to meta/recipes-core/gettext/gettext-minimal-0.18.3.2/config.rpath diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.3.1/iconv-m4-remove-the-test-to-convert-euc-jp.patch b/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/iconv-m4-remove-the-test-to-convert-euc-jp.patch similarity index 100% rename from meta/recipes-core/gettext/gettext-minimal-0.18.3.1/iconv-m4-remove-the-test-to-convert-euc-jp.patch rename to meta/recipes-core/gettext/gettext-minimal-0.18.3.2/iconv-m4-remove-the-test-to-convert-euc-jp.patch diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.3.1/remove-potcdate.sin b/meta/recipes-core/gettext/gettext-minimal-0.18.3.2/remove-potcdate.sin similarity index 100% rename from meta/recipes-core/gettext/gettext-minimal-0.18.3.1/remove-potcdate.sin rename to meta/recipes-core/gettext/gettext-minimal-0.18.3.2/remove-potcdate.sin diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.18.3.1.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.18.3.2.bb similarity index 100% rename from meta/recipes-core/gettext/gettext-minimal-native_0.18.3.1.bb rename to meta/recipes-core/gettext/gettext-minimal-native_0.18.3.2.bb diff --git a/meta/recipes-core/gettext/gettext_0.18.3.1.bb b/meta/recipes-core/gettext/gettext_0.18.3.2.bb similarity index 97% rename from
[OE-core] Latest Status of MUT Build
Folks, To follow-up on RP's status email, many may have noticed that we have been building the stage/master_under_test the last couple of days leading up to M4-rc1. I think that we have a good set, the Autobuilder is just finishing up now. There seems to be 2 Fedora20 related issues with the arm-lsb and ppc-lsb builds, these might be SELinux related based on the failures. There was also a failure in the FSL-Arm related to qt3, that might be a parallel make related issue. If I get an otherwise clean build we will likely pull the remainder of what's in MUT into master and fire the rc1. This means we are about 12 hours behind. For the QA teams, the release will be available later tonight or on the morning. I hope that the extra work going into MUT will provide us with a good RC1. Thanks your patience Sau! -- Sau! Saul Wold Yocto Component Wrangler @ Intel Yocto Project / Poky Build System -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] eglibc: Update SRC_URI to point to final download location
We have been using interim location for the src_uri now the tarballs are placed in usual location so update the src_uri accordingly Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/recipes-core/eglibc/cross-localedef-native_2.19.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.19.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb b/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb index d3f43bd..3ce0e1d 100644 --- a/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb +++ b/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb @@ -16,7 +16,7 @@ inherit autotools # pick up an eglibc patch FILESPATH = ${FILE_DIRNAME}/eglibc-${PV} -SRC_URI = http://sakrah.homelinux.org/files/eglibc-${PV}-svnr25243.tar.bz2 \ +SRC_URI = http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25243.tar.bz2 \ file://fix_for_centos_5.8.patch;patchdir=.. \ SRC_URI[md5sum] = 197836c2ba42fb146e971222647198dd diff --git a/meta/recipes-core/eglibc/eglibc_2.19.bb b/meta/recipes-core/eglibc/eglibc_2.19.bb index 7e582b6..2bedf26 100644 --- a/meta/recipes-core/eglibc/eglibc_2.19.bb +++ b/meta/recipes-core/eglibc/eglibc_2.19.bb @@ -2,7 +2,7 @@ require eglibc.inc DEPENDS += gperf-native kconfig-frontends-native -SRC_URI = http://sakrah.homelinux.org/files/eglibc-${PV}-svnr25243.tar.bz2 \ +SRC_URI = http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25243.tar.bz2 \ file://eglibc-svn-arm-lowlevellock-include-tls.patch \ file://IO-acquire-lock-fix.patch \ file://mips-rld-map-check.patch \ -- 1.9.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core