[OE-core] [PATCH 00/18] Proposed changes for fido
Please merge the changes on my joshuagl/fido-next branch into fido. Most of the patches are for CVE fixes or fixes for gcc 5 related issues. Cheers, Joshua The following changes since commit 7d445547df528aa9e5bfb85568a7270e27f633ef: subversion: Fix subversion-native on Fedora22 (2015-06-28 09:45:37 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib joshuagl/fido-next http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=joshuagl/fido-next Andre McCurdy (1): gnutls: use pkg-config to locate zlib Andreas Oberritter (1): gdb: Add missing runtime dependency for python option Kang Kai (1): gst-plugins-bad: fix CVE-2015-0797 Khem Raj (2): u-boot-mkimage: Backport fix from upstream to fix build with gcc-5 mtd-utils: update to latest and fix static inlining Leonardo Sandoval (1): terminal.py: Allow devshell/menuconfig on recent gnome-terminal Mariano Lopez (1): report-error.bbclass: Added file syncronization. Paul Eggleton (1): oe-selftest: devtool: fix test_devtool_update_recipe_git Richard Purdie (6): oeqa/parselogs: Whitelist qemuarm64 runtime errors testimage: Don't test xorg/vnc on qemuarm64 oeqa/parselogs: Whitelist qemumips64 runtime error lib/oe/patch: Fix git patch application for source in subdirectory lib/devtool/standard: Fix patch cleanup oeqa/bbtests: Fix race over DL_DIR and SSTATE_DIR Roy Li (1): unzip: fix four CVE defects Saul Wold (2): binutils: Add -momit-lock-prefix support rootfs.py: Add check for kernel modules before running depmod fan.xin (1): wpa-supplicant: Fix CVE-2015-4142 meta/classes/report-error.bbclass | 11 +- meta/classes/testimage.bbclass | 4 + meta/lib/oe/patch.py | 6 +- meta/lib/oe/rootfs.py | 18 +- meta/lib/oe/terminal.py| 6 + meta/lib/oeqa/runtime/parselogs.py | 7 + meta/lib/oeqa/selftest/bbtests.py | 6 + meta/lib/oeqa/selftest/devtool.py | 26 ++- meta/recipes-bsp/u-boot/u-boot-mkimage/gcc5.patch | 91 meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb | 4 +- ...integer-underflow-in-WMM-Action-frame-par.patch | 45 meta/recipes-devtools/binutils/binutils-2.24.inc | 1 + .../0001-Add-momit_lock_prefix-no-yes-option.patch | 236 + meta/recipes-devtools/gdb/gdb_7.8.1.bb | 2 +- ...emove-duplicate-hashtable_iterator_value-.patch | 64 ++ meta/recipes-devtools/mtd/mtd-utils_git.bb | 1 + .../unzip/09-cve-2014-8139-crc-overflow.patch | 52 + .../unzip/10-cve-2014-8140-test-compr-eb.patch | 33 +++ .../unzip/11-cve-2014-8141-getzip64data.patch | 144 + .../unzip/12-cve-2014-9636-test-compr-eb.patch | 45 meta/recipes-extended/unzip/unzip_6.0.bb | 4 + .../gst-plugins-bad/buffer-overflow-mp4.patch | 36 .../gstreamer/gst-plugins-bad_0.10.23.bb | 2 + .../gnutls/use-pkg-config-to-locate-zlib.patch | 67 ++ meta/recipes-support/gnutls/gnutls_3.3.12.bb | 1 + scripts/lib/devtool/standard.py| 3 +- 26 files changed, 897 insertions(+), 18 deletions(-) create mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage/gcc5.patch create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0001-Add-momit_lock_prefix-no-yes-option.patch create mode 100644 meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch create mode 100644 meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch create mode 100644 meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch create mode 100644 meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch create mode 100644 meta/recipes-extended/unzip/unzip/12-cve-2014-9636-test-compr-eb.patch create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-bad/buffer-overflow-mp4.patch create mode 100644 meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] subversion: improve the regex of sed command of SVN_SERF_INCLUDES macro
On Wed, Jul 08, 2015 at 05:03:40PM +0800, Kai Kang wrote: [Yocto #7474] The regex of sed command is too simple, which mangles any -D in strings, for example, a project name is My-Demo, it will be removed from the path by the sed regex, which causes a build failure. Improving it to only delete the -D behind of a space or the -D at start of a string. Seems to duplicate: commit 04554b128c358e3c10f6581fd4506764a65240b8 Author: Jose Lamego jose.a.lam...@linux.intel.com Date: Fri Jul 3 07:34:50 2015 + subversion_1.8.13.bb: Regex modified to allow '-D' in paths Signed-off-by: Kai Kang kai.k...@windriver.com --- .../Improve_the_regex_of_sed_command_of.patch | 31 ++ .../subversion/subversion_1.8.13.bb| 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch b/meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch new file mode 100644 index 000..626923b --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch @@ -0,0 +1,31 @@ +Improve the regex of sed command of SVN_SERF_INCLUDES macro + +The regex of sed command is too simple, which mangles any -D +in strings, for example, a project name is My-Demo, it will +be removed from the path by the sed regex, which causes a build +failure. Improving it to only delete the -D behind of a space or +the -D at start of a string. + +Reference: + +https://bugzilla.yoctoproject.org/show_bug.cgi?id=7874 + +Upstream-Status: Submitted [http://mail-archives.apache.org/mod_mbox/subversion-dev/201507.mbox/%3C559CDA70.8030403%40windriver.com%3E] + +Signed-off-by: Paul Gortmaker paul.gortma...@windriver.com +Signed-off-by: Yue Tao yue@windriver.com +Signed-off-by: Kai Kang kai.k...@windriver.com + +diff --git a/build/ac-macros/serf.m4.old b/build/ac-macros/serf.m4 +index 885c5a1..39969c6 100644 +--- a/build/ac-macros/serf.m4.old b/build/ac-macros/serf.m4 +@@ -143,7 +143,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG, + if $PKG_CONFIG $serf_major --atleast-version=$serf_check_version; then + AC_MSG_RESULT([yes]) + serf_found=yes +- SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/-D[^ ]*//g'`] ++ SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/[[:space:]]-D[^ ]*//g' -e 's/^-D[^ ]*//g'`] + SVN_SERF_LIBS=`$PKG_CONFIG $serf_major --libs` + break + else diff --git a/meta/recipes-devtools/subversion/subversion_1.8.13.bb b/meta/recipes-devtools/subversion/subversion_1.8.13.bb index a98be67..73ace61 100644 --- a/meta/recipes-devtools/subversion/subversion_1.8.13.bb +++ b/meta/recipes-devtools/subversion/subversion_1.8.13.bb @@ -12,6 +12,7 @@ inherit gettext pythonnative SRC_URI = ${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://libtool2.patch \ file://disable_macos.patch \ + file://Improve_the_regex_of_sed_command_of.patch \ SRC_URI[md5sum] = 4413417b529d7bdf82f74e50df02e88b SRC_URI[sha256sum] = 1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579 -- 1.9.1 -- ___ 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
Re: [OE-core] [PATCH 0/4] Fix builds for MIPS64 N32
Hello, 2015-07-01 17:02 GMT+03:00 Dmitry Eremin-Solenikov dbarysh...@gmail.com: Quite simple configuration (MIPS64 N32 image) fails to build (see below). I have verified these patches in both single lib and in multilib cases. Tri-lib images and SDK for MIPS build fine with these patches. Any comments on this patchset? It would be nice to have N32 ubroken in the current master tree. Current situation: lumag@nexs:~/OE$ MACHINE=qemumips64n32 bitbake core-image-base NOTE: Started PRServer with DBfile: /home/lumag/OE/cache/prserv.sqlite3, IP: 127.0.0.1, PORT: 46391, PID: 15895 Loading cache: 100% || ETA: 00:00:00 Loaded 1302 entries from dependency cache. NOTE: Resolving any missing task queue dependencies ERROR: Nothing RPROVIDES 'binutils-cross-canadian-mips64' (but /home/lumag/OE/sources/openembedded-core/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb RDEPENDS on or otherwise requires it) NOTE: Runtime target 'binutils-cross-canadian-mips64' is unbuildable, removing... Missing or unbuildable dependency chain was: ['binutils-cross-canadian-mips64'] NOTE: Runtime target 'packagegroup-cross-canadian-qemumips64n32' is unbuildable, removing... Missing or unbuildable dependency chain was: ['packagegroup-cross-canadian-qemumips64n32', 'binutils-cross-canadian-mips64'] ERROR: Required build target 'core-image-base' has no buildable providers. Missing or unbuildable dependency chain was: ['core-image-base', 'packagegroup-cross-canadian-qemumips64n32', 'binutils-cross-canadian-mips64'] -- With best wishes Dmitry -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/4] Fix builds for MIPS64 N32
On 7/8/15 7:00 AM, Dmitry Eremin-Solenikov wrote: Hello, 2015-07-01 17:02 GMT+03:00 Dmitry Eremin-Solenikov dbarysh...@gmail.com: Quite simple configuration (MIPS64 N32 image) fails to build (see below). I have verified these patches in both single lib and in multilib cases. Tri-lib images and SDK for MIPS build fine with these patches. Any comments on this patchset? It would be nice to have N32 ubroken in the current master tree. Sorry, I'm traveling right now and haven't had time to review this. I should be able to get back to the office and test it by the end of the week. I visually reviewed the patches and I don't object to them going in -- but I'm still not sure they are all correct. --Mark Current situation: lumag@nexs:~/OE$ MACHINE=qemumips64n32 bitbake core-image-base NOTE: Started PRServer with DBfile: /home/lumag/OE/cache/prserv.sqlite3, IP: 127.0.0.1, PORT: 46391, PID: 15895 Loading cache: 100% || ETA: 00:00:00 Loaded 1302 entries from dependency cache. NOTE: Resolving any missing task queue dependencies ERROR: Nothing RPROVIDES 'binutils-cross-canadian-mips64' (but /home/lumag/OE/sources/openembedded-core/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb RDEPENDS on or otherwise requires it) NOTE: Runtime target 'binutils-cross-canadian-mips64' is unbuildable, removing... Missing or unbuildable dependency chain was: ['binutils-cross-canadian-mips64'] NOTE: Runtime target 'packagegroup-cross-canadian-qemumips64n32' is unbuildable, removing... Missing or unbuildable dependency chain was: ['packagegroup-cross-canadian-qemumips64n32', 'binutils-cross-canadian-mips64'] ERROR: Required build target 'core-image-base' has no buildable providers. Missing or unbuildable dependency chain was: ['core-image-base', 'packagegroup-cross-canadian-qemumips64n32', 'binutils-cross-canadian-mips64'] -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] pseudo: Exclude SITEINFO_BITS from checksums
We really want the same sstate checksums for pseudo-native on 32 and 64 bit platforms but the use of SITEINFO_BITS prevents this. Since other things would change if the bit size changes, we can safely exclude this variable and rely on others (e.g. BUILD_ARCH included in WORKDIR) to handle this. [YOCTO #5970] Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc index 11a8514..fe12258 100644 --- a/meta/recipes-devtools/pseudo/pseudo.inc +++ b/meta/recipes-devtools/pseudo/pseudo.inc @@ -36,6 +36,7 @@ do_compile () { fi oe_runmake ${MAKEOPTS} } +do_compile[vardepsexclude] = SITEINFO_BITS maybe_make32() { # We probably don't need to build 32-bit binaries. @@ -64,6 +65,7 @@ maybe_make32() { bbnote If you need to run 32-bit executables, ensure that NO32LIBS is set to 0. fi } +maybe_make32[vardepsexclude] = SITEINFO_BITS warn_32bit_missing() { bbwarn Can't find stubs-32.h, but usually need it to build 32-bit libpseudo. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bitbake.conf: Add BUILD_ARCH and SSTATE_PKGARCH to HASHBASE whitelist
As Chris Larson points out in the bug, BUILD_ARCH changing doesn't change native/cross sstate checksums, because its calculated in ${@}, so just its unexpanded form is in the signature. But BUILD_ARCH ends up included in the sstate filenames, so changes to BUILD_ARCH will result in rebuilds of native/cross but not rebuilds of the target recipes which depend on them, which is just what we want. However it does mean we can't easily test 32 and 64 bit signatures. In order to make the tests work, we need to add BUILD_ARCH to the HASHBASE whitelist. BUILD_ARCH is used in the workdir paths and so on so changing it does still rebuild when we need it to. With improvements to function dependency tracking, a dependency on SSTATE_PKGARCH was also introduced causing problems for 32/64 bit build signature equivalence. Since this is reflected in the sstate filenames, we can safely whitelist this too. [YOCTO #5970] Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index d426ee3..e25cccf 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -772,7 +772,7 @@ BB_HASHBASE_WHITELIST ?= TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR \ USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \ PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \ CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_DISABLE LICENSE_PATH SDKPKGSUFFIX \ -WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR +WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH BB_HASHCONFIG_WHITELIST ?= ${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libdrm: remove git recipe, merge inc
Hi Khem, On 8 July 2015 at 05:16, Khem Raj raj.k...@gmail.com wrote: There might be recipes in other layers which might be using .inc file, drm is sometimes specific to some SOCs. layer index shows that atleast meta-ti assumes .inc to be available and there might be more unlisted or closed layers which do so. Looking at the meta-ti recipe, it rewrites so much of the include file that practically the only bits it is using are the summary and inherits. If that were my layer I'd copy the pieces from oe-core that it needed and consider it a proper fork (or upstream the drivers and drop the recipe). insert standard moan about include files for cross-layer use without a defined api for their behaviour and expectations Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] oeqa/bbtests: Fix to ensure DL_DIR is set
write_config overwrites the config rather than appends to it, so ensure we write both variables in one go. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py index ffe0ea5..7df6b2f 100644 --- a/meta/lib/oeqa/selftest/bbtests.py +++ b/meta/lib/oeqa/selftest/bbtests.py @@ -98,8 +98,9 @@ class BitbakeTests(oeSelfTest): def test_invalid_recipe_src_uri(self): data = 'SRC_URI = file://invalid' self.write_recipeinc('man', data) -self.write_config(DL_DIR = \${TOPDIR}/download-selftest\) -self.write_config(SSTATE_DIR = \${TOPDIR}/download-selftest\) +self.write_config(DL_DIR = \${TOPDIR}/download-selftest\ +SSTATE_DIR = \${TOPDIR}/download-selftest\ +) bitbake('-ccleanall man') result = bitbake('-c fetch man', ignore_status=True) bitbake('-ccleanall man') @@ -110,8 +111,9 @@ class BitbakeTests(oeSelfTest): @testcase(171) def test_rename_downloaded_file(self): -self.write_config(DL_DIR = \${TOPDIR}/download-selftest\) -self.write_config(SSTATE_DIR = \${TOPDIR}/download-selftest\) +self.write_config(DL_DIR = \${TOPDIR}/download-selftest\ +SSTATE_DIR = \${TOPDIR}/download-selftest\ +) data = 'SRC_URI_append = ;downloadfilename=test-aspell.tar.gz' self.write_recipeinc('aspell', data) bitbake('-ccleanall aspell') @@ -174,8 +176,9 @@ class BitbakeTests(oeSelfTest): @testcase(1035) def test_continue(self): -self.write_config(DL_DIR = \${TOPDIR}/download-selftest\) -self.write_config(SSTATE_DIR = \${TOPDIR}/download-selftest\) +self.write_config(DL_DIR = \${TOPDIR}/download-selftest\ +SSTATE_DIR = \${TOPDIR}/download-selftest\ +) self.write_recipeinc('man',\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n ) runCmd('bitbake -c cleanall man xcursor-transparent-theme') result = runCmd('bitbake man xcursor-transparent-theme -k', ignore_status=True) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] combo-layer pull changes
These patches are an effort to make combo-layer pull operation a bit more predictable. The first patch avoids unwanted merge commits in local component repositories by requiring fast-forward when pulling. The second patch adds a --hard-reset command line option to make sure that the local component repositories are always in sync with the remote. The following changes since commit df6ddc4bf9795212fda87f9d401893eb254074da: file: fix long-options (2015-07-07 23:57:14 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib marquiz/combo-layer Markus Lehtonen (2): combo-layer: only allow fast-forward when pulling combo-layer: implement --hard-reset option scripts/combo-layer | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] combo-layer: only allow fast-forward when pulling
Only allow fast-forward merges in the component repositories when doing git-pull. This makes it possible to spot problems (i.e. rewriting of history) in the component upstream . Also, this change prevents the creation of local-only merge commits in the component repositories. These merges cause last_revision field of the combo-layer config to point to a git commit that is only present in the users local component repository but nowhere in upstream. Signed-off-by: Markus Lehtonen markus.lehto...@linux.intel.com --- scripts/combo-layer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/combo-layer b/scripts/combo-layer index 2d100be..8637add 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -587,7 +587,7 @@ def action_pull(conf, args): branch = repo.get('branch', master) runcmd(git checkout %s % branch, ldir) logger.info(git pull for component repo %s in %s ... % (name, ldir)) -output=runcmd(git pull, ldir) +output=runcmd(git pull --ff-only, ldir) logger.info(output) def action_update(conf, args): -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] report-error: expand all variables
BUILDNAME is now composed from ${DATE} and ${TIME} so needs to be expanded to useful. Whilst fixing this some other variables were explicitly not expanded for no clear reason, so expand those too. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/classes/report-error.bbclass | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass index 11eee9b..cabd98c 100644 --- a/meta/classes/report-error.bbclass +++ b/meta/classes/report-error.bbclass @@ -32,11 +32,11 @@ python errorreport_handler () { if isinstance(e, bb.event.BuildStarted): bb.utils.mkdirhier(logpath) data = {} -machine = e.data.getVar(MACHINE, False) +machine = e.data.getVar(MACHINE, True) data['machine'] = machine data['build_sys'] = e.data.getVar(BUILD_SYS, True) -data['nativelsb'] = e.data.getVar(NATIVELSBSTRING, False) -data['distro'] = e.data.getVar(DISTRO, False) +data['nativelsb'] = e.data.getVar(NATIVELSBSTRING, True) +data['distro'] = e.data.getVar(DISTRO, True) data['target_sys'] = e.data.getVar(TARGET_SYS, True) data['failures'] = [] data['component'] = e.getPkgs()[0] @@ -73,7 +73,7 @@ python errorreport_handler () { bb.utils.unlockfile(lock) failures = jsondata['failures'] if(len(failures) 0): -filename = error_report_ + e.data.getVar(BUILDNAME, False)+.txt +filename = error_report_ + e.data.getVar(BUILDNAME, True)+.txt datafile = errorreport_savedata(e, jsondata, filename) bb.note(The errors for this build are stored in %s\nYou can send the errors to a reports server by running:\n send-error-report %s [-s server] % (datafile, datafile)) bb.note(The contents of these logs will be posted in public if you use the above command with the default server. Please ensure you remove any identifying or proprietary information when prompted before sending.) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] combo-layer: implement --hard-reset option
This option causes combo-layer to do git fetch and hard reset instead of git pull in the component repositories. This makes sure that the local component repositories are always in sync with the remote - tolerating force pushes and overriding any locally made changes. Signed-off-by: Markus Lehtonen markus.lehto...@linux.intel.com --- scripts/combo-layer | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/combo-layer b/scripts/combo-layer index 8637add..6b0c56d 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -586,9 +586,14 @@ def action_pull(conf, args): ldir = repo['local_repo_dir'] branch = repo.get('branch', master) runcmd(git checkout %s % branch, ldir) -logger.info(git pull for component repo %s in %s ... % (name, ldir)) -output=runcmd(git pull --ff-only, ldir) -logger.info(output) +logger.info(update component repo %s in %s ... % (name, ldir)) +if not args.hard_reset: +output=runcmd(git pull --ff-only, ldir) +logger.info(output) +else: +output=runcmd(git fetch, ldir) +logger.info(output) +runcmd(git reset --hard FETCH_HEAD, ldir) def action_update(conf, args): @@ -895,6 +900,10 @@ Action: parser.add_option(-n, --no-pull, help = skip pulling component repos during update, action = store_true, dest = nopull, default = False) +parser.add_option(--hard-reset, + help = instead of pull do fetch and hard-reset in component repos, + action = store_true, default = False) + parser.add_option(-H, --history, help = import full history of components during init, action = store_true, default = False) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] python-io: Add runtime dependency on contextlib
On 7 July 2015 at 22:22, Ash Charles ashchar...@gmail.com wrote: This applied to Python 2.7.9 but not 3.3. Do you mean this isn't applicable to python 3.3 or you haven't checked with 3.3? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] oeqa/sstatetests: Add test for comparing 32 and 64 bit sstate checksums
The sstate checksums for both native and target should not vary whether they're built on a 32 or 64 bit system. Rather than requiring two different build machines and running a builds, override the variables calling uname() manually and check using bitbake -S. [YOCTO #5970] Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org diff --git a/meta/lib/oeqa/selftest/sstatetests.py b/meta/lib/oeqa/selftest/sstatetests.py index d578ddd..6281d50 100644 --- a/meta/lib/oeqa/selftest/sstatetests.py +++ b/meta/lib/oeqa/selftest/sstatetests.py @@ -202,3 +202,38 @@ class SStateTests(SStateBase): global_config.append('MACHINE = qemux86') target_config.append('') self.run_test_sstate_cache_management_script('m4', global_config, target_config, ignore_patterns=['populate_lic']) + +def test_sstate_32_64_same_hash(self): + +The sstate checksums for both native and target should not vary whether +they're built on a 32 or 64 bit system. Rather than requiring two different +build machines and running a builds, override the variables calling uname() +manually and check using bitbake -S. + + +topdir = get_bb_var('TOPDIR') +targetvendor = get_bb_var('TARGET_VENDOR') +self.write_config( +TMPDIR = \${TOPDIR}/tmp-sstatesamehash\ +BUILD_ARCH = \x86_64\ +BUILD_OS = \linux\ +) +self.track_for_cleanup(topdir + /tmp-sstatesamehash) +bitbake(core-image-sato -S printdiff, ignore_status=True) +self.write_config( +TMPDIR = \${TOPDIR}/tmp-sstatesamehash2\ +BUILD_ARCH = \i686\ +BUILD_OS = \linux\ +) +self.track_for_cleanup(topdir + /tmp-sstatesamehash2) +bitbake(core-image-sato -S printdiff, ignore_status=True) + +def get_files(d): +f = [] +for root, dirs, files in os.walk(d): +f.extend(os.path.join(root, name) for name in files) +return f +files1 = get_files(topdir + /tmp-sstatesamehash/stamps/) +files2 = get_files(topdir + /tmp-sstatesamehash2/stamps/) +files2 = [x.replace(tmp-sstatesamehash2, tmp-sstatesamehash).replace(i686-linux, x86_64-linux).replace(i686 + targetvendor + -linux, x86_64 + targetvendor + -linux, ) for x in files2] +self.assertItemsEqual(files1, files2) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/4] Fix builds for MIPS64 N32
On Wed, 2015-07-08 at 15:00 +0300, Dmitry Eremin-Solenikov wrote: Hello, 2015-07-01 17:02 GMT+03:00 Dmitry Eremin-Solenikov dbarysh...@gmail.com: Quite simple configuration (MIPS64 N32 image) fails to build (see below). I have verified these patches in both single lib and in multilib cases. Tri-lib images and SDK for MIPS build fine with these patches. Any comments on this patchset? It would be nice to have N32 ubroken in the current master tree. Mark, can you review these patches please? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ltp: Add inhibit of split
From: Yue Tao yue@windriver.com With the recent change to allow strip and split of packages to be controlled seperately, ltp will sometimes fail to build properly. So in addition to the existing inhibit strip, we also want to inhibit split. Signed-off-by: Yue Tao yue@windriver.com --- meta/recipes-extended/ltp/ltp_20150420.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/ltp/ltp_20150420.bb b/meta/recipes-extended/ltp/ltp_20150420.bb index 2554f52..108ebf1 100644 --- a/meta/recipes-extended/ltp/ltp_20150420.bb +++ b/meta/recipes-extended/ltp/ltp_20150420.bb @@ -80,6 +80,7 @@ FILES_${PN} += /opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/lt # Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 nm01 fails INHIBIT_PACKAGE_STRIP = 1 +INHIBIT_PACKAGE_DEBUG_SPLIT = 1 # However, test_arch_stripped is already stripped, so... INSANE_SKIP_${PN} += already-stripped -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
Hi Otavio Who's going to provide ongoing maintenance for all that? I would like Lei to establish himself as the maintainer (through the maintainers.inc file). Agreed; 2007 I was still one of developers of it IIRC and since then, Jim has improved it quite a lot. Thank you. To be honest, parted at that time has several issues with bigger disk sectors and other stuff. I wouldn't like to see projects relying on such old and buggy version. Old version does have some issues. But I think it is better to provide a non-v3 version to user who does not mind of these issues. Cheers Lei -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Otavio Salvador Sent: Tuesday, July 07, 2015 10:00 PM To: Alexander Kanavin Cc: OE-core Subject: Re: [OE-core] FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3 On Tue, Jul 7, 2015 at 10:55 AM, Alexander Kanavin alexander.kana...@linux.intel.com wrote: On 07/07/2015 04:38 PM, Burton, Ross wrote: How about renaming the recipe, so that it doesn't clash with the GPLv3 version? For example, parted1_1.8.6.bb http://parted1_1.8.6.bb. Then it can be kept outside of oe-core. As they're just version variations that would be overly complex. Dropping it in oe-core as it's a non-v3 alternative doesn't seem to be a problem to me (as there's plenty of precedent for that already). My problem is that parted 1.8.6 was released in 2007, and the recipe already carries eight patches with it (and none of them has any information about their origin). Who's going to provide ongoing maintenance for all that? I would like Lei to establish himself as the maintainer (through the maintainers.inc file). Agreed; 2007 I was still one of developers of it IIRC and since then, Jim has improved it quite a lot. To be honest, parted at that time has several issues with bigger disk sectors and other stuff. I wouldn't like to see projects relying on such old and buggy version. -- 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 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 1/1] nfs-utils: fix to start nfs-server correctly in systemd
Add /etc/modules-load.d/nfsd.conf so that the system loads nfsd at start-up. Add proc-fs-nfsd.mount systemd unit file because it's needed for nfs server to start correctly. After this change, in a systemd based image, we can use `systemctl start nfs-server' to start the nfs server and things would work correctly. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../nfs-utils/nfs-utils/proc-fs-nfsd.mount | 8 meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb | 10 ++ 2 files changed, 18 insertions(+) create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount b/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount new file mode 100644 index 000..630801b --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount @@ -0,0 +1,8 @@ +[Unit] +Description=NFSD configuration filesystem +After=systemd-modules-load.service + +[Mount] +What=nfsd +Where=/proc/fs/nfsd +Type=nfsd diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb index 0bcd65e..6da8509 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb @@ -28,6 +28,7 @@ SRC_URI = ${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://nfs-server.service \ file://nfs-mountd.service \ file://nfs-statd.service \ + file://proc-fs-nfsd.mount \ file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \ file://nfs-utils-debianize-start-statd.patch \ @@ -87,6 +88,8 @@ FILES_${PN}-client = ${base_sbindir}/*mount.nfs* ${sbindir}/*statd \ FILES_${PN}-stats = ${sbindir}/mountstats ${sbindir}/nfsiostat RDEPENDS_${PN}-stats = python +FILES_${PN} += ${systemd_unitdir} + # Make clean needed because the package comes with # precompiled 64-bit objects that break the build do_compile_prepend() { @@ -108,6 +111,13 @@ do_install_append () { sed -i -e 's,@SBINDIR@,${sbindir},g' \ -e 's,@SYSCONFDIR@,${sysconfdir},g' \ ${D}${systemd_unitdir}/system/*.service + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${sysconfdir}/modules-load.d + echo nfsd ${D}${sysconfdir}/modules-load.d/nfsd.conf + install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/ + install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/ + ln -sf ../proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/sysinit.target.wants/proc-fs-nfsd.mount + fi # kernel code as of 3.8 hard-codes this path as a default install -d ${D}/var/lib/nfs/v4recovery -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 0/1] nfs-utils: fix to start nfs-server correctly in systemd
The following changes since commit df6ddc4bf9795212fda87f9d401893eb254074da: file: fix long-options (2015-07-07 23:57:14 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/nfs-utils-systemd http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/nfs-utils-systemd Chen Qi (1): nfs-utils: fix to start nfs-server correctly in systemd .../nfs-utils/nfs-utils/proc-fs-nfsd.mount | 8 meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb | 10 ++ 2 files changed, 18 insertions(+) create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] nfs-utils: fix to start nfs-server correctly in systemd
1. Change RRECOMMENDS to RDEPENDS for kernel-module-nfsd because this kernel module is a necessity for nfs server. 2. Add proc-fs-nfsd.mount systemd unit file because it's needed for nfs server to start correctly. After this change, in a systemd based image, we can use `systemctl start nfs-server' to start the nfs server and things would work correctly. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../nfs-utils/nfs-utils/proc-fs-nfsd.mount | 8 meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb | 12 +++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount b/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount new file mode 100644 index 000..630801b --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount @@ -0,0 +1,8 @@ +[Unit] +Description=NFSD configuration filesystem +After=systemd-modules-load.service + +[Mount] +What=nfsd +Where=/proc/fs/nfsd +Type=nfsd diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb index 0bcd65e..fa56c1f 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84 DEPENDS = libcap libnfsidmap libevent util-linux sqlite3 RDEPENDS_${PN}-client = rpcbind bash RDEPENDS_${PN} = ${PN}-client bash -RRECOMMENDS_${PN} = kernel-module-nfsd +RDEPENDS_${PN} = kernel-module-nfsd inherit useradd @@ -28,6 +28,7 @@ SRC_URI = ${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://nfs-server.service \ file://nfs-mountd.service \ file://nfs-statd.service \ + file://proc-fs-nfsd.mount \ file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \ file://nfs-utils-debianize-start-statd.patch \ @@ -87,6 +88,8 @@ FILES_${PN}-client = ${base_sbindir}/*mount.nfs* ${sbindir}/*statd \ FILES_${PN}-stats = ${sbindir}/mountstats ${sbindir}/nfsiostat RDEPENDS_${PN}-stats = python +FILES_${PN} += ${systemd_unitdir} + # Make clean needed because the package comes with # precompiled 64-bit objects that break the build do_compile_prepend() { @@ -108,6 +111,13 @@ do_install_append () { sed -i -e 's,@SBINDIR@,${sbindir},g' \ -e 's,@SYSCONFDIR@,${sysconfdir},g' \ ${D}${systemd_unitdir}/system/*.service + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${sysconfdir}/modules-load.d + echo nfsd ${D}${sysconfdir}/modules-load.d/nfsd.conf + install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/ + install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/ + ln -sf ../proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/sysinit.target.wants/proc-fs-nfsd.mount + fi # kernel code as of 3.8 hard-codes this path as a default install -d ${D}/var/lib/nfs/v4recovery -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] nfs-utils: fix to start nfs-server correctly in systemd images
The following changes since commit df6ddc4bf9795212fda87f9d401893eb254074da: file: fix long-options (2015-07-07 23:57:14 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/nfs-utils-systemd http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/nfs-utils-systemd Chen Qi (1): nfs-utils: fix to start nfs-server correctly in systemd .../nfs-utils/nfs-utils/proc-fs-nfsd.mount | 8 meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb | 12 +++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] nfs-utils: fix to start nfs-server correctly in systemd
On 08-07-15 10:07, Chen Qi wrote: 1. Change RRECOMMENDS to RDEPENDS for kernel-module-nfsd because this kernel module is a necessity for nfs server. No it is not! Like any kernel module, it can be built in, and then there will be no such package, and the package becomes uninstallable. That is the reason that kernel-module-* dependencies are (almost) always RRECOMMENDS. Moving this to RDEPENDS will break things on configurations where the module is built in. (Maybe some day the kernel will RPROVIDE such packages, that would solve it) 2. Add proc-fs-nfsd.mount systemd unit file because it's needed for nfs server to start correctly. After this change, in a systemd based image, we can use `systemctl start nfs-server' to start the nfs server and things would work correctly. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../nfs-utils/nfs-utils/proc-fs-nfsd.mount | 8 meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb | 12 +++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount b/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount new file mode 100644 index 000..630801b --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount @@ -0,0 +1,8 @@ +[Unit] +Description=NFSD configuration filesystem +After=systemd-modules-load.service + +[Mount] +What=nfsd +Where=/proc/fs/nfsd +Type=nfsd diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb index 0bcd65e..fa56c1f 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84 DEPENDS = libcap libnfsidmap libevent util-linux sqlite3 RDEPENDS_${PN}-client = rpcbind bash RDEPENDS_${PN} = ${PN}-client bash -RRECOMMENDS_${PN} = kernel-module-nfsd +RDEPENDS_${PN} = kernel-module-nfsd inherit useradd @@ -28,6 +28,7 @@ SRC_URI = ${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://nfs-server.service \ file://nfs-mountd.service \ file://nfs-statd.service \ + file://proc-fs-nfsd.mount \ file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \ file://nfs-utils-debianize-start-statd.patch \ @@ -87,6 +88,8 @@ FILES_${PN}-client = ${base_sbindir}/*mount.nfs* ${sbindir}/*statd \ FILES_${PN}-stats = ${sbindir}/mountstats ${sbindir}/nfsiostat RDEPENDS_${PN}-stats = python +FILES_${PN} += ${systemd_unitdir} + # Make clean needed because the package comes with # precompiled 64-bit objects that break the build do_compile_prepend() { @@ -108,6 +111,13 @@ do_install_append () { sed -i -e 's,@SBINDIR@,${sbindir},g' \ -e 's,@SYSCONFDIR@,${sysconfdir},g' \ ${D}${systemd_unitdir}/system/*.service + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${sysconfdir}/modules-load.d + echo nfsd ${D}${sysconfdir}/modules-load.d/nfsd.conf + install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/ + install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/ + ln -sf ../proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/sysinit.target.wants/proc-fs-nfsd.mount + fi # kernel code as of 3.8 hard-codes this path as a default install -d ${D}/var/lib/nfs/v4recovery -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] subversion: improve the regex of sed command of SVN_SERF_INCLUDES macro
[Yocto #7474] The regex of sed command is too simple, which mangles any -D in strings, for example, a project name is My-Demo, it will be removed from the path by the sed regex, which causes a build failure. Improving it to only delete the -D behind of a space or the -D at start of a string. Signed-off-by: Kai Kang kai.k...@windriver.com --- .../Improve_the_regex_of_sed_command_of.patch | 31 ++ .../subversion/subversion_1.8.13.bb| 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch b/meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch new file mode 100644 index 000..626923b --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch @@ -0,0 +1,31 @@ +Improve the regex of sed command of SVN_SERF_INCLUDES macro + +The regex of sed command is too simple, which mangles any -D +in strings, for example, a project name is My-Demo, it will +be removed from the path by the sed regex, which causes a build +failure. Improving it to only delete the -D behind of a space or +the -D at start of a string. + +Reference: + +https://bugzilla.yoctoproject.org/show_bug.cgi?id=7874 + +Upstream-Status: Submitted [http://mail-archives.apache.org/mod_mbox/subversion-dev/201507.mbox/%3C559CDA70.8030403%40windriver.com%3E] + +Signed-off-by: Paul Gortmaker paul.gortma...@windriver.com +Signed-off-by: Yue Tao yue@windriver.com +Signed-off-by: Kai Kang kai.k...@windriver.com + +diff --git a/build/ac-macros/serf.m4.old b/build/ac-macros/serf.m4 +index 885c5a1..39969c6 100644 +--- a/build/ac-macros/serf.m4.old b/build/ac-macros/serf.m4 +@@ -143,7 +143,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG, + if $PKG_CONFIG $serf_major --atleast-version=$serf_check_version; then + AC_MSG_RESULT([yes]) + serf_found=yes +- SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/-D[^ ]*//g'`] ++ SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/[[:space:]]-D[^ ]*//g' -e 's/^-D[^ ]*//g'`] + SVN_SERF_LIBS=`$PKG_CONFIG $serf_major --libs` + break + else diff --git a/meta/recipes-devtools/subversion/subversion_1.8.13.bb b/meta/recipes-devtools/subversion/subversion_1.8.13.bb index a98be67..73ace61 100644 --- a/meta/recipes-devtools/subversion/subversion_1.8.13.bb +++ b/meta/recipes-devtools/subversion/subversion_1.8.13.bb @@ -12,6 +12,7 @@ inherit gettext pythonnative SRC_URI = ${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://libtool2.patch \ file://disable_macos.patch \ + file://Improve_the_regex_of_sed_command_of.patch \ SRC_URI[md5sum] = 4413417b529d7bdf82f74e50df02e88b SRC_URI[sha256sum] = 1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Improve the regex of sed command of SVN_SERF_INCLUDES macro of subversion
The following changes since commit 8ad9a434c9fd0300cf5c38c368b181b78421e95a: bitbake: tests/data: Add new data tests (2015-07-01 15:40:21 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib kangkai/subversion http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kangkai/subversion Kai Kang (1): subversion: improve the regex of sed command of SVN_SERF_INCLUDES macro .../Improve_the_regex_of_sed_command_of.patch | 31 ++ .../subversion/subversion_1.8.13.bb| 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
Hi Ross There's a good argument for this, so send a tested patch and it can be reviewed. OK. I will add some comments in the eight patches of recipe, and send the patch later. Cheers Lei From: Burton, Ross [mailto:ross.bur...@intel.com] Sent: Tuesday, July 07, 2015 4:19 PM To: Lei, Maohui/雷 茂慧 Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3 On 7 July 2015 at 04:50, Lei, Maohui leimao...@cn.fujitsu.commailto:leimao...@cn.fujitsu.com wrote: Can non-GPLv3 parted be added into oe-core? I think not everybody wants to use the GPLv3 version. There's a good argument for this, so send a tested patch and it can be reviewed. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] apr: Fix packet discards HTTP redirect
From: Li Wang li.w...@windriver.com Disconnect the connection by poll() timeout. If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then apr_socket_recv() returns EAGAIN. Signed-off-by: Noriaki Yoshitane yoshitane@cnt.ncos.nec.co.jp Signed-off-by: Li Wang li.w...@windriver.com --- .../apr/Fix-packet-discards-HTTP-redirect.patch| 32 ++ meta/recipes-support/apr/apr_1.5.2.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch diff --git a/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch b/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch new file mode 100644 index 000..6805b8b --- /dev/null +++ b/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch @@ -0,0 +1,32 @@ +Fix packet discards HTTP redirect. + +Disconnect the connection by poll() timeout. +If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then +apr_socket_recv() returns EAGAIN. + +Upstream-Status: Pending + +Signed-off-by: Noriaki Yoshitane yoshitane@cnt.ncos.nec.co.jp +Signed-off-by: Li Wang li.w...@windriver.com +--- + network_io/unix/sendrecv.c |4 + 1 file changed, 4 insertions(+) + +diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c +index c133a26..e8faf15 100644 +--- a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c +@@ -85,6 +85,10 @@ apr_status_t apr_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len) +(sock-timeout 0)) { + do_select: + arv = apr_wait_for_io_or_timeout(NULL, sock, 1); ++if ((arv == APR_TIMEUP) (sock-timeout == 0)) { ++*len = 0; ++return EAGAIN; ++} + if (arv != APR_SUCCESS) { + *len = 0; + return arv; +-- +1.7.9.5 + diff --git a/meta/recipes-support/apr/apr_1.5.2.bb b/meta/recipes-support/apr/apr_1.5.2.bb index aac6276..c1f7f38 100644 --- a/meta/recipes-support/apr/apr_1.5.2.bb +++ b/meta/recipes-support/apr/apr_1.5.2.bb @@ -15,6 +15,7 @@ SRC_URI = ${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://configfix.patch \ file://run-ptest \ file://upgrade-and-fix-1.5.1.patch \ + file://Fix-packet-discards-HTTP-redirect.patch \ SRC_URI[md5sum] = 4e9769f3349fe11fc0a5e1b224c236aa -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] systemd: fix immediate unmount of mountpoints not in fstab
Systemd 219 immediately unmounts any mounts which don't exist in fstab. See FDo bug #89383: https://bugs.freedesktop.org/show_bug.cgi?id=89383 Patch from Fedora: http://pkgs.fedoraproject.org/cgit/systemd.git/commit/?h=f22id=9bbe0e92dc59d5a42258c729b105a7d9901eb35e Signed-off-by: Joshua Lock joshua.l...@collabora.co.uk --- ...-mount-add-dependencies-to-dynamically-mo.patch | 36 ++ meta/recipes-core/systemd/systemd_219.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-core-mount-add-dependencies-to-dynamically-mo.patch diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-core-mount-add-dependencies-to-dynamically-mo.patch b/meta/recipes-core/systemd/systemd/0001-Revert-core-mount-add-dependencies-to-dynamically-mo.patch new file mode 100644 index 000..d69cfe0 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-Revert-core-mount-add-dependencies-to-dynamically-mo.patch @@ -0,0 +1,36 @@ +From eb7a760052667c5a35637901de9359c377263804 Mon Sep 17 00:00:00 2001 +From: Colin Walters walt...@verbum.org +Date: Tue, 24 Feb 2015 10:12:28 -0500 +Subject: [PATCH] Revert core/mount: add dependencies to dynamically mounted + mounts too + +This reverts commit 06e9783e2cc12eb6514e80c7f0014295f59b. + +This patch was imported from Fedora (http://pkgs.fedoraproject.org/cgit/systemd.git/commit/?h=f22id=9bbe0e92dc59d5a42258c729b105a7d9901eb35e). + +It fixes an issue where mount points not listed in fstab are immediately +unmounted after a call to mount. + +Upstream-Status: Inappropriate [fixed upstream] + +Signed-off-by: Joshua Lock joshua.l...@collabora.co.uk +--- + src/core/mount.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/mount.c b/src/core/mount.c +index 40037e7..cddb5e2 100644 +--- a/src/core/mount.c b/src/core/mount.c +@@ -295,7 +295,7 @@ static int mount_add_device_links(Mount *m) { + + assert(m); + +-p = get_mount_parameters(m); ++p = get_mount_parameters_fragment(m); + if (!p) + return 0; + +-- +1.8.3.1 + diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index 6ed4fe0..bac2784 100644 --- a/meta/recipes-core/systemd/systemd_219.bb +++ b/meta/recipes-core/systemd/systemd_219.bb @@ -44,6 +44,7 @@ SRC_URI = git://anongit.freedesktop.org/systemd/systemd-stable;branch=v219-stab file://0014-Revert-rules-remove-firmware-loading-rules.patch \ file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \ file://tmpfiles-pam.patch \ + file://0001-Revert-core-mount-add-dependencies-to-dynamically-mo.patch \ file://touchscreen.rules \ file://00-create-volatile.conf \ file://init \ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Fix mount when using systemd
This series imports a fix for mount when using systemd from Fedora. The following changes since commit df6ddc4bf9795212fda87f9d401893eb254074da: file: fix long-options (2015-07-07 23:57:14 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib joshuagl/systemd http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=joshuagl/systemd Joshua Lock (1): systemd: fix immediate unmount of mountpoints not in fstab ...-mount-add-dependencies-to-dynamically-mo.patch | 36 ++ meta/recipes-core/systemd/systemd_219.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-core-mount-add-dependencies-to-dynamically-mo.patch -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] python-io: Add runtime dependency on contextlib
On Jul 8, 2015 4:20 AM, Burton, Ross ross.bur...@intel.com wrote: On 7 July 2015 at 22:22, Ash Charles ashchar...@gmail.com wrote: This applied to Python 2.7.9 but not 3.3. Do you mean this isn't applicable to python 3.3 or you haven't checked with 3.3? It is not applicable to 3.3. Ash -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Fix packet discards HTTP redirect.
As per our commit guidelines, the commit message needs to start with the name of the recipe that was modified. Ross On 8 July 2015 at 08:32, wenzong@windriver.com wrote: From: Li Wang li.w...@windriver.com Disconnect the connection by poll() timeout. If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then apr_socket_recv() returns EAGAIN. Signed-off-by: Noriaki Yoshitane yoshitane@cnt.ncos.nec.co.jp Signed-off-by: Li Wang li.w...@windriver.com --- .../apr/Fix-packet-discards-HTTP-redirect.patch| 32 ++ meta/recipes-support/apr/apr_1.5.2.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch diff --git a/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch b/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch new file mode 100644 index 000..6805b8b --- /dev/null +++ b/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch @@ -0,0 +1,32 @@ +Fix packet discards HTTP redirect. + +Disconnect the connection by poll() timeout. +If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then +apr_socket_recv() returns EAGAIN. + +Upstream-Status: Pending + +Signed-off-by: Noriaki Yoshitane yoshitane@cnt.ncos.nec.co.jp +Signed-off-by: Li Wang li.w...@windriver.com +--- + network_io/unix/sendrecv.c |4 + 1 file changed, 4 insertions(+) + +diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c +index c133a26..e8faf15 100644 +--- a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c +@@ -85,6 +85,10 @@ apr_status_t apr_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len) +(sock-timeout 0)) { + do_select: + arv = apr_wait_for_io_or_timeout(NULL, sock, 1); ++if ((arv == APR_TIMEUP) (sock-timeout == 0)) { ++*len = 0; ++return EAGAIN; ++} + if (arv != APR_SUCCESS) { + *len = 0; + return arv; +-- +1.7.9.5 + diff --git a/meta/recipes-support/apr/apr_1.5.2.bb b/meta/recipes-support/apr/apr_1.5.2.bb index aac6276..c1f7f38 100644 --- a/meta/recipes-support/apr/apr_1.5.2.bb +++ b/meta/recipes-support/apr/apr_1.5.2.bb @@ -15,6 +15,7 @@ SRC_URI = ${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://configfix.patch \ file://run-ptest \ file://upgrade-and-fix-1.5.1.patch \ + file://Fix-packet-discards-HTTP-redirect.patch \ SRC_URI[md5sum] = 4e9769f3349fe11fc0a5e1b224c236aa -- 1.9.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/2] testimage: Support full TC path such oeqa.runtime.pnp.get_memory_size in TEST_SUITES
On Thu, 2015-07-02 at 01:52 +, Shen, Cathy wrote: Are we OK with this patch? To be honest, I was a bit confused as it said 1/2 and there never was a 2/2 until a week later and I didn't connect the two. For future reference, the correct way to reference bugzilla in the commit message is: [YOCTO #7834] The 2/2 patch also had no explanation of what it did in the commit message body. I've tweaked the commit messages for these two and queued in master-next. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] oeqa/runtime: Added 4 new runtime test cases
bash:(240) check bash in image connman: (223) Only one connmand in background (963) test connmand file rpm: (195) Check rpm install/removal log file size Signed-off-by: Daniel Istrate daniel.alexandrux.istr...@intel.com --- meta/lib/oeqa/runtime/bash.py| 23 +++ meta/lib/oeqa/runtime/connman.py | 40 meta/lib/oeqa/runtime/rpm.py | 37 + 3 files changed, 100 insertions(+) create mode 100644 meta/lib/oeqa/runtime/bash.py diff --git a/meta/lib/oeqa/runtime/bash.py b/meta/lib/oeqa/runtime/bash.py new file mode 100644 index 000..2a261a3 --- /dev/null +++ b/meta/lib/oeqa/runtime/bash.py @@ -0,0 +1,23 @@ +from oeqa.oetest import oeRuntimeTest +from oeqa.utils.decorators import * + + +class BashTest(oeRuntimeTest): + +@testcase(240) +@skipUnlessPassed(test_ssh) +def test_check_bash_in_image(self): + +Summary: check bash in image +Expected:bash command should exist in image +Product: BSPs +Author: Alexandru Georgescu alexandru.c.george...@intel.com +AutomatedBy: Daniel Istrate daniel.alexandrux.istr...@intel.com + + +cmd = 'which bash' +expected_ret = '/bin/bash' + +(status, output) = self.target.run(cmd) +self.assertEqual(0, status, 'Failed to send cmd {}'.format(cmd)) +self.assertEqual(str(output), expected_ret, 'Found {}, instead of {}'.format(output, expected_ret)) diff --git a/meta/lib/oeqa/runtime/connman.py b/meta/lib/oeqa/runtime/connman.py index cc537f7..70ead4e 100644 --- a/meta/lib/oeqa/runtime/connman.py +++ b/meta/lib/oeqa/runtime/connman.py @@ -28,3 +28,43 @@ class ConnmanTest(oeRuntimeTest): if status != 0: print self.service_status(connman) self.fail(No connmand process running) + +@testcase(223) +def test_only_one_connmand_in_background(self): + +Summary: Only one connmand in background +Expected:There will be only one connmand instance in background. +Product: BSPs +Author: Alexandru Georgescu alexandru.c.george...@intel.com +AutomatedBy: Daniel Istrate daniel.alexandrux.istr...@intel.com + + +# Make sure that 'connmand' is running in background +(status, output) = self.target.run(oeRuntimeTest.pscmd + ' | grep [c]onnmand') +self.assertEqual(0, status, 'Failed to find connmand process running in background.') + +# Start a new instance of 'connmand' +(status, output) = self.target.run('connmand') +self.assertEqual(0, status, 'Failed to start a new connmand process.') + +# Make sure that only one 'connmand' is running in background +(status, output) = self.target.run(oeRuntimeTest.pscmd + ' | grep [c]onnmand | wc -l') +self.assertEqual(0, status, 'Failed to find connmand process running in background.') +self.assertEqual(1, int(output), 'Found {} connmand processes running, expected 1.'.format(output)) + +@testcase(963) +def test_connmand_file(self): + +Summary: test connmand file +Expected:connman-applet should be ELF32 binary +Product: BSPs +Author: Lucian Musat georgex.l.mu...@intel.com +AutomatedBy: Daniel Istrate daniel.alexandrux.istr...@intel.com + + +cmd = readelf -h /usr/bin/connman-applet | sed -n '3p' | awk '{print $2}' +expected_ret = 'ELF32' + +(status, output) = self.target.run(cmd) +self.assertEqual(0, status, 'Failed to send cmd {}'.format(cmd)) +self.assertEqual(expected_ret, str(output), Expected {}, found instead {}.format(expected_ret, output)) diff --git a/meta/lib/oeqa/runtime/rpm.py b/meta/lib/oeqa/runtime/rpm.py index 4ca193b..32aae24 100644 --- a/meta/lib/oeqa/runtime/rpm.py +++ b/meta/lib/oeqa/runtime/rpm.py @@ -58,6 +58,43 @@ class RpmInstallRemoveTest(oeRuntimeTest): (status, output) = self.target.run('sudo -u test1 rpm -qa') self.assertEqual(status, 0, msg=status: %s. Cannot run rpm -qa % status) +@testcase(195) +@skipUnlessPassed('test_rpm_install') +def test_check_rpm_install_removal_log_file_size(self): + +Summary: Check rpm install/removal log file size +Expected:There should be some method to keep rpm log in a small size . +Product: BSPs +Author: Alexandru Georgescu alexandru.c.george...@intel.com +AutomatedBy: Daniel Istrate daniel.alexandrux.istr...@intel.com + +db_files_cmd = 'ls /var/lib/rpm/__db.*' +get_log_size_cmd = du /var/lib/rpm/log/log.* | awk '{print $1}' + +# Make sure that some database files are under /var/lib/rpm as '__db.xxx' +(status, output) = self.target.run(db_files_cmd) +self.assertEqual(0, status, 'Failed to find database files
Re: [OE-core] [PATCH 0/2] Add UEFI firmware for qemux86*
Feedback was related to the one of the commit's log (I used the word Poky instead of OE-Core). I will send a V2 patch and send it. Leo On 07/08/2015 09:36 AM, Richard Purdie wrote: On Tue, 2015-07-07 at 10:24 -0500, Leonardo Sandoval wrote: ping There was a piece of feedback on the series which you've not done anything about? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 0/2] Add UEFI firmware for qemux86*
From: Leonardo Sandoval leonardo.sandoval.gonza...@linux.intel.com These two patches include: 1. Recipe: Including the OVMF recipe (taken from luv-yocto repository) into OE-Core 2. Boot script: Instrumenting runqemu to include OECORE_MACHINE_SYSROOT, so the OVMF BIOS can be found. [YOCTO #5654] The following changes since commit 0aaa67a790ab211b35eed58173efa115ceb6e243: oeqa/bbtests: Fix to ensure DL_DIR is set (2015-07-08 13:09:28 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib lsandov1/efi-qemux86 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lsandov1/efi-qemux86 Leonardo Sandoval (2): ovmf: Recipe taken from luv-yocto repository runqemu: Define OECORE_MACHINE_SYSROOT on setup_sysroot ...s-Force-tools-variables-to-host-toolchain.patch | 50 ++ meta/recipes-core/ovmf/ovmf_git.bb | 61 ++ scripts/runqemu| 13 - 3 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/ovmf/ovmf/0001-BaseTools-Force-tools-variables-to-host-toolchain.patch create mode 100644 meta/recipes-core/ovmf/ovmf_git.bb -- 1.8.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 2/2] runqemu: Define OECORE_MACHINE_SYSROOT on setup_sysroot
From: Leonardo Sandoval leonardo.sandoval.gonza...@linux.intel.com At least the OVFM (UEFI Firmware for Qemu and KVM) recipe stores the BIOS under $OE_TMPDIR/sysroots/$MACHINE, now defined as OECORE_MACHINE_SYSROOT. The latter is used when searching BIOS, VGA BIOS and keymaps. As a example, to boot a OVFM BIOS, one can run the following command: $ runqemu qemux86 core-image-minimal \ biosdir=usr/share/ovmf \ biosfilename=bios.bin \ nographic Note the bios* parameters: these two are needed to specify the subfolder (parent folder is OECORE_MACHINE_SYSROOT) and BIOS filename (without it, it picks a BIOS named bios-256k.bin). [YOCTO #5654] Signed-off-by: Leonardo Sandoval leonardo.sandoval.gonza...@linux.intel.com --- scripts/runqemu | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/scripts/runqemu b/scripts/runqemu index 09c507d..f68dba1 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -397,6 +397,13 @@ setup_sysroot() { OECORE_NATIVE_SYSROOT=$OE_TMPDIR/sysroots/$BUILD_SYS fi + +# Some recipes store the BIOS under $OE_TMPDIR/sysroots/$MACHINE, +# now defined as OECORE_MACHINE_SYSROOT. The latter is used when searching +# BIOS, VGA BIOS and keymaps. +if [ -z $OECORE_MACHINE_SYSROOT ]; then +OECORE_MACHINE_SYSROOT=$OE_TMPDIR/sysroots/$MACHINE +fi } # Locate a rootfs image to boot which matches our expected @@ -486,7 +493,7 @@ fi echo FSTYPE: [$FSTYPE] setup_sysroot -# OECORE_NATIVE_SYSROOT is now set for all cases +# OECORE_NATIVE_SYSROOT and OECORE_MACHINE_SYSROOT are now set for all cases INTERNAL_SCRIPT=$0-internal if [ ! -f $INTERNAL_SCRIPT -o ! -r $INTERNAL_SCRIPT ]; then @@ -498,10 +505,14 @@ if [ ! -z $CUSTOMBIOSDIR ]; then if [ -d $OECORE_NATIVE_SYSROOT/$CUSTOMBIOSDIR ]; then echo Assuming biosdir is $OECORE_NATIVE_SYSROOT/$CUSTOMBIOSDIR SCRIPT_QEMU_OPT=$SCRIPT_QEMU_OPT -L $OECORE_NATIVE_SYSROOT/$CUSTOMBIOSDIR +elif [ -d $OECORE_MACHINE_SYSROOT/$CUSTOMBIOSDIR ]; then +echo Assuming biosdir is $OECORE_MACHINE_SYSROOT/$CUSTOMBIOSDIR +SCRIPT_QEMU_OPT=$SCRIPT_QEMU_OPT -L $OECORE_MACHINE_SYSROOT/$CUSTOMBIOSDIR else if [ ! -d $CUSTOMBIOSDIR ]; then echo Custom BIOS directory not found. Tried: $CUSTOMBIOSDIR echo and $OECORE_NATIVE_SYSROOT/$CUSTOMBIOSDIR +echo and $OECORE_MACHINE_SYSROOT/$CUSTOMBIOSDIR exit 1; fi echo Assuming biosdir is $CUSTOMBIOSDIR -- 1.8.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Fix packet discards HTTP redirect.
From: Li Wang li.w...@windriver.com Disconnect the connection by poll() timeout. If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then apr_socket_recv() returns EAGAIN. Signed-off-by: Noriaki Yoshitane yoshitane@cnt.ncos.nec.co.jp Signed-off-by: Li Wang li.w...@windriver.com --- .../apr/Fix-packet-discards-HTTP-redirect.patch| 32 ++ meta/recipes-support/apr/apr_1.5.2.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch diff --git a/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch b/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch new file mode 100644 index 000..6805b8b --- /dev/null +++ b/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch @@ -0,0 +1,32 @@ +Fix packet discards HTTP redirect. + +Disconnect the connection by poll() timeout. +If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then +apr_socket_recv() returns EAGAIN. + +Upstream-Status: Pending + +Signed-off-by: Noriaki Yoshitane yoshitane@cnt.ncos.nec.co.jp +Signed-off-by: Li Wang li.w...@windriver.com +--- + network_io/unix/sendrecv.c |4 + 1 file changed, 4 insertions(+) + +diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c +index c133a26..e8faf15 100644 +--- a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c +@@ -85,6 +85,10 @@ apr_status_t apr_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len) +(sock-timeout 0)) { + do_select: + arv = apr_wait_for_io_or_timeout(NULL, sock, 1); ++if ((arv == APR_TIMEUP) (sock-timeout == 0)) { ++*len = 0; ++return EAGAIN; ++} + if (arv != APR_SUCCESS) { + *len = 0; + return arv; +-- +1.7.9.5 + diff --git a/meta/recipes-support/apr/apr_1.5.2.bb b/meta/recipes-support/apr/apr_1.5.2.bb index aac6276..c1f7f38 100644 --- a/meta/recipes-support/apr/apr_1.5.2.bb +++ b/meta/recipes-support/apr/apr_1.5.2.bb @@ -15,6 +15,7 @@ SRC_URI = ${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://configfix.patch \ file://run-ptest \ file://upgrade-and-fix-1.5.1.patch \ + file://Fix-packet-discards-HTTP-redirect.patch \ SRC_URI[md5sum] = 4e9769f3349fe11fc0a5e1b224c236aa -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2 1/2] ovmf: Recipe taken from luv-yocto repository
The new set of patches are failing so I will send a V3! The reason is that the ovmf source code has ^M line endings and the .patch I send does not, so when bitbake is trying to patch, there are patch errors. On 07/08/2015 11:46 AM, Neri, Ricardo wrote: On Wed, 2015-07-08 at 17:34 +0100, Richard Purdie wrote: Sorry, I didn't spot this before. Does OE-Core have iasl? Does this recipe not need iasl-native in the target case too? We also have those recipes in our meta-luv layer. What does this mean? Do we need to add it also? It is not under OE-Core but I did not face any error when compiling the ovmf recipe under poky. Thanks and BR, Ricardo -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] harfbuzz: upgrade to 0.9.41
The following changes since commit 0aaa67a790ab211b35eed58173efa115ceb6e243: oeqa/bbtests: Fix to ensure DL_DIR is set (2015-07-08 13:09:28 +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): harfbuzz: upgrade to 0.9.41 .../harfbuzz/{harfbuzz_0.9.40.bb = harfbuzz_0.9.41.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/harfbuzz/{harfbuzz_0.9.40.bb = harfbuzz_0.9.41.bb} (88%) -- 2.1.4 -- ___ 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 0.9.41
Fix hb-coretext with trailing whitespace in right-to-left. New API: hb_buffer_reverse_range(). Allow implementing atomic ops in config.h. Fix hb_language_t in language bindings. Misc fixes. Signed-off-by: Cristian Iorga cristian.io...@intel.com --- .../harfbuzz/{harfbuzz_0.9.40.bb = harfbuzz_0.9.41.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/harfbuzz/{harfbuzz_0.9.40.bb = harfbuzz_0.9.41.bb} (88%) diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.41.bb similarity index 88% rename from meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb rename to meta/recipes-graphics/harfbuzz/harfbuzz_0.9.41.bb index 2517ede..1ea4563 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.40.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.41.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \ SECTION = libs SRC_URI = http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2; -SRC_URI[md5sum] = 0e27e531f4c4acff601ebff0957755c2 -SRC_URI[sha256sum] = 1771d53583be6d91ca961854b2a24fb239ef0545eed221ae3349abae0ab8321f +SRC_URI[md5sum] = a2966f1b6a470c2cd84eb511f924cf68 +SRC_URI[sha256sum] = d81aa53d0c02b437beeaac159d7fc16394d676bbce0860fb6f6a10b587dc057c inherit autotools pkgconfig lib_package -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gnome-icon-theme: inherit allarch
The intltool 0.51 doesn't do compile tests in the autoconf macros, so this recipe can be allarch again. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb index fde2bc0..988ba21 100644 --- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb +++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb @@ -10,7 +10,7 @@ PR = r5 DEPENDS = icon-naming-utils-native glib-2.0 intltool-native libxml-simple-perl-native -inherit autotools perlnative gtk-icon-cache pkgconfig gettext +inherit allarch autotools perlnative gtk-icon-cache pkgconfig gettext SRC_URI = ${GNOME_MIRROR}/${BPN}/2.31/${BPN}-${PV}.tar.bz2 \ file://iconpath-option.patch -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][V2] intltool: Upgrade 0.50.2 - 0.51.0
From: Jussi Kukkonen jussi.kukko...@intel.com * Remove uclibc.patch as the whole localedir guessing code has been removed upstream. * Add patch to fix deprecation warnings (and the resulting broken install paths) when using Perl 5.22 (RB) Signed-off-by: Jussi Kukkonen jussi.kukko...@intel.com Signed-off-by: Ross Burton ross.bur...@intel.com --- .../intltool/intltool-0.50.2/uclibc.patch | 19 .../intltool-nowarn.patch | 0 .../noperlcheck.patch | 0 .../intltool/intltool/perl-522-deprecations.patch | 55 ++ .../remove-xml-check.patch | 0 .../use-nativeperl.patch | 0 .../{intltool_0.50.2.bb = intltool_0.51.0.bb} | 6 +-- 7 files changed, 58 insertions(+), 22 deletions(-) delete mode 100644 meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch rename meta/recipes-devtools/intltool/{intltool-0.50.2 = intltool}/intltool-nowarn.patch (100%) rename meta/recipes-devtools/intltool/{intltool-0.50.2 = intltool}/noperlcheck.patch (100%) create mode 100644 meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch rename meta/recipes-devtools/intltool/{intltool-0.50.2 = intltool}/remove-xml-check.patch (100%) rename meta/recipes-devtools/intltool/{intltool-0.50.2 = intltool}/use-nativeperl.patch (100%) rename meta/recipes-devtools/intltool/{intltool_0.50.2.bb = intltool_0.51.0.bb} (74%) diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch b/meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch deleted file mode 100644 index 145c181..000 --- a/meta/recipes-devtools/intltool/intltool-0.50.2/uclibc.patch +++ /dev/null @@ -1,19 +0,0 @@ -on uclibc systems localedir should point to /usr/'share' as usual. - -Upstream-Status: Pending -Signed-off-by: Khem Raj raj.k...@gmail.com - -Index: intltool-0.50.2/intltool.m4 -=== intltool-0.50.2.orig/intltool.m4 2014-03-15 22:09:01.016627665 -0700 -+++ intltool-0.50.2/intltool.m42014-03-15 22:12:09.732631206 -0700 -@@ -173,6 +173,9 @@ - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; -+*-*-*uclibc*) -+[DATADIRNAME=share] -+;; - *) - [DATADIRNAME=lib] - ;; diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/intltool-nowarn.patch b/meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch similarity index 100% rename from meta/recipes-devtools/intltool/intltool-0.50.2/intltool-nowarn.patch rename to meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch diff --git a/meta/recipes-devtools/intltool/intltool-0.50.2/noperlcheck.patch b/meta/recipes-devtools/intltool/intltool/noperlcheck.patch similarity index 100% rename from meta/recipes-devtools/intltool/intltool-0.50.2/noperlcheck.patch rename to meta/recipes-devtools/intltool/intltool/noperlcheck.patch diff --git a/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch b/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch new file mode 100644 index 000..eb52172 --- /dev/null +++ b/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch @@ -0,0 +1,55 @@ +Perl 5.22 has deprecated some regex features, which causes warnings when +intltool-update runs: + +Unescaped left brace in regex is deprecated, passed through in regex; marked by +-- HERE in m/^(.*)\${ -- HERE ?([A-Z_]+)}?(.*)$/ at +/data/poky-master/tmp/sysroots/x86_64-linux/usr/bin/intltool-update line 1065. + +Take a patch from Debian to solve this. + +Upstream-Status: Submitted (https://bugs.launchpad.net/intltool/+bug/1465010) +Signed-off-by: Ross Burton ross.bur...@intel.com + +--- intltool-0.51.0-ORIG/intltool-update.in2015-05-27 00:20:43.038379963 +0200 intltool-0.51.0/intltool-update.in 2015-05-27 00:23:53.309078052 +0200 +@@ -1062,7 +1062,7 @@ + } + } + +-if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) ++if ($str =~ /^(.*)\$\{?([A-Z_]+)\}?(.*)$/) + { + my $rest = $3; + my $untouched = $1; +@@ -1190,10 +1190,10 @@ + $name=~ s/\(+$//g; + $version =~ s/\(+$//g; + +- $varhash{PACKAGE_NAME} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{PACKAGE} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{PACKAGE_VERSION} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{VERSION} = $version if (not $name =~ /\${?VERSION}?/); ++ $varhash{PACKAGE_NAME} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME\}?/); ++ $varhash{PACKAGE} = $name if (not $name =~ /\$\{?PACKAGE\}?/); ++ $varhash{PACKAGE_VERSION} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION\}?/); ++ $varhash{VERSION} = $version if (not $name =~ /\$\{?VERSION\}?/); + } + + if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) +@@ -1219,11
Re: [OE-core] [PATCH] gnome-icon-theme: inherit allarch
How can it be allarch when it depends on TUNE_PKGARCH glib-2.0? On Wed, Jul 8, 2015 at 10:02 PM, Ross Burton ross.bur...@intel.com wrote: The intltool 0.51 doesn't do compile tests in the autoconf macros, so this recipe can be allarch again. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb index fde2bc0..988ba21 100644 --- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb +++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb @@ -10,7 +10,7 @@ PR = r5 DEPENDS = icon-naming-utils-native glib-2.0 intltool-native libxml-simple-perl-native -inherit autotools perlnative gtk-icon-cache pkgconfig gettext +inherit allarch autotools perlnative gtk-icon-cache pkgconfig gettext SRC_URI = ${GNOME_MIRROR}/${BPN}/2.31/${BPN}-${PV}.tar.bz2 \ file://iconpath-option.patch -- 2.1.4 -- ___ 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
[OE-core] [PATCH][V2] gnome-icon-theme: inherit allarch
The intltool 0.51 doesn't do compile tests in the autoconf macros, so this recipe can be allarch again. Remove dependency on target glib-2.0, it doesn't appear to be required. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb index fde2bc0..df117ae 100644 --- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb +++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb @@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = file://COPYING;md5=e7e289d90fc8bdceed5e3f142f98229e PR = r5 -DEPENDS = icon-naming-utils-native glib-2.0 intltool-native libxml-simple-perl-native +DEPENDS = icon-naming-utils-native intltool-native libxml-simple-perl-native -inherit autotools perlnative gtk-icon-cache pkgconfig gettext +inherit allarch autotools perlnative gtk-icon-cache pkgconfig gettext SRC_URI = ${GNOME_MIRROR}/${BPN}/2.31/${BPN}-${PV}.tar.bz2 \ file://iconpath-option.patch -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gnome-icon-theme: inherit allarch
On 8 July 2015 at 22:15, Martin Jansa martin.ja...@gmail.com wrote: How can it be allarch when it depends on TUNE_PKGARCH glib-2.0? Spurious dependency, locally removed. Will send a V2. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] python-smartpm: 1.4.1 - 1.5
* Remove the following patches since the are already in the source: smart-config-ignore-all-recommends.patch smart-conflict-provider.patch smart-dflags.patch smart-filename-NAME_MAX.patch smart-flag-exclude-packages.patch smart-flag-ignore-recommends.patch smart-metadata-match.patch smart-multilib-fixes.patch smart-rpm-extra-macros.patch smart-rpm-md-parse.patch smart-rpm-root.patch smart-tmpdir.patch smart-yaml-error.patch * Update the following patches, part of the code are already in the source: smart-attempt.patch smart-improve-error-reporting.patch smart-recommends.patch smartpm-rpm5-nodig.patch * Use github and git repo as the SRC_URI. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- .../python/python-smartpm/smart-attempt.patch | 164 ++- .../smart-config-ignore-all-recommends.patch | 24 - .../python-smartpm/smart-conflict-provider.patch | 196 .../python/python-smartpm/smart-dflags.patch | 45 - .../python-smartpm/smart-filename-NAME_MAX.patch | 35 - .../smart-flag-exclude-packages.patch | 70 -- .../smart-flag-ignore-recommends.patch | 60 -- .../smart-improve-error-reporting.patch| 168 +--- .../python-smartpm/smart-metadata-match.patch | 28 - .../python-smartpm/smart-multilib-fixes.patch | 22 - .../python/python-smartpm/smart-recommends.patch | 1051 +--- .../python-smartpm/smart-rpm-extra-macros.patch| 27 - .../python/python-smartpm/smart-rpm-md-parse.patch | 26 - .../python/python-smartpm/smart-rpm-root.patch | 80 -- .../python/python-smartpm/smart-tmpdir.patch | 30 - .../python/python-smartpm/smart-yaml-error.patch | 86 -- .../python/python-smartpm/smartpm-rpm5-nodig.patch | 47 +- ...thon-smartpm_1.4.1.bb = python-smartpm_git.bb} | 23 +- 18 files changed, 132 insertions(+), 2050 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-config-ignore-all-recommends.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-conflict-provider.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-dflags.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-filename-NAME_MAX.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-flag-exclude-packages.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-flag-ignore-recommends.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-metadata-match.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-multilib-fixes.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-rpm-extra-macros.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-rpm-md-parse.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-rpm-root.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-tmpdir.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-yaml-error.patch rename meta/recipes-devtools/python/{python-smartpm_1.4.1.bb = python-smartpm_git.bb} (84%) diff --git a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch index 82d2e6c..ec98e03 100644 --- a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch +++ b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch @@ -18,38 +18,68 @@ Upstream-Status: Pending Signed-off-by: Mark Hatle mark.ha...@windriver.com Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- - smart.py | 5 +++- - smart/commands/install.py | 5 - smart/transaction.py | 65 +++ - 3 files changed, 58 insertions(+), 17 deletions(-) + backends/rpm/pm.py | 35 ++- + transaction.py | 50 +- + 2 files changed, 71 insertions(+), 14 deletions(-) -Index: smart-1.4.1/smart/commands/install.py -=== smart-1.4.1.orig/smart/commands/install.py -+++ smart-1.4.1/smart/commands/install.py -@@ -50,6 +50,8 @@ def option_parser(): - parser = OptionParser(usage=USAGE, - description=DESCRIPTION, - examples=EXAMPLES) -+parser.add_option(--attempt, action=store_true, -+ help=_(attempt to install packages, ignore failures)) - parser.add_option(--stepped, action=store_true, - help=_(split operation in steps)) - parser.add_option(--urls, action=store_true, -@@ -80,6 +82,9 @@ def main(ctrl, opts): - if not opts.args: - raise Error, _(no package(s) given) - -+if opts.attempt: -+ sysconf.set(attempt-install, True, soft=True) +diff --git a/smart/backends/rpm/pm.py
[OE-core] [PATCH 1/3] less: 471 - 478
* Remove backport patch 0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch. * The LICENSE's checksum changed because of year changed, the contents are the same. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- ...ossible-buffer-overrun-with-invalid-UTF-8.patch | 49 .../less/{less_471.bb = less_478.bb} |7 ++- 2 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 meta/recipes-extended/less/less/0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch rename meta/recipes-extended/less/{less_471.bb = less_478.bb} (78%) diff --git a/meta/recipes-extended/less/less/0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch b/meta/recipes-extended/less/less/0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch deleted file mode 100644 index 455eafc..000 --- a/meta/recipes-extended/less/less/0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e0a1add063a657b98611c94debb3631b8ffa36fe Mon Sep 17 00:00:00 2001 -From: Junling Zheng zhengjunl...@huawei.com -Date: Fri, 24 Apr 2015 11:24:04 +0800 -Subject: [PATCH] Fix possible buffer overrun with invalid UTF-8 - -An out of bounds read access in the UTF-8 decoding can be triggered with -a malformed file in the tool less. The access happens in the function -is_utf8_well_formed due to a truncated multibyte character in the sample -file. - -The bug does not crash less, it can only be made visible by running less -with valgrind or compiling it with Address Sanitizer. - -Version 475 of less contains a fix for this issue. The file version.c -contains some entry mentioning this issue (without any credit): - - - v475 3/2/15 Fix possible buffer overrun with invalid UTF-8 - -The fix is in the file line.c. We derive this patch from: - -https://blog.fuzzing-project.org/3-less-out-of-bounds-read-access-TFPA-0022014.html - -Thank Claire Robinson for validating it on Mageia 4 i586. Refer to: - -https://bugs.mageia.org/show_bug.cgi?id=15567 - -Upstream Status: Backported - -Signed-off-by: Junling Zheng zhengjunl...@huawei.com - line.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/line.c b/line.c -index 89495a3..474be2c 100644 a/line.c -+++ b/line.c -@@ -807,7 +807,7 @@ pappend(c, pos) - mbc_buf[mbc_buf_index++] = c; - if (mbc_buf_index mbc_buf_len) - return (0); -- if (is_utf8_well_formed(mbc_buf)) -+ if (is_utf8_well_formed(mbc_buf, mbc_buf_index)) - r = do_append(get_wchar(mbc_buf), mbc_buf, mbc_pos); - else - /* Complete, but not shortest form, sequence. */ --- -1.9.1 - diff --git a/meta/recipes-extended/less/less_471.bb b/meta/recipes-extended/less/less_478.bb similarity index 78% rename from meta/recipes-extended/less/less_471.bb rename to meta/recipes-extended/less/less_478.bb index 72d2562..fc63774 100644 --- a/meta/recipes-extended/less/less_471.bb +++ b/meta/recipes-extended/less/less_478.bb @@ -21,15 +21,14 @@ SECTION = console/utils LICENSE = GPLv3+ | BSD-2-Clause LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ -file://LICENSE;md5=866cc220f330b04ae4661fc3cdfedea7 +file://LICENSE;md5=48c26a307f91af700e1f00585f215aaf DEPENDS = ncurses SRC_URI = http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \ - file://0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch \ -SRC_URI[md5sum] = 9a40d29a2d84b41f9f36d7dd90b4f950 -SRC_URI[sha256sum] = 37f613fa9a526378788d790a92217d59b523574cf7159f6538da8564b3fb27f8 +SRC_URI[md5sum] = 934fcc9f137b9ef66a943c224f413d39 +SRC_URI[sha256sum] = 495c7df52199a0c7e6bfbbe7697b2b54f4bf197c8b10b43957762d74483574ce inherit autotools update-alternatives -- 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] elfutils: 0.162 - 0.163
Signed-off-by: Robert Yang liezhi.y...@windriver.com --- ...m-Silence-Werror-maybe-uninitialized-fals.patch |0 .../0001-remove-the-unneed-checking.patch |0 .../arm_backend.diff |0 .../arm_func_value.patch |0 .../arm_unwind_ret_mask.patch |0 .../fixheadercheck.patch |0 .../hppa_backend.diff |0 .../m68k_backend.diff |0 .../mips_backend.diff |0 .../mips_readelf_w.patch |0 .../non_linux.patch|0 .../redhat-portability.diff|0 .../scanf-format.patch |0 .../testsuite-ignore-elflint.diff |0 .../uclibc-support-for-elfutils-0.161.patch|0 .../{elfutils_0.162.bb = elfutils_0.163.bb} |4 ++-- 16 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/0001-remove-the-unneed-checking.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/arm_backend.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/arm_func_value.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/arm_unwind_ret_mask.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/fixheadercheck.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/hppa_backend.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/m68k_backend.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/mips_backend.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/mips_readelf_w.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/non_linux.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/redhat-portability.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/scanf-format.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/testsuite-ignore-elflint.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/uclibc-support-for-elfutils-0.161.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils_0.162.bb = elfutils_0.163.bb} (95%) diff --git a/meta/recipes-devtools/elfutils/elfutils-0.162/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch b/meta/recipes-devtools/elfutils/elfutils-0.163/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch similarity index 100% rename from meta/recipes-devtools/elfutils/elfutils-0.162/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch rename to meta/recipes-devtools/elfutils/elfutils-0.163/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch diff --git a/meta/recipes-devtools/elfutils/elfutils-0.162/0001-remove-the-unneed-checking.patch b/meta/recipes-devtools/elfutils/elfutils-0.163/0001-remove-the-unneed-checking.patch similarity index 100% rename from meta/recipes-devtools/elfutils/elfutils-0.162/0001-remove-the-unneed-checking.patch rename to meta/recipes-devtools/elfutils/elfutils-0.163/0001-remove-the-unneed-checking.patch diff --git a/meta/recipes-devtools/elfutils/elfutils-0.162/arm_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.163/arm_backend.diff similarity index 100% rename from meta/recipes-devtools/elfutils/elfutils-0.162/arm_backend.diff rename to meta/recipes-devtools/elfutils/elfutils-0.163/arm_backend.diff diff --git a/meta/recipes-devtools/elfutils/elfutils-0.162/arm_func_value.patch b/meta/recipes-devtools/elfutils/elfutils-0.163/arm_func_value.patch similarity index 100% rename from meta/recipes-devtools/elfutils/elfutils-0.162/arm_func_value.patch rename to meta/recipes-devtools/elfutils/elfutils-0.163/arm_func_value.patch diff --git a/meta/recipes-devtools/elfutils/elfutils-0.162/arm_unwind_ret_mask.patch b/meta/recipes-devtools/elfutils/elfutils-0.163/arm_unwind_ret_mask.patch similarity index 100% rename from meta/recipes-devtools/elfutils/elfutils-0.162/arm_unwind_ret_mask.patch rename to meta/recipes-devtools/elfutils/elfutils-0.163/arm_unwind_ret_mask.patch diff --git a/meta/recipes-devtools/elfutils/elfutils-0.162/fixheadercheck.patch b/meta/recipes-devtools/elfutils/elfutils-0.163/fixheadercheck.patch similarity index 100% rename from meta/recipes-devtools/elfutils/elfutils-0.162/fixheadercheck.patch rename to meta/recipes-devtools/elfutils/elfutils-0.163/fixheadercheck.patch diff --git
[OE-core] [PATCH 0/3 V2] Upgrade smartpm, less and elfutils
* V2: Sent the correct patches * V1: Tested world core-image-sato core-image-sato-sdk build on: qemux86 qemux86-64 qemuarm qemuarm64 qemuppc qemumpis Also tested core-image-sato on rpm_4.11.2. // Robert The following changes since commit df6ddc4bf9795212fda87f9d401893eb254074da: file: fix long-options (2015-07-07 23:57:14 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/PU http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/PU Robert Yang (3): less: 471 - 478 elfutils: 0.162 - 0.163 python-smartpm: 1.4.1 - 1.5 ...m-Silence-Werror-maybe-uninitialized-fals.patch |0 .../0001-remove-the-unneed-checking.patch |0 .../arm_backend.diff |0 .../arm_func_value.patch |0 .../arm_unwind_ret_mask.patch |0 .../fixheadercheck.patch |0 .../hppa_backend.diff |0 .../m68k_backend.diff |0 .../mips_backend.diff |0 .../mips_readelf_w.patch |0 .../non_linux.patch|0 .../redhat-portability.diff|0 .../scanf-format.patch |0 .../testsuite-ignore-elflint.diff |0 .../uclibc-support-for-elfutils-0.161.patch|0 .../{elfutils_0.162.bb = elfutils_0.163.bb} |4 +- .../python/python-smartpm/smart-attempt.patch | 164 ++- .../smart-config-ignore-all-recommends.patch | 24 - .../python-smartpm/smart-conflict-provider.patch | 196 .../python/python-smartpm/smart-dflags.patch | 45 - .../python-smartpm/smart-filename-NAME_MAX.patch | 35 - .../smart-flag-exclude-packages.patch | 70 -- .../smart-flag-ignore-recommends.patch | 60 -- .../smart-improve-error-reporting.patch| 168 +--- .../python-smartpm/smart-metadata-match.patch | 28 - .../python-smartpm/smart-multilib-fixes.patch | 22 - .../python/python-smartpm/smart-recommends.patch | 1051 +--- .../python-smartpm/smart-rpm-extra-macros.patch| 27 - .../python/python-smartpm/smart-rpm-md-parse.patch | 26 - .../python/python-smartpm/smart-rpm-root.patch | 80 -- .../python/python-smartpm/smart-tmpdir.patch | 30 - .../python/python-smartpm/smart-yaml-error.patch | 86 -- .../python/python-smartpm/smartpm-rpm5-nodig.patch | 47 +- ...thon-smartpm_1.4.1.bb = python-smartpm_git.bb} | 23 +- ...ossible-buffer-overrun-with-invalid-UTF-8.patch | 49 - .../less/{less_471.bb = less_478.bb} |7 +- 36 files changed, 137 insertions(+), 2105 deletions(-) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/0001-remove-the-unneed-checking.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/arm_backend.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/arm_func_value.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/arm_unwind_ret_mask.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/fixheadercheck.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/hppa_backend.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/m68k_backend.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/mips_backend.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/mips_readelf_w.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/non_linux.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/redhat-portability.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/scanf-format.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/testsuite-ignore-elflint.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/uclibc-support-for-elfutils-0.161.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils_0.162.bb = elfutils_0.163.bb} (95%) delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-config-ignore-all-recommends.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-conflict-provider.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-dflags.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-filename-NAME_MAX.patch delete mode 100644
[OE-core] [PATCH 2/2] systemd: add PACKAGECONFIG selinux
Add PACKAGECONFIG 'selinux' for systemd. debug-shell.service starts different shell according whether selinux is enabled. Signed-off-by: Kai Kang kai.k...@windriver.com --- meta/recipes-core/systemd/systemd_219.bb | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index 6ed4fe0..8abd4e5 100644 --- a/meta/recipes-core/systemd/systemd_219.bb +++ b/meta/recipes-core/systemd/systemd_219.bb @@ -61,7 +61,9 @@ GTKDOC_DOCDIR = ${S}/docs/ PACKAGECONFIG ??= xz ldconfig \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ + PACKAGECONFIG[journal-upload] = --enable-libcurl,--disable-libcurl,curl # Sign the journal for anti-tampering @@ -85,6 +87,7 @@ PACKAGECONFIG[xkbcommon] = --enable-xkbcommon,--disable-xkbcommon,libxkbcommon # Update NAT firewall rules PACKAGECONFIG[iptc] = --enable-libiptc,--disable-libiptc,iptables PACKAGECONFIG[ldconfig] = --enable-ldconfig,--disable-ldconfig,, +PACKAGECONFIG[selinux] = --enable-selinux,--disable-selinux,libselinux CACHED_CONFIGUREVARS += ac_cv_path_KILL=${base_bindir}/kill CACHED_CONFIGUREVARS += ac_cv_path_KMOD=${base_bindir}/kmod -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] initscripts: add /sbin/sushell for systemd service debug-shell
Add file /sbin/sushell for systemd service debug-shell which starts with /bin/sushell when SELinux is enabled. Copy and add sushell file from Fedora 22. Add runtime dependency bash as well when systemd is enabled to eliminate QA warning: WARNING: QA Issue: /sbin/sushell_initscripts contained in package initscripts requires /bin/bash, but no providers found in its RDEPENDS [file-rdeps] Signed-off-by: Kai Kang kai.k...@windriver.com --- meta/recipes-core/initscripts/initscripts-1.0/sushell | 5 + meta/recipes-core/initscripts/initscripts_1.0.bb | 10 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/initscripts/initscripts-1.0/sushell diff --git a/meta/recipes-core/initscripts/initscripts-1.0/sushell b/meta/recipes-core/initscripts/initscripts-1.0/sushell new file mode 100644 index 000..7d96941 --- /dev/null +++ b/meta/recipes-core/initscripts/initscripts-1.0/sushell @@ -0,0 +1,5 @@ +#!/bin/bash + +[ -z $SUSHELL ] SUSHELL=/bin/bash + +exec $SUSHELL diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index a086591..b1d917d 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -33,6 +33,7 @@ SRC_URI = file://functions \ file://GPLv2.patch \ file://dmesg.sh \ file://logrotate-dmesg.conf \ + ${@bb.utils.contains('DISTRO_FEATURES','selinux','file://sushell','',d)} \ S = ${WORKDIR} @@ -46,7 +47,9 @@ DEPENDS_append = update-rc.d-native DEPENDS_append = ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)} PACKAGES =+ ${PN}-functions -RDEPENDS_${PN} = ${PN}-functions +RDEPENDS_${PN} = ${PN}-functions \ + ${@bb.utils.contains('DISTRO_FEATURES','selinux','bash','',d)} \ + FILES_${PN}-functions = ${sysconfdir}/init.d/functions* ALTERNATIVE_PRIORITY_${PN}-functions = 90 @@ -104,6 +107,11 @@ do_install () { if [ ${TARGET_ARCH} = arm ]; then install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d fi + + if ${@bb.utils.contains('DISTRO_FEATURES','selinux','true','false',d)}; then + install -d ${D}/${base_sbindir} + install -m 0755 ${WORKDIR}/sushell ${D}/${base_sbindir} + fi # # Install device dependent scripts # -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] V2: Add /sbin/sushell when SELinux is enabled
debug-shell.service from systemd starts different shell according to whether selinux is enabled. If selinux is enabled, it starts /sbin/sushell. Add /sbin/sushell from fedora. Tested with and without layer meta-selinux for x86-64. The following changes since commit 8ad9a434c9fd0300cf5c38c368b181b78421e95a: bitbake: tests/data: Add new data tests (2015-07-01 15:40:21 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib kangkai/initscripts http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kangkai/initscripts Kai Kang (2): initscripts: add /sbin/sushell for systemd service debug-shell systemd: add PACKAGECONFIG selinux meta/recipes-core/initscripts/initscripts-1.0/sushell | 5 + meta/recipes-core/initscripts/initscripts_1.0.bb | 10 +- meta/recipes-core/systemd/systemd_219.bb | 5 - 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/initscripts/initscripts-1.0/sushell -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] python-smartpm: 1.4.1 - 1.5
Signed-off-by: Robert Yang liezhi.y...@windriver.com --- .../python/python-smartpm/smart-attempt.patch | 164 ++- .../smart-config-ignore-all-recommends.patch | 24 - .../python-smartpm/smart-conflict-provider.patch | 196 .../python/python-smartpm/smart-dflags.patch | 45 - .../python-smartpm/smart-filename-NAME_MAX.patch | 35 - .../smart-flag-exclude-packages.patch | 70 -- .../smart-flag-ignore-recommends.patch | 60 -- .../smart-improve-error-reporting.patch| 168 +--- .../python-smartpm/smart-metadata-match.patch | 28 - .../python-smartpm/smart-multilib-fixes.patch | 22 - .../python/python-smartpm/smart-recommends.patch | 1051 +--- .../python-smartpm/smart-rpm-extra-macros.patch| 27 - .../python/python-smartpm/smart-rpm-md-parse.patch | 26 - .../python/python-smartpm/smart-rpm-root.patch | 80 -- .../python/python-smartpm/smart-tmpdir.patch | 30 - .../python/python-smartpm/smart-yaml-error.patch | 86 -- .../python/python-smartpm/smartpm-rpm5-nodig.patch | 47 +- .../python/python-smartpm_1.4.1.bb | 23 +- 18 files changed, 132 insertions(+), 2050 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-config-ignore-all-recommends.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-conflict-provider.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-dflags.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-filename-NAME_MAX.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-flag-exclude-packages.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-flag-ignore-recommends.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-metadata-match.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-multilib-fixes.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-rpm-extra-macros.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-rpm-md-parse.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-rpm-root.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-tmpdir.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-yaml-error.patch diff --git a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch index 82d2e6c..ec98e03 100644 --- a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch +++ b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch @@ -18,38 +18,68 @@ Upstream-Status: Pending Signed-off-by: Mark Hatle mark.ha...@windriver.com Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- - smart.py | 5 +++- - smart/commands/install.py | 5 - smart/transaction.py | 65 +++ - 3 files changed, 58 insertions(+), 17 deletions(-) + backends/rpm/pm.py | 35 ++- + transaction.py | 50 +- + 2 files changed, 71 insertions(+), 14 deletions(-) -Index: smart-1.4.1/smart/commands/install.py -=== smart-1.4.1.orig/smart/commands/install.py -+++ smart-1.4.1/smart/commands/install.py -@@ -50,6 +50,8 @@ def option_parser(): - parser = OptionParser(usage=USAGE, - description=DESCRIPTION, - examples=EXAMPLES) -+parser.add_option(--attempt, action=store_true, -+ help=_(attempt to install packages, ignore failures)) - parser.add_option(--stepped, action=store_true, - help=_(split operation in steps)) - parser.add_option(--urls, action=store_true, -@@ -80,6 +82,9 @@ def main(ctrl, opts): - if not opts.args: - raise Error, _(no package(s) given) - -+if opts.attempt: -+ sysconf.set(attempt-install, True, soft=True) +diff --git a/smart/backends/rpm/pm.py b/smart/backends/rpm/pm.py +index 9bbd952..ba6405a 100644 +--- a/smart/backends/rpm/pm.py b/smart/backends/rpm/pm.py +@@ -241,15 +241,48 @@ class RPMPackageManager(PackageManager): + cb = RPMCallback(prog, upgradednames) + cb.grabOutput(True) + probs = None ++retry = 0 + try: + probs = ts.run(cb, None) + finally: + del getTS.ts + cb.grabOutput(False) ++if probs and sysconf.has(attempt-install, soft=True): ++def remove_conflict(pkgNEVR): ++for key in changeset.keys(): ++if pkgNEVR == str(key): ++del changeset[key] ++del
[OE-core] [PATCH 2/3] elfutils: 0.162 - 0.163
Signed-off-by: Robert Yang liezhi.y...@windriver.com --- ...m-Silence-Werror-maybe-uninitialized-fals.patch |0 .../0001-remove-the-unneed-checking.patch |0 .../arm_backend.diff |0 .../arm_func_value.patch |0 .../arm_unwind_ret_mask.patch |0 .../fixheadercheck.patch |0 .../hppa_backend.diff |0 .../m68k_backend.diff |0 .../mips_backend.diff |0 .../mips_readelf_w.patch |0 .../non_linux.patch|0 .../redhat-portability.diff|0 .../scanf-format.patch |0 .../testsuite-ignore-elflint.diff |0 .../uclibc-support-for-elfutils-0.161.patch|0 .../{elfutils_0.162.bb = elfutils_0.163.bb} |4 ++-- 16 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/0001-remove-the-unneed-checking.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/arm_backend.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/arm_func_value.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/arm_unwind_ret_mask.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/fixheadercheck.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/hppa_backend.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/m68k_backend.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/mips_backend.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/mips_readelf_w.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/non_linux.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/redhat-portability.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/scanf-format.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/testsuite-ignore-elflint.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/uclibc-support-for-elfutils-0.161.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils_0.162.bb = elfutils_0.163.bb} (95%) diff --git a/meta/recipes-devtools/elfutils/elfutils-0.162/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch b/meta/recipes-devtools/elfutils/elfutils-0.163/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch similarity index 100% rename from meta/recipes-devtools/elfutils/elfutils-0.162/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch rename to meta/recipes-devtools/elfutils/elfutils-0.163/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch diff --git a/meta/recipes-devtools/elfutils/elfutils-0.162/0001-remove-the-unneed-checking.patch b/meta/recipes-devtools/elfutils/elfutils-0.163/0001-remove-the-unneed-checking.patch similarity index 100% rename from meta/recipes-devtools/elfutils/elfutils-0.162/0001-remove-the-unneed-checking.patch rename to meta/recipes-devtools/elfutils/elfutils-0.163/0001-remove-the-unneed-checking.patch diff --git a/meta/recipes-devtools/elfutils/elfutils-0.162/arm_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.163/arm_backend.diff similarity index 100% rename from meta/recipes-devtools/elfutils/elfutils-0.162/arm_backend.diff rename to meta/recipes-devtools/elfutils/elfutils-0.163/arm_backend.diff diff --git a/meta/recipes-devtools/elfutils/elfutils-0.162/arm_func_value.patch b/meta/recipes-devtools/elfutils/elfutils-0.163/arm_func_value.patch similarity index 100% rename from meta/recipes-devtools/elfutils/elfutils-0.162/arm_func_value.patch rename to meta/recipes-devtools/elfutils/elfutils-0.163/arm_func_value.patch diff --git a/meta/recipes-devtools/elfutils/elfutils-0.162/arm_unwind_ret_mask.patch b/meta/recipes-devtools/elfutils/elfutils-0.163/arm_unwind_ret_mask.patch similarity index 100% rename from meta/recipes-devtools/elfutils/elfutils-0.162/arm_unwind_ret_mask.patch rename to meta/recipes-devtools/elfutils/elfutils-0.163/arm_unwind_ret_mask.patch diff --git a/meta/recipes-devtools/elfutils/elfutils-0.162/fixheadercheck.patch b/meta/recipes-devtools/elfutils/elfutils-0.163/fixheadercheck.patch similarity index 100% rename from meta/recipes-devtools/elfutils/elfutils-0.162/fixheadercheck.patch rename to meta/recipes-devtools/elfutils/elfutils-0.163/fixheadercheck.patch diff --git
[OE-core] [PATCH 1/3] less: 471 - 478
* Remove backport patch 0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch. * The LICENSE's checksum changed because of year changed, the contents are the same. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- ...ossible-buffer-overrun-with-invalid-UTF-8.patch | 49 .../less/{less_471.bb = less_478.bb} |7 ++- 2 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 meta/recipes-extended/less/less/0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch rename meta/recipes-extended/less/{less_471.bb = less_478.bb} (78%) diff --git a/meta/recipes-extended/less/less/0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch b/meta/recipes-extended/less/less/0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch deleted file mode 100644 index 455eafc..000 --- a/meta/recipes-extended/less/less/0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e0a1add063a657b98611c94debb3631b8ffa36fe Mon Sep 17 00:00:00 2001 -From: Junling Zheng zhengjunl...@huawei.com -Date: Fri, 24 Apr 2015 11:24:04 +0800 -Subject: [PATCH] Fix possible buffer overrun with invalid UTF-8 - -An out of bounds read access in the UTF-8 decoding can be triggered with -a malformed file in the tool less. The access happens in the function -is_utf8_well_formed due to a truncated multibyte character in the sample -file. - -The bug does not crash less, it can only be made visible by running less -with valgrind or compiling it with Address Sanitizer. - -Version 475 of less contains a fix for this issue. The file version.c -contains some entry mentioning this issue (without any credit): - - - v475 3/2/15 Fix possible buffer overrun with invalid UTF-8 - -The fix is in the file line.c. We derive this patch from: - -https://blog.fuzzing-project.org/3-less-out-of-bounds-read-access-TFPA-0022014.html - -Thank Claire Robinson for validating it on Mageia 4 i586. Refer to: - -https://bugs.mageia.org/show_bug.cgi?id=15567 - -Upstream Status: Backported - -Signed-off-by: Junling Zheng zhengjunl...@huawei.com - line.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/line.c b/line.c -index 89495a3..474be2c 100644 a/line.c -+++ b/line.c -@@ -807,7 +807,7 @@ pappend(c, pos) - mbc_buf[mbc_buf_index++] = c; - if (mbc_buf_index mbc_buf_len) - return (0); -- if (is_utf8_well_formed(mbc_buf)) -+ if (is_utf8_well_formed(mbc_buf, mbc_buf_index)) - r = do_append(get_wchar(mbc_buf), mbc_buf, mbc_pos); - else - /* Complete, but not shortest form, sequence. */ --- -1.9.1 - diff --git a/meta/recipes-extended/less/less_471.bb b/meta/recipes-extended/less/less_478.bb similarity index 78% rename from meta/recipes-extended/less/less_471.bb rename to meta/recipes-extended/less/less_478.bb index 72d2562..fc63774 100644 --- a/meta/recipes-extended/less/less_471.bb +++ b/meta/recipes-extended/less/less_478.bb @@ -21,15 +21,14 @@ SECTION = console/utils LICENSE = GPLv3+ | BSD-2-Clause LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ -file://LICENSE;md5=866cc220f330b04ae4661fc3cdfedea7 +file://LICENSE;md5=48c26a307f91af700e1f00585f215aaf DEPENDS = ncurses SRC_URI = http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \ - file://0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch \ -SRC_URI[md5sum] = 9a40d29a2d84b41f9f36d7dd90b4f950 -SRC_URI[sha256sum] = 37f613fa9a526378788d790a92217d59b523574cf7159f6538da8564b3fb27f8 +SRC_URI[md5sum] = 934fcc9f137b9ef66a943c224f413d39 +SRC_URI[sha256sum] = 495c7df52199a0c7e6bfbbe7697b2b54f4bf197c8b10b43957762d74483574ce inherit autotools update-alternatives -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] Upgrade smartpm, less and elfutils
Tested world core-image-sato core-image-sato-sdk build on: qemux86 qemux86-64 qemuarm qemuarm64 qemuppc qemumpis Also tested core-image-sato on rpm_4.11.2. // Robert The following changes since commit df6ddc4bf9795212fda87f9d401893eb254074da: file: fix long-options (2015-07-07 23:57:14 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/PU http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/PU Robert Yang (3): less: 471 - 478 elfutils: 0.162 - 0.163 python-smartpm: 1.4.1 - 1.5 ...m-Silence-Werror-maybe-uninitialized-fals.patch |0 .../0001-remove-the-unneed-checking.patch |0 .../arm_backend.diff |0 .../arm_func_value.patch |0 .../arm_unwind_ret_mask.patch |0 .../fixheadercheck.patch |0 .../hppa_backend.diff |0 .../m68k_backend.diff |0 .../mips_backend.diff |0 .../mips_readelf_w.patch |0 .../non_linux.patch|0 .../redhat-portability.diff|0 .../scanf-format.patch |0 .../testsuite-ignore-elflint.diff |0 .../uclibc-support-for-elfutils-0.161.patch|0 .../{elfutils_0.162.bb = elfutils_0.163.bb} |4 +- .../python/python-smartpm/smart-attempt.patch | 164 ++- .../smart-config-ignore-all-recommends.patch | 24 - .../python-smartpm/smart-conflict-provider.patch | 196 .../python/python-smartpm/smart-dflags.patch | 45 - .../python-smartpm/smart-filename-NAME_MAX.patch | 35 - .../smart-flag-exclude-packages.patch | 70 -- .../smart-flag-ignore-recommends.patch | 60 -- .../smart-improve-error-reporting.patch| 168 +--- .../python-smartpm/smart-metadata-match.patch | 28 - .../python-smartpm/smart-multilib-fixes.patch | 22 - .../python/python-smartpm/smart-recommends.patch | 1051 +--- .../python-smartpm/smart-rpm-extra-macros.patch| 27 - .../python/python-smartpm/smart-rpm-md-parse.patch | 26 - .../python/python-smartpm/smart-rpm-root.patch | 80 -- .../python/python-smartpm/smart-tmpdir.patch | 30 - .../python/python-smartpm/smart-yaml-error.patch | 86 -- .../python/python-smartpm/smartpm-rpm5-nodig.patch | 47 +- .../python/python-smartpm_1.4.1.bb | 23 +- ...ossible-buffer-overrun-with-invalid-UTF-8.patch | 49 - .../less/{less_471.bb = less_478.bb} |7 +- 36 files changed, 137 insertions(+), 2105 deletions(-) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/0001-remove-the-unneed-checking.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/arm_backend.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/arm_func_value.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/arm_unwind_ret_mask.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/fixheadercheck.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/hppa_backend.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/m68k_backend.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/mips_backend.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/mips_readelf_w.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/non_linux.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/redhat-portability.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/scanf-format.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/testsuite-ignore-elflint.diff (100%) rename meta/recipes-devtools/elfutils/{elfutils-0.162 = elfutils-0.163}/uclibc-support-for-elfutils-0.161.patch (100%) rename meta/recipes-devtools/elfutils/{elfutils_0.162.bb = elfutils_0.163.bb} (95%) delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-config-ignore-all-recommends.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-conflict-provider.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-dflags.patch delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-filename-NAME_MAX.patch delete mode 100644
[OE-core] [PATCH] i2c-tools: uprev to 3.1.2
The only changes based on the CHANGES file are: decode-dimms: Fix DDR3 extended temp range refresh rate decoding py-smbus: Add support for python 3 The python3 changes use python3 as the default and 2 as the fallback. py-smbus is not currently built so no python changes have been made. The local copy of Module.mk is unchanged aside from moving it to a directory that is not version specific to avoid uprev noise. Signed-off-by: Randy MacLeod randy.macl...@windriver.com --- meta/recipes-devtools/i2c-tools/{i2c-tools-3.1.1 = files}/Module.mk | 0 .../i2c-tools/{i2c-tools_3.1.1.bb = i2c-tools_3.1.2.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/i2c-tools/{i2c-tools-3.1.1 = files}/Module.mk (100%) rename meta/recipes-devtools/i2c-tools/{i2c-tools_3.1.1.bb = i2c-tools_3.1.2.bb} (87%) diff --git a/meta/recipes-devtools/i2c-tools/i2c-tools-3.1.1/Module.mk b/meta/recipes-devtools/i2c-tools/files/Module.mk similarity index 100% rename from meta/recipes-devtools/i2c-tools/i2c-tools-3.1.1/Module.mk rename to meta/recipes-devtools/i2c-tools/files/Module.mk diff --git a/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.1.bb b/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb similarity index 87% rename from meta/recipes-devtools/i2c-tools/i2c-tools_3.1.1.bb rename to meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb index 71c98a4..92f4d69 100644 --- a/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.1.bb +++ b/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe SRC_URI = http://dl.lm-sensors.org/i2c-tools/releases/${BP}.tar.bz2 \ file://Module.mk \ -SRC_URI[md5sum] = 0fdbff53ebd0b8d9249256d6c56480b1 -SRC_URI[sha256sum] = 14d4d7d60d1c12e43f2befe239c682a5c44c27682f153d4b58c1e392d2db1700 +SRC_URI[md5sum] = 7104a1043d11a5e2c7b131614eb1b962 +SRC_URI[sha256sum] = db5e69f2e2a6e3aa2ecdfe6a5f490b149c504468770f58921c8c5b8a7860a441 inherit autotools-brokensep -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Fix packet discards HTTP redirect.
On 07/08/2015 10:12 PM, Burton, Ross wrote: As per our commit guidelines, the commit message needs to start with the name of the recipe that was modified. Fixed it, please refer to: [OE-core] [PATCH v2] apr: Fix packet discards HTTP redirect Thanks Wenzong Ross On 8 July 2015 at 08:32, wenzong@windriver.com mailto:wenzong@windriver.com wrote: From: Li Wang li.w...@windriver.com mailto:li.w...@windriver.com Disconnect the connection by poll() timeout. If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then apr_socket_recv() returns EAGAIN. Signed-off-by: Noriaki Yoshitane yoshitane@cnt.ncos.nec.co.jp mailto:yoshitane@cnt.ncos.nec.co.jp Signed-off-by: Li Wang li.w...@windriver.com mailto:li.w...@windriver.com --- .../apr/Fix-packet-discards-HTTP-redirect.patch| 32 ++ meta/recipes-support/apr/apr_1.5.2.bb http://apr_1.5.2.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch diff --git a/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch b/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch new file mode 100644 index 000..6805b8b --- /dev/null +++ b/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch @@ -0,0 +1,32 @@ +Fix packet discards HTTP redirect. + +Disconnect the connection by poll() timeout. +If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then +apr_socket_recv() returns EAGAIN. + +Upstream-Status: Pending + +Signed-off-by: Noriaki Yoshitane yoshitane@cnt.ncos.nec.co.jp mailto:yoshitane@cnt.ncos.nec.co.jp +Signed-off-by: Li Wang li.w...@windriver.com mailto:li.w...@windriver.com +--- + network_io/unix/sendrecv.c |4 + 1 file changed, 4 insertions(+) + +diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c +index c133a26..e8faf15 100644 +--- a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c +@@ -85,6 +85,10 @@ apr_status_t apr_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len) +(sock-timeout 0)) { + do_select: + arv = apr_wait_for_io_or_timeout(NULL, sock, 1); ++if ((arv == APR_TIMEUP) (sock-timeout == 0)) { ++*len = 0; ++return EAGAIN; ++} + if (arv != APR_SUCCESS) { + *len = 0; + return arv; +-- +1.7.9.5 + diff --git a/meta/recipes-support/apr/apr_1.5.2.bb http://apr_1.5.2.bb b/meta/recipes-support/apr/apr_1.5.2.bb http://apr_1.5.2.bb index aac6276..c1f7f38 100644 --- a/meta/recipes-support/apr/apr_1.5.2.bb http://apr_1.5.2.bb +++ b/meta/recipes-support/apr/apr_1.5.2.bb http://apr_1.5.2.bb @@ -15,6 +15,7 @@ SRC_URI = ${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://configfix.patch \ file://run-ptest \ file://upgrade-and-fix-1.5.1.patch \ + file://Fix-packet-discards-HTTP-redirect.patch \ SRC_URI[md5sum] = 4e9769f3349fe11fc0a5e1b224c236aa -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org mailto: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 0/1] Fix build path in expect-dev pkg
On 2015年07月01日 11:24, Kai Kang wrote: The following changes since commit 410a6377493ebf3fa21045c390693f021149c241: bitbake: tests/data: Add new data tests (2015-06-30 09:06:35 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib kangkai/expect http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kangkai/expect Yue Tao (1): expect: replace the STAGING_INCDIR with includedir Ping? meta/recipes-devtools/expect/expect_5.45.bb | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) -- Regards, Neil | Kai Kang -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] [master][dizzy] Enable Marvel 8897 Wifi feature
From: Ng Wei Tee wei.tee...@intel.com Hi all, I would like to add hostapd and iw configuration for enabling Marvell 8897 Wifi feature. Hostapd and iw configuration were created in the recipes-connectivity layer to enable Marvell 8897 module function in AP mode and STA mode. Please review and provide feedback if any. This patch is target to merge in openembedded-core master and dizzy branch. Thanks. Regards, Wei Tee Ng Shui Lei (2): recipes-connectivity: Add hostapd configuration for enabling Marvell 8897 WiFi feature recipes-connectivity: Add iw configuration for enabling Marvell 8897 WiFi feature .../hostapd/hostapd-2.2/defconfig | 145 .../hostapd/hostapd-2.2/hostapd.service| 11 ++ meta/recipes-connectivity/hostapd/hostapd-2.2/init | 58 meta/recipes-connectivity/hostapd/hostapd_2.2.bb | 48 +++ sh-don-t-use-git-describe-for-versioning.patch | 40 ++ meta/recipes-connectivity/iw/iw_3.8.bb | 27 6 files changed, 329 insertions(+) create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/defconfig create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/hostapd.service create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/init create mode 100644 meta/recipes-connectivity/hostapd/hostapd_2.2.bb create mode 100644 meta/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch create mode 100644 meta/recipes-connectivity/iw/iw_3.8.bb -- 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/2] recipes-connectivity: Add hostapd configuration for enabling Marvell 8897 WiFi feature
From: Ng Shui Lei shui.lei...@intel.com Hostapd features was created in the recipes-connectivity layer to enable Marvell 8897 module in AP mode and STA mode. Signed-off-by: Ng Shui Lei shui.lei...@intel.com Signed-off-by: Ng Wei Tee wei.tee...@intel.com --- .../hostapd/hostapd-2.2/defconfig | 145 .../hostapd/hostapd-2.2/hostapd.service| 11 ++ meta/recipes-connectivity/hostapd/hostapd-2.2/init | 58 meta/recipes-connectivity/hostapd/hostapd_2.2.bb | 48 +++ 4 files changed, 262 insertions(+) create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/defconfig create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/hostapd.service create mode 100644 meta/recipes-connectivity/hostapd/hostapd-2.2/init create mode 100644 meta/recipes-connectivity/hostapd/hostapd_2.2.bb diff --git a/meta/recipes-connectivity/hostapd/hostapd-2.2/defconfig b/meta/recipes-connectivity/hostapd/hostapd-2.2/defconfig new file mode 100644 index 000..2789640 --- /dev/null +++ b/meta/recipes-connectivity/hostapd/hostapd-2.2/defconfig @@ -0,0 +1,145 @@ +# Example hostapd build time configuration +# +# This file lists the configuration options that are used when building the +# hostapd binary. All lines starting with # are ignored. Configuration option +# lines must be commented out complete, if they are not to be included, i.e., +# just setting VARIABLE=n is not disabling that variable. +# +# This file is included in Makefile, so variables like CFLAGS and LIBS can also +# be modified from here. In most cass, these lines should use += in order not +# to override previous values of the variables. + +# Driver interface for Host AP driver +CONFIG_DRIVER_HOSTAP=y + +# Driver interface for wired authenticator +CONFIG_DRIVER_WIRED=y + +# Driver interface for madwifi driver +#CONFIG_DRIVER_MADWIFI=y +#CFLAGS += -I../../madwifi # change to the madwifi source directory + +# Driver interface for Prism54 driver +CONFIG_DRIVER_PRISM54=y + +# Driver interface for drivers using the nl80211 kernel interface +CONFIG_DRIVER_NL80211=y +CONFIG_LIBNL32=y +# driver_nl80211.c requires a rather new libnl (version 1.1) which may not be +# shipped with your distribution yet. If that is the case, you need to build +# newer libnl version and point the hostapd build to use it. +#LIBNL=/usr/src/libnl +#CFLAGS += -I$(LIBNL)/include +#LIBS += -L$(LIBNL)/lib + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) +#CONFIG_DRIVER_BSD=y +#CFLAGS += -I/usr/local/include +#LIBS += -L/usr/local/lib + +# Driver interface for no driver (e.g., RADIUS server only) +#CONFIG_DRIVER_NONE=y + +# IEEE 802.11F/IAPP +CONFIG_IAPP=y + +# WPA2/IEEE 802.11i RSN pre-authentication +CONFIG_RSN_PREAUTH=y + +# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) +CONFIG_PEERKEY=y + +# IEEE 802.11w (management frame protection) +# This version is an experimental implementation based on IEEE 802.11w/D1.0 +# draft and is subject to change since the standard has not yet been finalized. +# Driver support is also needed for IEEE 802.11w. +#CONFIG_IEEE80211W=y + +# Integrated EAP server +CONFIG_EAP=y + +# EAP-MD5 for the integrated EAP server +CONFIG_EAP_MD5=y + +# EAP-TLS for the integrated EAP server +CONFIG_EAP_TLS=y + +# EAP-MSCHAPv2 for the integrated EAP server +CONFIG_EAP_MSCHAPV2=y + +# EAP-PEAP for the integrated EAP server +CONFIG_EAP_PEAP=y + +# EAP-GTC for the integrated EAP server +CONFIG_EAP_GTC=y + +# EAP-TTLS for the integrated EAP server +CONFIG_EAP_TTLS=y + +# EAP-SIM for the integrated EAP server +#CONFIG_EAP_SIM=y + +# EAP-AKA for the integrated EAP server +#CONFIG_EAP_AKA=y + +# EAP-AKA' for the integrated EAP server +# This requires CONFIG_EAP_AKA to be enabled, too. +#CONFIG_EAP_AKA_PRIME=y + +# EAP-PAX for the integrated EAP server +#CONFIG_EAP_PAX=y + +# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK) +#CONFIG_EAP_PSK=y + +# EAP-SAKE for the integrated EAP server +#CONFIG_EAP_SAKE=y + +# EAP-GPSK for the integrated EAP server +#CONFIG_EAP_GPSK=y +# Include support for optional SHA256 cipher suite in EAP-GPSK +#CONFIG_EAP_GPSK_SHA256=y + +# EAP-FAST for the integrated EAP server +# Note: Default OpenSSL package does not include support for all the +# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, +# the OpenSSL library must be patched (openssl-0.9.9-session-ticket.patch) +# to add the needed functions. +#CONFIG_EAP_FAST=y + +# Wi-Fi Protected Setup (WPS) +CONFIG_WPS=y +# Enable UPnP support for external WPS Registrars +#CONFIG_WPS_UPNP=y + +# EAP-IKEv2 +#CONFIG_EAP_IKEV2=y + +# Trusted Network Connect (EAP-TNC) +#CONFIG_EAP_TNC=y + +# PKCS#12 (PFX) support (used to read private key and certificate file from +# a file that usually has extension .p12 or .pfx) +CONFIG_PKCS12=y + +# RADIUS authentication server. This provides access to the integrated EAP +# server from external hosts using RADIUS.
[OE-core] [PATCH 2/2] recipes-connectivity: Add iw configuration for enabling Marvell 8897 WiFi feature
From: Ng Shui Lei shui.lei...@intel.com iw features was created in the recipes-connectivity layer to enable Marvell 8897 module in AP mode and STA mode. iw is a new nl80211 based CLI configuration utility for wireless devices. Signed-off-by: Ng Shui Lei shui.lei...@intel.com Signed-off-by: Ng Wei Tee wei.tee...@intel.com --- sh-don-t-use-git-describe-for-versioning.patch | 40 meta/recipes-connectivity/iw/iw_3.8.bb | 27 + 2 files changed, 67 insertions(+) create mode 100644 meta/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch create mode 100644 meta/recipes-connectivity/iw/iw_3.8.bb diff --git a/meta/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch b/meta/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch new file mode 100644 index 000..f4a7ee7 --- /dev/null +++ b/meta/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch @@ -0,0 +1,40 @@ +From: Koen Kooi k...@dominion.thruhere.net +Date: Tue, 29 Nov 2011 17:03:27 +0100 +Subject: [PATCH] iw: version.sh: don't use git describe for versioning + +It will detect top-level git repositories like the Angstrom setup-scripts and break. + +Upstream-status: Unknown + +Signed-off-by: Koen Kooi k...@dominion.thruhere.net +--- + version.sh | 16 +--- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/version.sh b/version.sh +index db02f0d..336ce2b 100755 +--- a/version.sh b/version.sh +@@ -3,21 +3,7 @@ + VERSION=3.8 + OUT=$1 + +-if head=`git rev-parse --verify HEAD 2/dev/null`; then +- git update-index --refresh --unmerged /dev/null +- descr=$(git describe) +- +- # on git builds check that the version number above +- # is correct... +- [ ${descr%%-*} = v$VERSION ] || exit 2 +- +- v=${descr#v} +- if git diff-index --name-only HEAD | read dummy ; then +- v=$v-dirty +- fi +-else +- v=$VERSION +-fi ++v=$VERSION + + echo '#include iw.h' $OUT + echo const char iw_version[] = \$v\; $OUT diff --git a/meta/recipes-connectivity/iw/iw_3.8.bb b/meta/recipes-connectivity/iw/iw_3.8.bb new file mode 100644 index 000..29dbcd0 --- /dev/null +++ b/meta/recipes-connectivity/iw/iw_3.8.bb @@ -0,0 +1,27 @@ +# Copyright (C) 2013 Digi International. + +SUMMARY = nl80211 based CLI configuration utility for wireless devices +DESCRIPTION = iw is a new nl80211 based CLI configuration utility for \ +wireless devices. It supports almost all new drivers that have been added \ +to the kernel recently. +HOMEPAGE = http://linuxwireless.org/en/users/Documentation/iw; +SECTION = base +LICENSE = BSD +LIC_FILES_CHKSUM = file://COPYING;md5=878618a5c4af25e9b93ef0be1a93f774 + +DEPENDS = libnl pkgconfig + +PR = ${DISTRO}.r0 + +SRC_URI = http://www.kernel.org/pub/software/network/iw/iw-${PV}.tar.bz2 \ + file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \ + + +SRC_URI[md5sum] = 618ad1106a196fb1c3d827de96da437c +SRC_URI[sha256sum] = 3dae92ca5989cbc21155941fa01907a5536da3c5f6898642440c61484fc7e0f9 + +EXTRA_OEMAKE = + +do_install() { + oe_runmake DESTDIR=${D} install +} -- 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] subversion: improve the regex of sed command of SVN_SERF_INCLUDES macro
On 2015年07月08日 18:36, Martin Jansa wrote: On Wed, Jul 08, 2015 at 05:03:40PM +0800, Kai Kang wrote: [Yocto #7474] The regex of sed command is too simple, which mangles any -D in strings, for example, a project name is My-Demo, it will be removed from the path by the sed regex, which causes a build failure. Improving it to only delete the -D behind of a space or the -D at start of a string. Seems to duplicate: commit 04554b128c358e3c10f6581fd4506764a65240b8 Author: Jose Lamego jose.a.lam...@linux.intel.com Date: Fri Jul 3 07:34:50 2015 + subversion_1.8.13.bb: Regex modified to allow '-D' in paths Thanks for pointing out it. The patch is merged by subversion upstream with replacing '[[:space:]]' with ' '. http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/serf.m4?r1=1594156r2=1689824 Regards, Kai Signed-off-by: Kai Kang kai.k...@windriver.com --- .../Improve_the_regex_of_sed_command_of.patch | 31 ++ .../subversion/subversion_1.8.13.bb| 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch b/meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch new file mode 100644 index 000..626923b --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch @@ -0,0 +1,31 @@ +Improve the regex of sed command of SVN_SERF_INCLUDES macro + +The regex of sed command is too simple, which mangles any -D +in strings, for example, a project name is My-Demo, it will +be removed from the path by the sed regex, which causes a build +failure. Improving it to only delete the -D behind of a space or +the -D at start of a string. + +Reference: + +https://bugzilla.yoctoproject.org/show_bug.cgi?id=7874 + +Upstream-Status: Submitted [http://mail-archives.apache.org/mod_mbox/subversion-dev/201507.mbox/%3C559CDA70.8030403%40windriver.com%3E] + +Signed-off-by: Paul Gortmaker paul.gortma...@windriver.com +Signed-off-by: Yue Tao yue@windriver.com +Signed-off-by: Kai Kang kai.k...@windriver.com + +diff --git a/build/ac-macros/serf.m4.old b/build/ac-macros/serf.m4 +index 885c5a1..39969c6 100644 +--- a/build/ac-macros/serf.m4.old b/build/ac-macros/serf.m4 +@@ -143,7 +143,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG, + if $PKG_CONFIG $serf_major --atleast-version=$serf_check_version; then + AC_MSG_RESULT([yes]) + serf_found=yes +- SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/-D[^ ]*//g'`] ++ SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/[[:space:]]-D[^ ]*//g' -e 's/^-D[^ ]*//g'`] + SVN_SERF_LIBS=`$PKG_CONFIG $serf_major --libs` + break + else diff --git a/meta/recipes-devtools/subversion/subversion_1.8.13.bb b/meta/recipes-devtools/subversion/subversion_1.8.13.bb index a98be67..73ace61 100644 --- a/meta/recipes-devtools/subversion/subversion_1.8.13.bb +++ b/meta/recipes-devtools/subversion/subversion_1.8.13.bb @@ -12,6 +12,7 @@ inherit gettext pythonnative SRC_URI = ${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://libtool2.patch \ file://disable_macos.patch \ + file://Improve_the_regex_of_sed_command_of.patch \ SRC_URI[md5sum] = 4413417b529d7bdf82f74e50df02e88b SRC_URI[sha256sum] = 1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579 -- 1.9.1 -- ___ 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] FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
Hi Alex Who's going to provide ongoing maintenance for all that? I would like Lei to establish himself as the maintainer (through the maintainers.inc file). Thank you. I'm very glad to do that. Cheers Lei -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Alexander Kanavin Sent: Tuesday, July 07, 2015 9:56 PM To: Burton, Ross Cc: OE-core Subject: Re: [OE-core] FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3 On 07/07/2015 04:38 PM, Burton, Ross wrote: How about renaming the recipe, so that it doesn't clash with the GPLv3 version? For example, parted1_1.8.6.bb http://parted1_1.8.6.bb. Then it can be kept outside of oe-core. As they're just version variations that would be overly complex. Dropping it in oe-core as it's a non-v3 alternative doesn't seem to be a problem to me (as there's plenty of precedent for that already). My problem is that parted 1.8.6 was released in 2007, and the recipe already carries eight patches with it (and none of them has any information about their origin). Who's going to provide ongoing maintenance for all that? I would like Lei to establish himself as the maintainer (through the maintainers.inc file). Regards, Alex -- ___ 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 V2 1/2] ovmf: Recipe taken from luv-yocto repository
On Wed, 2015-07-08 at 12:09 -0500, Leonardo Sandoval wrote: The new set of patches are failing so I will send a V3! The reason is that the ovmf source code has ^M line endings and the .patch I send does not, so when bitbake is trying to patch, there are patch errors. You probably need to tell git to preserve the line endings, see something like http://stackoverflow.com/questions/1967370/git-replacing-lf-with-crlf and other info you can find on line endings and git with google. On 07/08/2015 11:46 AM, Neri, Ricardo wrote: On Wed, 2015-07-08 at 17:34 +0100, Richard Purdie wrote: Sorry, I didn't spot this before. Does OE-Core have iasl? Does this recipe not need iasl-native in the target case too? We also have those recipes in our meta-luv layer. What does this mean? Do we need to add it also? It is not under OE-Core but I did not face any error when compiling the ovmf recipe under poky. Try disabling the meta-luv layer, then run a build. OE-Core should not depend on meta-luv. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] kernel-yocto: fix machine_srcrev check in do_patch
The following changes since commit 0aaa67a790ab211b35eed58173efa115ceb6e243: oeqa/bbtests: Fix to ensure DL_DIR is set (2015-07-08 13:09:28 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib petmab/fix_faulty_srcrev_check http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/fix_faulty_srcrev_check Petter Mabäcker (1): kernel-yocto: fix machine_srcrev check in do_patch meta/classes/kernel-yocto.bbclass | 10 ++ 1 file changed, 10 insertions(+) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] kernel-yocto: fix machine_srcrev check in do_patch
do_patch is currently doing checks with machine_srcrev without initiate it which leads to below (additional debug added): DEBUG: Executing shell function do_patch . . . + [ 0 -ne 0 ] + [ != AUTOINC ] + git rev-parse --verify ~0 fatal: Needed a single revision + git merge-base HEAD usage: git merge-base [-a|--all] commit commit... or: git merge-base [-a|--all] --octopus commit... or: git merge-base --independent commit... or: git merge-base --is-ancestor commit commit or: git merge-base --fork-point ref [commit] -a, --all output all common ancestors --octopus find ancestors for a single n-way merge --independent list revs not reachable from others --is-ancestor is the first one ancestor of the other? --fork-point find where commit forked from reflog of ref + [ = ] + set +x DEBUG: Shell function do_patch finished Only reason it works today is because 'rev-parse/merge-base' with empty machine_srcrev will result in false positive. Solve this by adding a similar non-empty check and use SRCREV as fallback as in 'do_kernel_metadata' Signed-off-by: Petter Mabäcker pet...@technux.se --- meta/classes/kernel-yocto.bbclass | 10 ++ 1 file changed, 10 insertions(+) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 6fd025e..fb14926 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -168,6 +168,16 @@ do_patch() { # check to see if the specified SRCREV is reachable from the final branch. # if it wasn't something wrong has happened, and we should error. + machine_srcrev=${SRCREV_machine} + if [ -z ${machine_srcrev} ]; then + # fallback to SRCREV if a non machine_meta tree is being built + machine_srcrev=${SRCREV} + # if SRCREV cannot be reached something is wrong. + if [ -z ${machine_srcrev} ]; then + bbfatal Neither SRCREV_machine or SRCREV was specified! + fi + fi + if [ ${machine_srcrev} != AUTOINC ]; then if ! [ $(git rev-parse --verify ${machine_srcrev}~0) = $(git merge-base ${machine_srcrev} HEAD) ]; then bberror SRCREV ${machine_srcrev} was specified, but is not reachable -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core