[OE-core] [PATCH] python-ptyprocess: BBCLASSEXTEND to native
From: Ming Liu
Some developers might need it.
Signed-off-by: Ming Liu
---
meta/recipes-devtools/python/python-ptyprocess_0.5.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/python/python-ptyprocess_0.5.1.bb
b/meta/recipes-devtools/python/python-ptyprocess_0.5.1.bb
index 931e5a7..eed24ad 100644
--- a/meta/recipes-devtools/python/python-ptyprocess_0.5.1.bb
+++ b/meta/recipes-devtools/python/python-ptyprocess_0.5.1.bb
@@ -20,4 +20,4 @@ RDEPENDS_${PN} = "\
python-core \
"
-BBCLASSEXTEND = "nativesdk"
+BBCLASSEXTEND = "native nativesdk"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 01/25] bitbake.conf: support for merged usr with DISTRO_FEATURE usrmerge
From: Joshua Lock
Modify bindir, libdir and sbindir to be exec_prefix/$d, rather than
base_prefix/$d, when the usrmerge DISTRO_FEATURE is enabled.
Signed-off-by: Joshua Lock
---
meta/conf/bitbake.conf | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index e421650..c5beb77 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -18,10 +18,14 @@ export prefix = "/usr"
export exec_prefix = "${prefix}"
# Base paths
-export base_bindir = "${base_prefix}/bin"
-export base_sbindir = "${base_prefix}/sbin"
-export base_libdir = "${base_prefix}/${baselib}"
-export nonarch_base_libdir = "${base_prefix}/lib"
+bin = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${exec_prefix}/bin', '${base_prefix}/bin', d)}"
+sbin = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${exec_prefix}/sbin', '${base_prefix}/sbin', d)}"
+lib = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${exec_prefix}/${baselib}', '${base_prefix}/${baselib}', d)}"
+nonarch_lib = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${exec_prefix}/lib', '${base_prefix}/lib', d)}"
+export base_bindir = "${bin}"
+export base_sbindir = "${sbin}"
+export base_libdir = "${lib}"
+export nonarch_base_libdir = "${nonarch_lib}"
# Architecture independent paths
export sysconfdir = "${base_prefix}/etc"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python-pexpect: BBCLASSEXTEND to native
From: Ming Liu
Some developers might need it.
Signed-off-by: Ming Liu
---
meta/recipes-devtools/python/python-pexpect_4.2.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/python/python-pexpect_4.2.1.bb
b/meta/recipes-devtools/python/python-pexpect_4.2.1.bb
index 95a0790..1321797 100644
--- a/meta/recipes-devtools/python/python-pexpect_4.2.1.bb
+++ b/meta/recipes-devtools/python/python-pexpect_4.2.1.bb
@@ -25,4 +25,4 @@ RDEPENDS_${PN} = "\
python-ptyprocess \
"
-BBCLASSEXTEND = "nativesdk"
+BBCLASSEXTEND = "native nativesdk"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 03/25] cross.bbclass: merged /usr support
When 'usrmerge' distro feature enabled match target_base_libdir to
${target_libdir}.
Signed-off-by: Amarnath Valluri
---
meta/classes/cross.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 2602153..c8ef3a5 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -48,8 +48,8 @@ SSTATE_SCAN_CMD ?= "${SSTATE_SCAN_CMD_NATIVE}"
target_base_prefix := "${base_prefix}"
target_prefix := "${prefix}"
target_exec_prefix := "${exec_prefix}"
-target_base_libdir = "${target_base_prefix}/${baselib}"
target_libdir = "${target_exec_prefix}/${baselib}"
+target_base_libdir = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${target_libdir}', '${target_base_prefix}/${baselib}', d)}"
target_includedir := "${includedir}"
# Overrides for paths
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 04/25] base-files: Replace hardcoded root paths with appropriate bitbake variables
/bin, /sbin, /lib are replaced with ${base_bindir}, ${base_sbindir} and
${base_libdir}.
Signed-off-by: Amarnath Valluri
---
meta/recipes-core/base-files/base-files_3.0.14.bb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb
b/meta/recipes-core/base-files/base-files_3.0.14.bb
index d138005..35744f4 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -32,8 +32,9 @@ INHIBIT_DEFAULT_DEPS = "1"
docdir_append = "/${P}"
dirs1777 = "/tmp ${localstatedir}/volatile/tmp"
dirs2775 = ""
-dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
- ${sysconfdir}/skel /lib /mnt /proc ${ROOT_HOME} /run /sbin \
+dirs755 = "/boot /dev ${base_bindir} ${base_sbindir} ${base_libdir} \
+ ${sysconfdir} ${sysconfdir}/default \
+ ${sysconfdir}/skel ${nonarch_base_libdir} /mnt /proc ${ROOT_HOME}
/run \
${prefix} ${bindir} ${docdir} /usr/games ${includedir} \
${libdir} ${sbindir} ${datadir} \
${datadir}/common-licenses ${datadir}/dict ${infodir} \
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 02/25] bitbake.conf: Modify nativesdk variables to support 'usrmerge' DISTRO_FEATURE
Modify base bin, sbin, and lib nativesdk variables to be ${prefix_nativesdk}/$d,
when the usrmerge DISTRO_FEATURE is enabled.
Signed-off-by: Amarnath Valluri
---
meta/conf/bitbake.conf | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c5beb77..ecff034 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -67,11 +67,11 @@ bindir_crossscripts = "${bindir}/crossscripts"
prefix_nativesdk = "/usr"
bindir_nativesdk = "${prefix_nativesdk}/bin"
sbindir_nativesdk = "${prefix_nativesdk}/sbin"
-base_bindir_nativesdk = "/bin"
-base_sbindir_nativesdk = "/sbin"
-includedir_nativesdk = "${prefix_nativesdk}/include"
libdir_nativesdk = "${prefix_nativesdk}/lib"
-base_libdir_nativesdk = "/lib"
+base_bindir_nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${bindir_nativesdk}', '/bin', d)}"
+base_sbindir_nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${sbindir_nativesdk}', '/sbin', d)}"
+base_libdir_nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${libdir_nativesdk}', '/lib', d)}"
+includedir_nativesdk = "${prefix_nativesdk}/include"
localstatedir_nativesdk = "/var"
#
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 05/25] systemd: chagnes to support merged /usr
When the usrmerge DISTRO_FEATURE is selected disable the split-usr
support and modify rootprefix to be exec_prefix, rather than base_prefix.
Signed-off-by: Amarnath Valluri
---
meta/recipes-core/systemd/systemd_232.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_232.bb
b/meta/recipes-core/systemd/systemd_232.bb
index cc8781e..bf0fadc 100644
--- a/meta/recipes-core/systemd/systemd_232.bb
+++ b/meta/recipes-core/systemd/systemd_232.bb
@@ -131,7 +131,7 @@ CACHED_CONFIGUREVARS +=
"ac_cv_path_SULOGIN=${base_sbindir}/sulogin"
# Helper variables to clarify locations. This mirrors the logic in systemd's
# build system.
-rootprefix ?= "${base_prefix}"
+rootprefix ?= "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${exec_prefix}', '${base_prefix}', d)}"
rootlibdir ?= "${base_libdir}"
rootlibexecdir = "${rootprefix}/lib"
@@ -149,10 +149,10 @@ CACHED_CONFIGUREVARS_class-target = "\
EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
--with-rootlibdir=${rootlibdir} \
--with-roothomedir=${ROOT_HOME} \
- --enable-split-usr \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'--disable-split-usr', '--enable-split-usr', d)} \
--without-python \
--with-sysvrcnd-path=${sysconfdir} \
- --with-firmware-path=/lib/firmware \
+ --with-firmware-path=${nonarch_base_libdir}/firmware \
--with-testdir=${PTEST_PATH} \
"
# per the systemd README, define VALGRIND=1 to run under valgrind
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 06/25] bash: changes to support merged /usr
Most of shell scripts refer to '#!/bin/{sh,bash}' inside the script. But when
'usrmege' feature is enabled this path will be /usr/bin/{sh, bash}.
so to satisify build dependency add '/bin/{sh,bash}' to its providers list.
Signed-off-by: Amarnath Valluri
---
meta/recipes-extended/bash/bash.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-extended/bash/bash.inc
b/meta/recipes-extended/bash/bash.inc
index a05b987..0f0d679 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -65,3 +65,5 @@ pkg_postinst_${PN} () {
pkg_postrm_${PN} () {
printf "$(grep -v "^${base_bindir}/bash$" $D${sysconfdir}/shells)\n" >
$D${sysconfdir}/shells
}
+
+RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'/bin/sh /bin/bash', '', d)}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 07/25] busybox: changes to support merged /usr
Most of the shell scripts refer to /bin/sh inside the script. When 'usrmege'
feature is enabled, this path would be /usr/bin/sh. Hence, to satisfy build
dependency add '/bin/sh' to it's providers list.
Signed-off-by: Amarnath Valluri
---
meta/recipes-core/busybox/busybox.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-core/busybox/busybox.inc
b/meta/recipes-core/busybox/busybox.inc
index 34f4e25..61d17e4 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -431,3 +431,5 @@ pkg_prerm_${PN}-syslog () {
fi
fi
}
+
+RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'/bin/sh', '', d)}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 08/25] sed: changes to support merged /usr
Few of the perl scripts referring '#!/bin/sed' inside the script. But when
'usrmerge' feature is enabled this path would be /usr/bin/sed. So to satisfy
build dependency add '/bin/sed' to it's providers list.
Signed-off-by: Amarnath Valluri
---
meta/recipes-extended/sed/sed_4.2.2.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb
b/meta/recipes-extended/sed/sed_4.2.2.bb
index 5aa7d8a..e31bec2 100644
--- a/meta/recipes-extended/sed/sed_4.2.2.bb
+++ b/meta/recipes-extended/sed/sed_4.2.2.bb
@@ -44,3 +44,4 @@ do_install_ptest() {
oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B}
DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR}
}
+RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'/bin/sed', '', d)}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 09/25] musl: Fix issues in relative symlink creation
Make use of lnr/ln -r while creating relative symlinks than guessing the
relalive path.
Signed-off-by: Amarnath Valluri
---
...dynamic-linker-a-relative-symlink-to-libc.patch | 62 ++
meta/recipes-core/musl/musl_git.bb | 2 +-
2 files changed, 53 insertions(+), 11 deletions(-)
diff --git
a/meta/recipes-core/musl/files/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
b/meta/recipes-core/musl/files/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
index 5490b1c..462d338 100644
---
a/meta/recipes-core/musl/files/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
+++
b/meta/recipes-core/musl/files/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
@@ -1,6 +1,6 @@
-From 94c0b97b62125d8bbc92dce0694e387d5b2ad181 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Sun, 10 Jan 2016 12:14:02 -0800
+From 0ec74744a4cba7c5fdfaa2685995119a4fca0260 Mon Sep 17 00:00:00 2001
+From: Amarnath Valluri
+Date: Wed, 18 Jan 2017 16:14:37 +0200
Subject: [PATCH] Make dynamic linker a relative symlink to libc
absolute symlink into $(libdir) fails to load in a cross build
@@ -9,26 +9,68 @@ applications, which cross build systems often do, since not
everything
can be computed during cross builds, qemu in usermode often comes to aid
in such situations to feed into cross builds.
+V2:
+ Make use of 'ln -r' to create relative symlinks, as most fo the distros
+ shipping coreutils 8.16+
+
Signed-off-by: Khem Raj
+Signed-off-by: Amarnath Valluri
---
Upstream-Status: Pending
-
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+---
+ Makefile | 2 +-
+ tools/install.sh | 8 +---
+ 2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
-index b2226fa..0d71f7f 100644
+index 8246b78..d1dbe39 100644
--- a/Makefile
+++ b/Makefile
-@@ -189,7 +189,7 @@ $(DESTDIR)$(includedir)/%: include/%
+@@ -215,7 +215,7 @@ $(DESTDIR)$(includedir)/%: $(srcdir)/include/%
$(INSTALL) -D -m 644 $< $@
$(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so
- $(INSTALL) -D -l $(libdir)/libc.so $@ || true
-+ $(INSTALL) -D -l ..$(libdir)/libc.so $@ || true
++ $(INSTALL) -D -r $(DESTDIR)$(libdir)/libc.so $@ || true
install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(if
$(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),)
+diff --git a/tools/install.sh b/tools/install.sh
+index d913b60..b6a7f79 100755
+--- a/tools/install.sh
b/tools/install.sh
+@@ -6,18 +6,20 @@
+ #
+
+ usage() {
+-printf "usage: %s [-D] [-l] [-m mode] src dest\n" "$0" 1>&2
++printf "usage: %s [-D] [-l] [-r] [-m mode] src dest\n" "$0" 1>&2
+ exit 1
+ }
+
+ mkdirp=
+ symlink=
++symlinkflags="-s"
+ mode=755
+
+-while getopts Dlm: name ; do
++while getopts Dlrm: name ; do
+ case "$name" in
+ D) mkdirp=yes ;;
+ l) symlink=yes ;;
++r) symlink=yes; symlinkflags="$symlinkflags -r" ;;
+ m) mode=$OPTARG ;;
+ ?) usage ;;
+ esac
+@@ -48,7 +50,7 @@ trap 'rm -f "$tmp"' EXIT INT QUIT TERM HUP
+ umask 077
+
+ if test "$symlink" ; then
+-ln -s "$1" "$tmp"
++ln $symlinkflags "$1" "$tmp"
+ else
+ cat < "$1" > "$tmp"
+ chmod "$mode" "$tmp"
--
-2.7.0
+2.7.4
diff --git a/meta/recipes-core/musl/musl_git.bb
b/meta/recipes-core/musl/musl_git.bb
index e9b9fef..5775184 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -49,7 +49,7 @@ do_install() {
oe_runmake install DESTDIR='${D}'
install -d ${D}${bindir}
- ln -s ../../${libdir}/libc.so ${D}${bindir}/ldd
+ lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd
for l in crypt dl m pthread resolv rt util xnet
do
ln -s libc.so ${D}${libdir}/lib$l.so
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 10/25] glibc: Ensure ldconfig is packaged into glibc
From: Jussi Kukkonen
If "usrmerge" feature is used, /usr/sbin/ldconfig gets packaged into
glibc-utils instead of glibc: Switch PACKAGES order to prevent this.
Signed-off-by: Jussi Kukkonen
---
meta/recipes-core/glibc/glibc-package.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/glibc/glibc-package.inc
b/meta/recipes-core/glibc/glibc-package.inc
index f0fc9c1..6aca2db 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -19,7 +19,7 @@ USE_LDCONFIG ?= "1"
INHIBIT_SYSROOT_STRIP = "1"
-PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode ${PN}-utils
glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile
libsotruss ${PN} glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc"
+PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic
libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils
glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc"
# The ld.so in this glibc supports the GNU_HASH
RPROVIDES_${PN} = "eglibc rtld(GNU_HASH)"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 12/25] attr/acl: Do not create broken static library link when not needed
Stop creating the static library archieve(liba(ttr|cl).a) when --disable-static configure option used. Signed-off-by: Amarnath Valluri --- meta/recipes-support/attr/ea-acl.inc | 2 + ...gure-option-to-enable-disable-static-libr.patch | 70 ++ 2 files changed, 72 insertions(+) create mode 100644 meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc index a88ce90..c587b3c 100644 --- a/meta/recipes-support/attr/ea-acl.inc +++ b/meta/recipes-support/attr/ea-acl.inc @@ -2,6 +2,8 @@ SRC_URI += "file://relative-libdir.patch;striplevel=0 \ " +# This patch should be applied after '(attr\|acl)-Missing-configure.ac.patch' +SRC_URI_append = " file://0001-Added-configure-option-to-enable-disable-static-libr.patch" inherit autotools-brokensep gettext diff --git a/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch b/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch new file mode 100644 index 000..1c1159f --- /dev/null +++ b/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch @@ -0,0 +1,70 @@ +From 01256c61ba126449c46dd4ab5d5e145488b981fa Mon Sep 17 00:00:00 2001 +From: Amarnath Valluri +Date: Mon, 23 Jan 2017 13:25:13 +0200 +Subject: [PATCH] Added configure option to enable/disable static library + +Create static library archive only in case of --enable-static. + +Upstream-Status: Pending + +Signed-off-by: Amarnath Valluri +--- + configure.ac | 6 ++ + include/builddefs.in | 1 + + include/buildmacros | 3 +++ + 3 files changed, 10 insertions(+) + +diff --git a/configure.ac b/configure.ac +index b966d0e..e48268b 100644 +--- a/configure.ac b/configure.ac +@@ -26,6 +26,12 @@ AC_ARG_ENABLE(shared, + enable_shared=yes) + AC_SUBST(enable_shared) + ++AC_ARG_ENABLE(static, ++[ --enable-static=[yes/no] Enable use of static libraries [default=yes]],, ++ enable_static=yes) ++AC_SUBST(enable_static) ++ ++ + AC_ARG_ENABLE(gettext, + [ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, + enable_gettext=yes) +diff --git a/include/builddefs.in b/include/builddefs.in +index d9931db..3b3dbd2 100644 +--- a/include/builddefs.in b/include/builddefs.in +@@ -71,6 +71,7 @@ RPMBUILD = @rpmbuild@ + RPM_VERSION = @rpm_version@ + + ENABLE_SHARED = @enable_shared@ ++ENABLE_STATIC = @enable_static@ + ENABLE_GETTEXT= @enable_gettext@ + + HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@ +diff --git a/include/buildmacros b/include/buildmacros +index 39fa7e2..b0f25c5 100644 +--- a/include/buildmacros b/include/buildmacros +@@ -80,6 +80,7 @@ endif + # /usr/lib. + ifeq ($(ENABLE_SHARED),yes) + INSTALL_LTLIB_DEV = \ ++ set -x; \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ + ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ + ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \ +@@ -88,7 +89,9 @@ INSTALL_LTLIB_DEV = \ + ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ + if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \ + rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ ++ if test "$(ENABLE_STATIC)" = "yes" ; then \ + ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ ++ fi ;\ + ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ + rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ + ../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ +-- +2.7.4 + -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 11/25] util-linux: Fix packaging with "usrmerge"
From: Jussi Kukkonen
Make sure fsck.cramfs is packaged before fsck so the latter
does not steal the fsck.cramfs binary when building with usrmerge
DISTRO_FEATURE.
Signed-off-by: Jussi Kukkonen
---
meta/recipes-core/util-linux/util-linux.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc
b/meta/recipes-core/util-linux/util-linux.inc
index 7d948bf..ae60b0a 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -29,9 +29,9 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin
PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk
util-linux-sfdisk \
util-linux-swaponoff util-linux-losetup util-linux-umount \
util-linux-mount util-linux-readprofile util-linux-uuidd \
- util-linux-uuidgen util-linux-lscpu util-linux-fsck
util-linux-blkid \
- util-linux-mkfs util-linux-mcookie util-linux-reset
util-linux-lsblk \
- util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \
+ util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs
util-linux-fsck \
+ util-linux-blkid util-linux-mkfs util-linux-mcookie
util-linux-reset \
+ util-linux-lsblk util-linux-mkfs.cramfs util-linux-fstrim \
util-linux-partx util-linux-hwclock util-linux-mountpoint \
util-linux-findfs util-linux-getopt util-linux-sulogin
util-linux-prlimit"
PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount',
'util-linux-pylibmount', '', d)}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 13/25] systemd: Do not add libnss_* to systemd package
libnss_* files should be part of corresponding sub-packages, the split happens
by do_package_split(). By adding ${libdir}/libnss_* to FILES_${PN}, those files
endup in systemd package when ${libdir} == ${base_libdir}.
Signed-off-by: Amarnath Valluri
---
meta/recipes-core/systemd/systemd_232.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-core/systemd/systemd_232.bb
b/meta/recipes-core/systemd/systemd_232.bb
index bf0fadc..a18907a 100644
--- a/meta/recipes-core/systemd/systemd_232.bb
+++ b/meta/recipes-core/systemd/systemd_232.bb
@@ -451,7 +451,6 @@ FILES_${PN} = " ${base_bindir}/* \
${rootlibexecdir}/systemd/* \
${systemd_unitdir}/* \
${base_libdir}/security/*.so \
-${libdir}/libnss_* \
/cgroup \
${bindir}/systemd* \
${bindir}/busctl \
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 15/25] util-linux, shadow: Make 'nologin' alternative command
Both shadow and util-linux packages provides 'nologin' binary in ${base_sbindir}
and ${sbindir} respectively, this leads to conflict when 'usrmerge' feature is
enabled, where ${sbindir} == ${base_sbindir}. Hance, handle this to alternative
system to resolve the conflict.
Signed-off-by: Amarnath Valluri
---
meta/recipes-core/util-linux/util-linux.inc | 5 +++--
meta/recipes-extended/shadow/shadow.inc | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc
b/meta/recipes-core/util-linux/util-linux.inc
index 5934fb5..afc3c73 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -151,7 +151,7 @@ do_install () {
mkdir -p ${D}${base_bindir}
sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
-sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup
swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root"
+sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup
swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin"
binprogs_a="dmesg getopt kill more umount mount login reset su
mountpoint"
if [ "${base_sbindir}" != "${sbindir}" ]; then
@@ -194,7 +194,7 @@ ALTERNATIVE_PRIORITY = "80"
ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root"
ALTERNATIVE_${PN} += "hexdump last lastb logger mesg renice wall"
-ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject"
+ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject nologin"
ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
@@ -204,6 +204,7 @@ ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
+ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8
sulogin.8 utmpdump.1 reset.1 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3"
diff --git a/meta/recipes-extended/shadow/shadow.inc
b/meta/recipes-extended/shadow/shadow.inc
index 4c4db00..91b6f46 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/meta/recipes-extended/shadow/shadow.inc
@@ -170,10 +170,11 @@ inherit update-alternatives
ALTERNATIVE_PRIORITY = "200"
-ALTERNATIVE_${PN} = "passwd chfn chsh chpasswd vipw vigr"
+ALTERNATIVE_${PN} = "passwd chfn chsh chpasswd vipw vigr nologin"
ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd"
ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw"
ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr"
+ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
ALTERNATIVE_${PN}-base = "newgrp groups login su"
ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 16/25] libarchive: Backport upstream fixes.
These set of patches backported from upstream, which fixes the issues in
extracting hardlinks over softlinks while etracting packages by opkg.
Signed-off-by: Amarnath Valluri
---
...te_disk_posix.c-make-_fsobj-functions-mor.patch | 245 +
...02-Fix-extracting-hardlinks-over-symlinks.patch | 120 ++
.../libarchive/libarchive_3.2.2.bb | 2 +
3 files changed, 367 insertions(+)
create mode 100644
meta/recipes-extended/libarchive/files/0001-archive_write_disk_posix.c-make-_fsobj-functions-mor.patch
create mode 100644
meta/recipes-extended/libarchive/files/0002-Fix-extracting-hardlinks-over-symlinks.patch
diff --git
a/meta/recipes-extended/libarchive/files/0001-archive_write_disk_posix.c-make-_fsobj-functions-mor.patch
b/meta/recipes-extended/libarchive/files/0001-archive_write_disk_posix.c-make-_fsobj-functions-mor.patch
new file mode 100644
index 000..7d93142
--- /dev/null
+++
b/meta/recipes-extended/libarchive/files/0001-archive_write_disk_posix.c-make-_fsobj-functions-mor.patch
@@ -0,0 +1,245 @@
+From 90881d24d3f6d5fb207e97df3b91bbea8598e84e Mon Sep 17 00:00:00 2001
+From: Martin Matuska
+Date: Tue, 29 Nov 2016 16:47:37 +0100
+Subject: [PATCH 1/2] archive_write_disk_posix.c: make *_fsobj functions more
+ readable
+
+Upstream-Status: Backport
+
+Signed-off-by: Amarnath Valluri
+---
+ libarchive/archive_write_disk_posix.c | 121 +-
+ 1 file changed, 61 insertions(+), 60 deletions(-)
+
+diff --git a/libarchive/archive_write_disk_posix.c
b/libarchive/archive_write_disk_posix.c
+index 17c23b0..d786bc2 100644
+--- a/libarchive/archive_write_disk_posix.c
b/libarchive/archive_write_disk_posix.c
+@@ -336,6 +336,8 @@ struct archive_write_disk {
+
+ #define HFS_BLOCKS(s) ((s) >> 12)
+
++static void fsobj_error(int *, struct archive_string *, int, const char *,
++ const char *);
+ static intcheck_symlinks_fsobj(char *path, int *error_number, struct
archive_string *error_string, int flags);
+ static intcheck_symlinks(struct archive_write_disk *);
+ static intcreate_filesystem_object(struct archive_write_disk *);
+@@ -2005,8 +2007,9 @@ restore_entry(struct archive_write_disk *a)
+
+ if (en) {
+ /* Everything failed; give up here. */
+- archive_set_error(&a->archive, en, "Can't create '%s'",
+- a->name);
++ if ((&a->archive)->error == NULL)
++ archive_set_error(&a->archive, en, "Can't create '%s'",
++ a->name);
+ return (ARCHIVE_FAILED);
+ }
+
+@@ -2388,6 +2391,17 @@ current_fixup(struct archive_write_disk *a, const char
*pathname)
+ return (a->current_fixup);
+ }
+
++/* Error helper for new *_fsobj functions */
++static void
++fsobj_error(int *a_eno, struct archive_string *a_estr,
++int err, const char *errstr, const char *path)
++{
++ if (a_eno)
++ *a_eno = err;
++ if (a_estr)
++ archive_string_sprintf(a_estr, errstr, path);
++}
++
+ /*
+ * TODO: Someday, integrate this with the deep dir support; they both
+ * scan the path and both can be optimized by comparing against other
+@@ -2400,7 +2414,7 @@ current_fixup(struct archive_write_disk *a, const char
*pathname)
+ * ARCHIVE_OK if there are none, otherwise puts an error in errmsg.
+ */
+ static int
+-check_symlinks_fsobj(char *path, int *error_number, struct archive_string
*error_string, int flags)
++check_symlinks_fsobj(char *path, int *a_eno, struct archive_string *a_estr,
int flags)
+ {
+ #if !defined(HAVE_LSTAT)
+ /* Platform doesn't have lstat, so we can't look for symlinks. */
+@@ -2474,19 +2488,20 @@ check_symlinks_fsobj(char *path, int *error_number,
struct archive_string *error
+ if (errno == ENOENT) {
+ break;
+ } else {
+- /* Treat any other error as fatal - best to be
paranoid here
+- * Note: This effectively disables deep
directory
+- * support when security checks are enabled.
+- * Otherwise, very long pathnames that trigger
+- * an error here could evade the sandbox.
+- * TODO: We could do better, but it would
probably
+- * require merging the symlink checks with the
+- * deep-directory editing. */
+- if (error_number) *error_number = errno;
+- if (error_string)
+- archive_string_sprintf(error_string,
+- "Could not stat %s",
+- path);
++ /*
++ * Treat any other error as
[OE-core] [PATCH v2 14/25] util-linux: Make sure '${base_bindir}/reset' is part of util-linux-reset package.
update-alternative.bbclass might rename the 'reset' binary when LINK_NAME ==
TARGET, This is true(${base_bindir} == ${bindir}) when 'usrmerge' distro feature
is enabled. Hence, suffix with * to properly package the renamed binary.
Signed-off-by: Amarnath Valluri
util-linux
---
meta/recipes-core/util-linux/util-linux.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc
b/meta/recipes-core/util-linux/util-linux.inc
index ae60b0a..5934fb5 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -84,7 +84,7 @@ FILES_util-linux-umount = "${base_bindir}/umount.${BPN}"
FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}"
FILES_util-linux-uuidgen = "${bindir}/uuidgen"
FILES_util-linux-uuidd = "${sbindir}/uuidd"
-FILES_util-linux-reset = "${base_bindir}/reset"
+FILES_util-linux-reset = "${base_bindir}/reset*"
FILES_util-linux-partx = "${sbindir}/partx"
FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}"
FILES_util-linux-findfs = "${sbindir}/findfs"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 17/25] kernel: use ${nonarch_base_libdir} for kernel modules installation.
Replace hardcoded '/lib' in kernel modules installation path with
${nonarch_base_libdir}, which is meant exactly for this.
Signed-off-by: Amarnath Valluri
---
meta/classes/kernel-module-split.bbclass | 2 +-
meta/classes/kernel.bbclass | 14 +++---
meta/classes/module.bbclass | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/meta/classes/kernel-module-split.bbclass
b/meta/classes/kernel-module-split.bbclass
index ba9cc15..5e10dcf 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -138,7 +138,7 @@ python split_kernel_module_packages () {
postinst = d.getVar('pkg_postinst_modules')
postrm = d.getVar('pkg_postrm_modules')
-modules = do_split_packages(d, root='/lib/modules',
file_regex=module_regex, output_pattern=module_pattern, description='%s kernel
module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata,
extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION")))
+modules = do_split_packages(d, root='${nonarch_base_libdir}/modules',
file_regex=module_regex, output_pattern=module_pattern, description='%s kernel
module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata,
extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION")))
if modules:
metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE')
d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules))
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 97cba92..bb02ba5 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -297,11 +297,11 @@ kernel_do_install() {
#
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
- oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
- rm "${D}/lib/modules/${KERNEL_VERSION}/build"
- rm "${D}/lib/modules/${KERNEL_VERSION}/source"
+ oe_runmake DEPMOD=echo
MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}
INSTALL_FW_PATH=${D}${nonarch_base_libdir}/firmware modules_install
+ rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
+ rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source"
# If the kernel/ directory is empty remove it to prevent QA
issues
- rmdir --ignore-fail-on-non-empty
"${D}/lib/modules/${KERNEL_VERSION}/kernel"
+ rmdir --ignore-fail-on-non-empty
"${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel"
else
bbnote "no modules to install"
fi
@@ -479,9 +479,9 @@ EXPORT_FUNCTIONS do_compile do_install do_configure
# kernel-image becomes kernel-image-${KERNEL_VERSION}
PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev
kernel-modules"
FILES_${PN} = ""
-FILES_kernel-base = "/lib/modules/${KERNEL_VERSION}/modules.order
/lib/modules/${KERNEL_VERSION}/modules.builtin"
+FILES_kernel-base =
"${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.order
${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin"
FILES_kernel-image = ""
-FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config*
${KERNEL_SRC_PATH} /lib/modules/${KERNEL_VERSION}/build"
+FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config*
${KERNEL_SRC_PATH} ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
FILES_kernel-vmlinux = "/boot/vmlinux-${KERNEL_VERSION_NAME}"
FILES_kernel-modules = ""
RDEPENDS_kernel = "kernel-base"
@@ -512,7 +512,7 @@ pkg_postinst_kernel-base () {
PACKAGESPLITFUNCS_prepend = "split_kernel_packages "
python split_kernel_packages () {
-do_split_packages(d, root='/lib/firmware',
file_regex='^(.*)\.(bin|fw|cis|csp|dsp)$', output_pattern='kernel-firmware-%s',
description='Firmware for %s', recursive=True, extra_depends='')
+do_split_packages(d, root='${nonarch_base_libdir}/firmware',
file_regex='^(.*)\.(bin|fw|cis|csp|dsp)$', output_pattern='kernel-firmware-%s',
description='Firmware for %s', recursive=True, extra_depends='')
}
# Many scripts want to look in arch/$arch/boot for the bootable
diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
index a588873..e894c89 100644
--- a/meta/classes/module.bbclass
+++ b/meta/classes/module.bbclass
@@ -31,7 +31,7 @@ module_do_compile() {
module_do_install() {
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
- oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" \
+ oe_runmake DEPMOD=echo
MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}" \
CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
O=${STAGING_KERNEL_BUILDDIR} \
${MODULES_INSTALL_TARGET}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedde
[OE-core] [PATCH v2 19/25] mdadm: Avoid using hardocded udev, sbin paths
Use appropriate bitbake variables inplace of below hardcoded locations:
/sbin -> ${base_sbindir}
/lib/udev -> ${nonarch_base_libdir}/udev
Signed-off-by: Amarnath Valluri
---
meta/recipes-extended/mdadm/mdadm_4.0.bb | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/mdadm/mdadm_4.0.bb
b/meta/recipes-extended/mdadm/mdadm_4.0.bb
index c228899..8a77204 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.0.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.0.bb
@@ -33,7 +33,9 @@ CFLAGS_append_mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__'
CFLAGS_append_mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__'
do_compile() {
- oe_runmake SYSROOT="${STAGING_DIR_TARGET}"
+ # Point to right sbindir
+ sed -i -e 's;BINDIR = /sbin;BINDIR = $base_sbindir;' ${S}/Makefile
+ oe_runmake SYSROOT="${STAGING_DIR_TARGET}"
UDEVDIR="${nonarch_libdir}/udev"
}
do_install() {
@@ -51,7 +53,7 @@ do_install_ptest() {
cp -a ${S}/tests ${D}${PTEST_PATH}/tests
cp ${S}/test ${D}${PTEST_PATH}
sed -e 's!sleep 0.*!sleep 1!g; s!/var/tmp!/!g' -i ${D}${PTEST_PATH}/test
- ln -s /sbin/mdadm ${D}${PTEST_PATH}/mdadm
+ ln -s ${base_sbindir}/mdadm ${D}${PTEST_PATH}/mdadm
for prg in test_stripe swap_super raid6check
do
install -D -m 755 $prg ${D}${PTEST_PATH}/
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 18/25] firmware: use ${nonarch_base_libdir} for firmware installation.
Replace hardcoded '/lib' in kernel firmware installation path with
${nonarch_base_libdir}.
Signed-off-by: Amarnath Valluri
---
.../linux-firmware/linux-firmware_git.bb | 168 ++---
1 file changed, 84 insertions(+), 84 deletions(-)
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 0aba740..5a74a57 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -195,27 +195,27 @@ do_compile() {
}
do_install() {
- install -d ${D}/lib/firmware/
- cp -r * ${D}/lib/firmware/
+ install -d ${D}${nonarch_base_libdir}/firmware/
+ cp -r * ${D}${nonarch_base_libdir}/firmware/
# Avoid Makefile to be deployed
- rm ${D}/lib/firmware/Makefile
+ rm ${D}${nonarch_base_libdir}/firmware/Makefile
# Remove unbuild firmware which needs cmake and bash
- rm ${D}/lib/firmware/carl9170fw -rf
+ rm ${D}${nonarch_base_libdir}/firmware/carl9170fw -rf
# Remove pointless bash script
- rm ${D}/lib/firmware/configure
+ rm ${D}${nonarch_base_libdir}/firmware/configure
# Libertas sd8686
- ln -sf libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin
- ln -sf libertas/sd8686_v9_helper.bin ${D}/lib/firmware/sd8686_helper.bin
+ ln -sf libertas/sd8686_v9.bin
${D}${nonarch_base_libdir}/firmware/sd8686.bin
+ ln -sf libertas/sd8686_v9_helper.bin
${D}${nonarch_base_libdir}/firmware/sd8686_helper.bin
# fixup wl12xx location, after 2.6.37 the kernel searches a different
location for it
- ( cd ${D}/lib/firmware ; ln -sf ti-connectivity/* . )
+ ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . )
# Copy the iwlwifi ucode
-cp ${WORKDIR}/iwlwifi-8000C-19.ucode ${D}/lib/firmware/
+cp ${WORKDIR}/iwlwifi-8000C-19.ucode
${D}${nonarch_base_libdir}/firmware/
}
@@ -252,23 +252,23 @@ LICENSE_${PN}-ath6k = "Firmware-atheros_firmware"
LICENSE_${PN}-ath9k = "Firmware-atheros_firmware"
LICENSE_${PN}-atheros-license = "Firmware-atheros_firmware"
-FILES_${PN}-atheros-license = "/lib/firmware/LICENCE.atheros_firmware"
+FILES_${PN}-atheros-license =
"${nonarch_base_libdir}/firmware/LICENCE.atheros_firmware"
FILES_${PN}-ar9170 = " \
- /lib/firmware/ar9170*.fw \
+ ${nonarch_base_libdir}/firmware/ar9170*.fw \
"
FILES_${PN}-carl9170 = " \
- /lib/firmware/carl9170*.fw \
+ ${nonarch_base_libdir}/firmware/carl9170*.fw \
"
FILES_${PN}-ath6k = " \
- /lib/firmware/ath6k \
+ ${nonarch_base_libdir}/firmware/ath6k \
"
FILES_${PN}-ath9k = " \
- /lib/firmware/ar9271.fw \
- /lib/firmware/ar7010*.fw \
- /lib/firmware/htc_9271.fw \
- /lib/firmware/htc_7010.fw \
- /lib/firmware/ath9k_htc/htc_7010-1.4.0.fw \
- /lib/firmware/ath9k_htc/htc_9271-1.4.0.fw \
+ ${nonarch_base_libdir}/firmware/ar9271.fw \
+ ${nonarch_base_libdir}/firmware/ar7010*.fw \
+ ${nonarch_base_libdir}/firmware/htc_9271.fw \
+ ${nonarch_base_libdir}/firmware/htc_7010.fw \
+ ${nonarch_base_libdir}/firmware/ath9k_htc/htc_7010-1.4.0.fw \
+ ${nonarch_base_libdir}/firmware/ath9k_htc/htc_9271-1.4.0.fw \
"
RDEPENDS_${PN}-ar9170 += "${PN}-atheros-license"
@@ -282,14 +282,14 @@ LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k"
LICENSE_${PN}-ath10k = "Firmware-qualcommAthos_ath10k"
LICENSE_${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k"
-FILES_${PN}-ar3k-license = "/lib/firmware/LICENSE.QualcommAtheros_ar3k"
+FILES_${PN}-ar3k-license =
"${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ar3k"
FILES_${PN}-ar3k = " \
- /lib/firmware/ar3k \
+ ${nonarch_base_libdir}/firmware/ar3k \
"
-FILES_${PN}-ath10k-license = "/lib/firmware/LICENSE.QualcommAtheros_ath10k"
+FILES_${PN}-ath10k-license =
"${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ath10k"
FILES_${PN}-ath10k = " \
- /lib/firmware/ath10k \
+ ${nonarch_base_libdir}/firmware/ath10k \
"
RDEPENDS_${PN}-ar3k += "${PN}-ar3k-license"
@@ -299,9 +299,9 @@ RDEPENDS_${PN}-ath10k += "${PN}-ath10k-license"
LICENSE_${PN}-ralink = "Firmware-ralink-firmware"
LICENSE_${PN}-ralink-license = "Firmware-ralink-firmware"
-FILES_${PN}-ralink-license = "/lib/firmware/LICENCE.ralink-firmware.txt"
+FILES_${PN}-ralink-license =
"${nonarch_base_libdir}/firmware/LICENCE.ralink-firmware.txt"
FILES_${PN}-ralink = " \
- /lib/firmware/rt*.bin \
+ ${nonarch_base_libdir}/firmware/rt*.bin \
"
RDEPENDS_${PN}-ralink += "${PN}-ralink-license"
@@ -310,9 +310,9 @@ RDEPENDS_${PN}-ralink += "${PN}-ralink-license"
LICENSE_${PN}-radeon = "Firmware-radeon"
LICENSE_${PN}-radeon-license = "Firmware-radeon"
-FILES_${PN}-radeon-license = "/lib/firmware/LICENSE.radeon"
+FILES_${PN}-radeon-license = "${nonarch_base_libdir}/firmware/LICENSE.radeon"
FILES_${PN}-radeon = " \
- /lib/firmware/radeon \
+ ${nonarch_base_libdir}/firmware/radeon \
"
RDEPEND
[OE-core] [PATCH v2 23/25] lttng-modules: Replace '/lib' with ${nonarch_base_libdir}
Do not assume '/lib' for kernel modules location, instead use
${nonarch_base_libdir}. Because when 'usrmerge' distro feature is enabled,
kernel modules are not located in /lib/modules, instead /usr/lib/modules.
Signed-off-by: Amarnath Valluri
---
meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
b/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
index e59d6bc..3536f26 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
@@ -22,11 +22,11 @@ EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'"
do_install_append() {
# Delete empty directories to avoid QA failures if no modules were built
- find ${D}/lib -depth -type d -empty -exec rmdir {} \;
+ find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \;
}
python do_package_prepend() {
-if not os.path.exists(os.path.join(d.getVar('D'), 'lib/modules')):
+if not os.path.exists(os.path.join(d.getVar('D'),
d.getVar('nonarch_base_libdir')[1:], 'modules')):
bb.warn("%s: no modules were created; this may be due to
CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN'))
}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 21/25] net-tools: Place package content as per bitbake environment.
net-tools Makefile was hardcoded sbin, bin installation paths to /bin and /sbin
respectively. This change moves the installed files to appropriate location as
per configured bitbake environment.
This might be solved much better way by patching Makefile, but that causing
build issues, as net-tools recipe is using pre-generated config.{h/status}.
Signed-off-by: Amarnath Valluri
---
meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 11 +++
1 file changed, 11 insertions(+)
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
index 49a65f8..c4af7ef 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
@@ -93,6 +93,17 @@ do_install() {
unset CFLAGS
unset LDFLAGS
oe_runmake 'BASEDIR=${D}' install
+
+ if [ "${base_bindir}" != "/bin" ]; then
+ mkdir -p ${D}/${base_bindir}
+ mv ${D}/bin/* ${D}/${base_bindir}/
+ rmdir ${D}/bin
+ fi
+ if [ "${base_sbindir}" != "/sbin" ]; then
+ mkdir ${D}/${base_sbindir}
+ mv ${D}/sbin/* ${D}/${base_sbindir}/
+ rmdir ${D}/sbin
+ fi
}
inherit update-alternatives
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 24/25] image: create symlinks needed for merged /usr
Prepare the symlinks required for merged /usr at the time of rootfs creation.
The links created in rootfs are:
/bin --> /usr/sbin
/sbin --> /usr/sbin
/lib --> /usr/lib
/lib64 --> /usr/lib64
We cannot make these symlinks as part of 'base-files' or some other package.
Because at rootfs creation, installation of the package(say kernel) that depends
on these root folders/links fails, if package manager installs this package
prior to base-files.
These symbolic links in top level folder should present as long as
- kerenl tools use /lib/{module,firmware}
- shell scripts uses "#!/bin/sh"
Signed-off-by: Amarnath Valluri
---
meta/classes/image.bbclass | 23 +++
1 file changed, 23 insertions(+)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 127e62d..4a9b40e 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -617,3 +617,26 @@ do_bundle_initramfs () {
:
}
addtask bundle_initramfs after do_image_complete
+
+# Prepare the root links to point to the /usr counterparts.
+create_merged_usr_symlinks() {
+install -m 0755 -d ${IMAGE_ROOTFS}/${base_bindir}
+install -m 0755 -d ${IMAGE_ROOTFS}/${base_sbindir}
+install -m 0755 -d ${IMAGE_ROOTFS}/${base_libdir}
+lnr ${IMAGE_ROOTFS}${base_bindir} ${IMAGE_ROOTFS}/bin
+lnr ${IMAGE_ROOTFS}${base_sbindir} ${IMAGE_ROOTFS}/sbin
+lnr ${IMAGE_ROOTFS}${base_libdir} ${IMAGE_ROOTFS}/${baselib}
+
+if [ "${nonarch_base_libdir}" != "${base_libdir}" ]; then
+ install -m 0755 -d ${IMAGE_ROOTFS}/${nonarch_base_libdir}
+ lnr ${IMAGE_ROOTFS}${nonarch_base_libdir} ${IMAGE_ROOTFS}/lib
+fi
+
+# create base links for multilibs
+multi_libdirs="${@d.getVar('MULTILIB_VARIANTS')}"
+for d in $multi_libdirs; do
+install -m 0755 -d ${IMAGE_ROOTFS}/${exec_prefix}/$d
+lnr ${IMAGE_ROOTFS}/${exec_prefix}/$d ${IMAGE_ROOTFS}/$d
+done
+}
+ROOTFS_PREPROCESS_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES',
'usrmerge', 'create_merged_usr_symlinks; ', '',d)}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 20/25] mktemp: Move installed files only when needed
Move binary(ies) only when ${base_bindir} != ${bindir}.
When usrmerge distro feature is enabled they both might point to same location.
Signed-off-by: Amarnath Valluri
---
meta/recipes-extended/mktemp/mktemp_1.7.bb | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/mktemp/mktemp_1.7.bb
b/meta/recipes-extended/mktemp/mktemp_1.7.bb
index 9accc6e..e8ae5c6 100644
--- a/meta/recipes-extended/mktemp/mktemp_1.7.bb
+++ b/meta/recipes-extended/mktemp/mktemp_1.7.bb
@@ -20,9 +20,11 @@ inherit autotools update-alternatives
EXTRA_OECONF = "--with-libc"
do_install_append () {
- install -d ${D}${base_bindir}
- mv ${D}${bindir}/mktemp ${D}${base_bindir}/mktemp
- rmdir ${D}${bindir}
+ if [ "${base_bindir}" != "${bindir}" ] ; then
+ install -d ${D}${base_bindir}
+ mv ${D}${bindir}/mktemp ${D}${base_bindir}/mktemp
+ rmdir ${D}${bindir}
+ fi
}
ALTERNATIVE_${PN} = "mktemp"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 22/25] lsb: Make use of appropriate bitbake variables.
Using of bitbake environment variables in-place of hardcoded strings makes this
recipe portable to all environments.
Signed-off-by: Amarnath Valluri
---
meta/recipes-extended/lsb/lsb_4.1.bb | 40 +---
1 file changed, 19 insertions(+), 21 deletions(-)
diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb
b/meta/recipes-extended/lsb/lsb_4.1.bb
index ece0eab..7194505 100644
--- a/meta/recipes-extended/lsb/lsb_4.1.bb
+++ b/meta/recipes-extended/lsb/lsb_4.1.bb
@@ -33,14 +33,14 @@ S = "${WORKDIR}/lsb-release-1.4"
CLEANBROKEN = "1"
do_install(){
- oe_runmake install prefix=${D} mandir=${D}/${datadir}/man/ DESTDIR=${D}
+ oe_runmake install prefix=${D}/${prefix} mandir=${D}/${datadir}/man/
DESTDIR=${D}
# this 2 dirs are needed by package lsb-dist-checker
mkdir -p ${D}${sysconfdir}/opt
mkdir -p ${D}${localstatedir}/opt
mkdir -p ${D}${base_bindir}
- mkdir -p ${D}/${baselib}
+ mkdir -p ${D}${base_libdir}
mkdir -p ${D}${sysconfdir}/lsb-release.d
printf "LSB_VERSION=\"core-4.1-noarch:" > ${D}${sysconfdir}/lsb-release
@@ -86,47 +86,45 @@ do_install_append(){
install -m 0755 ${WORKDIR}/${i} ${D}${sysconfdir}/core-lsb
done
- install -d ${D}/lib/lsb
- install -m 0755 ${WORKDIR}/init-functions ${D}/lib/lsb
+ install -d ${D}/${nonarch_base_libdir}/lsb
+ install -m 0755 ${WORKDIR}/init-functions
${D}/${nonarch_base_libdir}/lsb
# creat links for LSB test
- install -d ${D}/usr/lib/lsb
- ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/install_initd
- ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/remove_initd
+ if [ "${nonarch_base_libdir}" != "${nonarch_libdir}" ; then
+ install -d ${D}/${nonarch_libdir}/lsb
+ fi
+ ln -sf ${sbindir}/chkconfig
${D}/${nonarch_base_libdir}/lsb/install_initd
+ ln -sf ${sbindir}/chkconfig ${D}/${nonarch_base_libdir}/lsb/remove_initd
if [ "${TARGET_ARCH}" = "x86_64" ];then
- cd ${D}
if [ "${baselib}" != "lib64" ]; then
- ln -sf ${baselib} lib64
+ lnr ${D}${base_libdir} ${D}/lib64
fi
- cd ${D}/${baselib}
+ cd ${D}/${base_libdir}
ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2
ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3
fi
if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ];then
- cd ${D}/${baselib}
+ cd ${D}/${base_libdir}
ln -sf ld-linux.so.2 ld-lsb.so.2
ln -sf ld-linux.so.2 ld-lsb.so.3
fi
if [ "${TARGET_ARCH}" = "powerpc64" ];then
- cd ${D}
if [ "${baselib}" != "lib64" ]; then
- ln -sf ${baselib} lib64
+ lnr ${D}${base_libdir} ${D}/lib64
fi
- cd ${D}/${baselib}
+ cd ${D}/${base_libdir}
ln -sf ld64.so.1 ld-lsb-ppc64.so.2
ln -sf ld64.so.1 ld-lsb-ppc64.so.3
fi
if [ "${TARGET_ARCH}" = "powerpc" ];then
- cd ${D}/${baselib}
+ cd ${D}/${base_libdir}
ln -sf ld.so.1 ld-lsb-ppc32.so.2
ln -sf ld.so.1 ld-lsb-ppc32.so.3
fi
}
-FILES_${PN} += "/lib64 \
-${base_libdir} \
-/usr/lib/lsb \
-${base_libdir}/lsb/* \
-/lib/lsb/* \
- "
+FILES_${PN} += "${base_bindir} ${base_libdir} \
+${nonarch_libdir}/lsb \
+${nonarch_base_libdir}/lsb/* \
+${@'/lib64' if d.getVar('TARGET_ARCH') == ('x86_64' or
'powerpc64') and '${baselib}' != 'lib64' else ''}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 00/25] Fix for #7040 - Support for /usr merge
This set of patches implements the long-standing feature - merging of /bin,
/sbin, /libs to their /usr counterparts.
It introduces a 'usrmerge' DISTRO_FEATURE, when it's enabled:
- other than native all base paths(base_{bin,sbin,lib}dir) points to
${exec_prefix}/{bin,sbin,lib}
- base-files package adds the needed root links(/bin, /sbin, /lib{32,64})
points to /usr counterparts
- As most of shell scripts refer "#!/bin/{sh,bash}" inside script, so makes
sure that get added to RPROVIDES_ list by those packages to satisfy the
build dependencies.
The assumption is that no recipe uses hard coded paths in recipes where
pre-defined bitbake configuration variables are available. I have fixed quite
many recipes that i found which violates this assumption.
I have tested this change on core-minimal, sato, windriver cube-desktop and
intel-iot-refkit image builds. And i would prefer to run autobuilder tests prior
to merging.
Changes in v2:
- Moved root links creation out from 'base-files' to pre-rootfs.
- Fixes to lsb, lttng-modules recipes., that are failed in autobuilder tests.
- Added insane check to usrmerge feature.
- Fixed typos in commit messages.
Amarnath Valluri (22):
bitbake.conf: Modify nativesdk variables to support 'usrmerge'
DISTRO_FEATURE
cross.bbclass: merged /usr support
base-files: Replace hardcoded root paths with appropriate bitbake
variables
systemd: chagnes to support merged /usr
bash: changes to support merged /usr
busybox: changes to support merged /usr
sed: changes to support merged /usr
musl: Fix issues in relative symlink creation
attr/acl: Do not create broken static library link when not needed
systemd: Do not add libnss_* to systemd package
util-linux: Make sure '${base_bindir}/reset' is part of
util-linux-reset package.
util-linux,shadow: Make 'nologin' alternative command
libarchive: Backport upstream fixes.
kernel: use ${nonarch_base_libdir} for kernel modules installation.
firmware: use ${nonarch_base_libdir} for firmware installation.
mdadm: Avoid using hardocded udev, sbin paths
mktemp: Move installed files only when needed
net-tools: Place package content as per bitbake environment.
lsb: Make use of appropriate bitbake variables.
lttng-modules: Replace '/lib' with ${nonarch_base_libdir}
image: create symlinks needed for merged /usr
insane.bbclass: Add package QA check for merged /usr.
Joshua Lock (1):
bitbake.conf: support for merged usr with DISTRO_FEATURE usrmerge
Jussi Kukkonen (2):
glibc: Ensure ldconfig is packaged into glibc
util-linux: Fix packaging with "usrmerge"
meta/classes/cross.bbclass | 2 +-
meta/classes/image.bbclass | 23 ++
meta/classes/insane.bbclass| 16 ++
meta/classes/kernel-module-split.bbclass | 2 +-
meta/classes/kernel.bbclass| 14 +-
meta/classes/module.bbclass| 2 +-
meta/conf/bitbake.conf | 20 +-
meta/recipes-core/base-files/base-files_3.0.14.bb | 5 +-
meta/recipes-core/busybox/busybox.inc | 2 +
meta/recipes-core/glibc/glibc-package.inc | 2 +-
...dynamic-linker-a-relative-symlink-to-libc.patch | 62 +-
meta/recipes-core/musl/musl_git.bb | 2 +-
meta/recipes-core/systemd/systemd_232.bb | 7 +-
meta/recipes-core/util-linux/util-linux.inc| 13 +-
meta/recipes-extended/bash/bash.inc| 2 +
...te_disk_posix.c-make-_fsobj-functions-mor.patch | 245 +
...02-Fix-extracting-hardlinks-over-symlinks.patch | 120 ++
.../libarchive/libarchive_3.2.2.bb | 2 +
meta/recipes-extended/lsb/lsb_4.1.bb | 40 ++--
meta/recipes-extended/mdadm/mdadm_4.0.bb | 6 +-
meta/recipes-extended/mktemp/mktemp_1.7.bb | 8 +-
.../net-tools/net-tools_1.60-26.bb | 11 +
meta/recipes-extended/sed/sed_4.2.2.bb | 1 +
meta/recipes-extended/shadow/shadow.inc| 3 +-
.../linux-firmware/linux-firmware_git.bb | 168 +++---
meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb | 4 +-
meta/recipes-support/attr/ea-acl.inc | 2 +
...gure-option-to-enable-disable-static-libr.patch | 70 ++
28 files changed, 699 insertions(+), 155 deletions(-)
create mode 100644
meta/recipes-extended/libarchive/files/0001-archive_write_disk_posix.c-make-_fsobj-functions-mor.patch
create mode 100644
meta/recipes-extended/libarchive/files/0002-Fix-extracting-hardlinks-over-symlinks.patch
create mode 100644
meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/o
[OE-core] [PATCH v2 01/25] bitbake.conf: support for merged usr with DISTRO_FEATURE usrmerge
From: Joshua Lock
Modify bindir, libdir and sbindir to be exec_prefix/$d, rather than
base_prefix/$d, when the usrmerge DISTRO_FEATURE is enabled.
Signed-off-by: Joshua Lock
---
meta/conf/bitbake.conf | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index e421650..c5beb77 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -18,10 +18,14 @@ export prefix = "/usr"
export exec_prefix = "${prefix}"
# Base paths
-export base_bindir = "${base_prefix}/bin"
-export base_sbindir = "${base_prefix}/sbin"
-export base_libdir = "${base_prefix}/${baselib}"
-export nonarch_base_libdir = "${base_prefix}/lib"
+bin = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${exec_prefix}/bin', '${base_prefix}/bin', d)}"
+sbin = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${exec_prefix}/sbin', '${base_prefix}/sbin', d)}"
+lib = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${exec_prefix}/${baselib}', '${base_prefix}/${baselib}', d)}"
+nonarch_lib = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${exec_prefix}/lib', '${base_prefix}/lib', d)}"
+export base_bindir = "${bin}"
+export base_sbindir = "${sbin}"
+export base_libdir = "${lib}"
+export nonarch_base_libdir = "${nonarch_lib}"
# Architecture independent paths
export sysconfdir = "${base_prefix}/etc"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 25/25] insane.bbclass: Add package QA check for merged /usr.
This check makes sure that, when usrmerge distro feature enabled, no package
installs files to root (/bin, /sbin, /lib, /lib64) folders.
Signed-off-by: Amarnath Valluri
---
meta/classes/insane.bbclass | 16
1 file changed, 16 insertions(+)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index e8e54f0..011eb99 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -40,6 +40,9 @@ ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch
pkgconfig la \
version-going-backwards expanded-d invalid-chars \
license-checksum dev-elf \
"
+# Add usrmerge QA check based on distro feature
+ERROR_QA_append = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '
usrmerge', '', d)}"
+
FAKEROOT_QA = "host-user-contaminated"
FAKEROOT_QA[doc] = "QA tests which need to run under fakeroot. If any \
enabled tests are listed here, the do_package_qa task will run under fakeroot."
@@ -1035,6 +1038,18 @@ def package_qa_check_deps(pkg, pkgdest, skip, d):
check_valid_deps('RREPLACES')
check_valid_deps('RCONFLICTS')
+QAPKGTEST[usrmerge] = "package_qa_check_usrmerge"
+def package_qa_check_usrmerge(pkg, d, messages):
+pkgdest = d.getVar('PKGDEST')
+pkg_dir = pkgdest + os.sep + pkg + os.sep
+merged_dirs = ['bin', 'sbin', 'lib'] +
d.getVar('MULTILIB_VARIANTS').split()
+for f in merged_dirs:
+if os.path.exists(pkg_dir + f) and not os.path.islink(pkg_dir + f):
+msg = "%s package is not obeying usrmerge distro feature. /%s
should be relocated to /usr." % (pkg, f)
+package_qa_add_message(messages, "usrmerge", msg)
+return False
+return True
+
QAPKGTEST[expanded-d] = "package_qa_check_expanded_d"
def package_qa_check_expanded_d(package, d, messages):
"""
@@ -1108,6 +1123,7 @@ def package_qa_check_host_user(path, name, d, elf,
messages):
return False
return True
+
# The PACKAGE FUNC to scan each package
python do_package_qa () {
import subprocess
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 02/25] bitbake.conf: Modify nativesdk variables to support 'usrmerge' DISTRO_FEATURE
Modify base bin, sbin, and lib nativesdk variables to be ${prefix_nativesdk}/$d,
when the usrmerge DISTRO_FEATURE is enabled.
Signed-off-by: Amarnath Valluri
---
meta/conf/bitbake.conf | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c5beb77..ecff034 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -67,11 +67,11 @@ bindir_crossscripts = "${bindir}/crossscripts"
prefix_nativesdk = "/usr"
bindir_nativesdk = "${prefix_nativesdk}/bin"
sbindir_nativesdk = "${prefix_nativesdk}/sbin"
-base_bindir_nativesdk = "/bin"
-base_sbindir_nativesdk = "/sbin"
-includedir_nativesdk = "${prefix_nativesdk}/include"
libdir_nativesdk = "${prefix_nativesdk}/lib"
-base_libdir_nativesdk = "/lib"
+base_bindir_nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${bindir_nativesdk}', '/bin', d)}"
+base_sbindir_nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${sbindir_nativesdk}', '/sbin', d)}"
+base_libdir_nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${libdir_nativesdk}', '/lib', d)}"
+includedir_nativesdk = "${prefix_nativesdk}/include"
localstatedir_nativesdk = "/var"
#
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 03/25] cross.bbclass: merged /usr support
When 'usrmerge' distro feature enabled match target_base_libdir to
${target_libdir}.
Signed-off-by: Amarnath Valluri
---
meta/classes/cross.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 2602153..c8ef3a5 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -48,8 +48,8 @@ SSTATE_SCAN_CMD ?= "${SSTATE_SCAN_CMD_NATIVE}"
target_base_prefix := "${base_prefix}"
target_prefix := "${prefix}"
target_exec_prefix := "${exec_prefix}"
-target_base_libdir = "${target_base_prefix}/${baselib}"
target_libdir = "${target_exec_prefix}/${baselib}"
+target_base_libdir = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${target_libdir}', '${target_base_prefix}/${baselib}', d)}"
target_includedir := "${includedir}"
# Overrides for paths
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 04/25] base-files: Replace hardcoded root paths with appropriate bitbake variables
/bin, /sbin, /lib are replaced with ${base_bindir}, ${base_sbindir} and
${base_libdir}.
Signed-off-by: Amarnath Valluri
---
meta/recipes-core/base-files/base-files_3.0.14.bb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb
b/meta/recipes-core/base-files/base-files_3.0.14.bb
index d138005..35744f4 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -32,8 +32,9 @@ INHIBIT_DEFAULT_DEPS = "1"
docdir_append = "/${P}"
dirs1777 = "/tmp ${localstatedir}/volatile/tmp"
dirs2775 = ""
-dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
- ${sysconfdir}/skel /lib /mnt /proc ${ROOT_HOME} /run /sbin \
+dirs755 = "/boot /dev ${base_bindir} ${base_sbindir} ${base_libdir} \
+ ${sysconfdir} ${sysconfdir}/default \
+ ${sysconfdir}/skel ${nonarch_base_libdir} /mnt /proc ${ROOT_HOME}
/run \
${prefix} ${bindir} ${docdir} /usr/games ${includedir} \
${libdir} ${sbindir} ${datadir} \
${datadir}/common-licenses ${datadir}/dict ${infodir} \
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 06/25] bash: changes to support merged /usr
Most of shell scripts refer to '#!/bin/{sh,bash}' inside the script. But when
'usrmege' feature is enabled this path will be /usr/bin/{sh, bash}.
so to satisify build dependency add '/bin/{sh,bash}' to its providers list.
Signed-off-by: Amarnath Valluri
---
meta/recipes-extended/bash/bash.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-extended/bash/bash.inc
b/meta/recipes-extended/bash/bash.inc
index a05b987..0f0d679 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -65,3 +65,5 @@ pkg_postinst_${PN} () {
pkg_postrm_${PN} () {
printf "$(grep -v "^${base_bindir}/bash$" $D${sysconfdir}/shells)\n" >
$D${sysconfdir}/shells
}
+
+RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'/bin/sh /bin/bash', '', d)}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 05/25] systemd: chagnes to support merged /usr
When the usrmerge DISTRO_FEATURE is selected disable the split-usr
support and modify rootprefix to be exec_prefix, rather than base_prefix.
Signed-off-by: Amarnath Valluri
---
meta/recipes-core/systemd/systemd_232.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_232.bb
b/meta/recipes-core/systemd/systemd_232.bb
index cc8781e..bf0fadc 100644
--- a/meta/recipes-core/systemd/systemd_232.bb
+++ b/meta/recipes-core/systemd/systemd_232.bb
@@ -131,7 +131,7 @@ CACHED_CONFIGUREVARS +=
"ac_cv_path_SULOGIN=${base_sbindir}/sulogin"
# Helper variables to clarify locations. This mirrors the logic in systemd's
# build system.
-rootprefix ?= "${base_prefix}"
+rootprefix ?= "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${exec_prefix}', '${base_prefix}', d)}"
rootlibdir ?= "${base_libdir}"
rootlibexecdir = "${rootprefix}/lib"
@@ -149,10 +149,10 @@ CACHED_CONFIGUREVARS_class-target = "\
EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
--with-rootlibdir=${rootlibdir} \
--with-roothomedir=${ROOT_HOME} \
- --enable-split-usr \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'--disable-split-usr', '--enable-split-usr', d)} \
--without-python \
--with-sysvrcnd-path=${sysconfdir} \
- --with-firmware-path=/lib/firmware \
+ --with-firmware-path=${nonarch_base_libdir}/firmware \
--with-testdir=${PTEST_PATH} \
"
# per the systemd README, define VALGRIND=1 to run under valgrind
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 08/25] sed: changes to support merged /usr
Few of the perl scripts referring '#!/bin/sed' inside the script. But when
'usrmerge' feature is enabled this path would be /usr/bin/sed. So to satisfy
build dependency add '/bin/sed' to it's providers list.
Signed-off-by: Amarnath Valluri
---
meta/recipes-extended/sed/sed_4.2.2.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb
b/meta/recipes-extended/sed/sed_4.2.2.bb
index 5aa7d8a..e31bec2 100644
--- a/meta/recipes-extended/sed/sed_4.2.2.bb
+++ b/meta/recipes-extended/sed/sed_4.2.2.bb
@@ -44,3 +44,4 @@ do_install_ptest() {
oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B}
DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR}
}
+RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'/bin/sed', '', d)}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 13/25] systemd: Do not add libnss_* to systemd package
libnss_* files should be part of corresponding sub-packages, the split happens
by do_package_split(). By adding ${libdir}/libnss_* to FILES_${PN}, those files
endup in systemd package when ${libdir} == ${base_libdir}.
Signed-off-by: Amarnath Valluri
---
meta/recipes-core/systemd/systemd_232.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-core/systemd/systemd_232.bb
b/meta/recipes-core/systemd/systemd_232.bb
index bf0fadc..a18907a 100644
--- a/meta/recipes-core/systemd/systemd_232.bb
+++ b/meta/recipes-core/systemd/systemd_232.bb
@@ -451,7 +451,6 @@ FILES_${PN} = " ${base_bindir}/* \
${rootlibexecdir}/systemd/* \
${systemd_unitdir}/* \
${base_libdir}/security/*.so \
-${libdir}/libnss_* \
/cgroup \
${bindir}/systemd* \
${bindir}/busctl \
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 14/25] util-linux: Make sure '${base_bindir}/reset' is part of util-linux-reset package.
update-alternative.bbclass might rename the 'reset' binary when LINK_NAME ==
TARGET, This is true(${base_bindir} == ${bindir}) when 'usrmerge' distro feature
is enabled. Hence, suffix with * to properly package the renamed binary.
Signed-off-by: Amarnath Valluri
util-linux
---
meta/recipes-core/util-linux/util-linux.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc
b/meta/recipes-core/util-linux/util-linux.inc
index ae60b0a..5934fb5 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -84,7 +84,7 @@ FILES_util-linux-umount = "${base_bindir}/umount.${BPN}"
FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}"
FILES_util-linux-uuidgen = "${bindir}/uuidgen"
FILES_util-linux-uuidd = "${sbindir}/uuidd"
-FILES_util-linux-reset = "${base_bindir}/reset"
+FILES_util-linux-reset = "${base_bindir}/reset*"
FILES_util-linux-partx = "${sbindir}/partx"
FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}"
FILES_util-linux-findfs = "${sbindir}/findfs"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 10/25] glibc: Ensure ldconfig is packaged into glibc
From: Jussi Kukkonen
If "usrmerge" feature is used, /usr/sbin/ldconfig gets packaged into
glibc-utils instead of glibc: Switch PACKAGES order to prevent this.
Signed-off-by: Jussi Kukkonen
---
meta/recipes-core/glibc/glibc-package.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/glibc/glibc-package.inc
b/meta/recipes-core/glibc/glibc-package.inc
index f0fc9c1..6aca2db 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -19,7 +19,7 @@ USE_LDCONFIG ?= "1"
INHIBIT_SYSROOT_STRIP = "1"
-PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode ${PN}-utils
glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile
libsotruss ${PN} glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc"
+PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic
libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils
glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc"
# The ld.so in this glibc supports the GNU_HASH
RPROVIDES_${PN} = "eglibc rtld(GNU_HASH)"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 07/25] busybox: changes to support merged /usr
Most of the shell scripts refer to /bin/sh inside the script. When 'usrmege'
feature is enabled, this path would be /usr/bin/sh. Hence, to satisfy build
dependency add '/bin/sh' to it's providers list.
Signed-off-by: Amarnath Valluri
---
meta/recipes-core/busybox/busybox.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-core/busybox/busybox.inc
b/meta/recipes-core/busybox/busybox.inc
index 34f4e25..61d17e4 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -431,3 +431,5 @@ pkg_prerm_${PN}-syslog () {
fi
fi
}
+
+RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'/bin/sh', '', d)}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 11/25] util-linux: Fix packaging with "usrmerge"
From: Jussi Kukkonen
Make sure fsck.cramfs is packaged before fsck so the latter
does not steal the fsck.cramfs binary when building with usrmerge
DISTRO_FEATURE.
Signed-off-by: Jussi Kukkonen
---
meta/recipes-core/util-linux/util-linux.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc
b/meta/recipes-core/util-linux/util-linux.inc
index 7d948bf..ae60b0a 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -29,9 +29,9 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin
PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk
util-linux-sfdisk \
util-linux-swaponoff util-linux-losetup util-linux-umount \
util-linux-mount util-linux-readprofile util-linux-uuidd \
- util-linux-uuidgen util-linux-lscpu util-linux-fsck
util-linux-blkid \
- util-linux-mkfs util-linux-mcookie util-linux-reset
util-linux-lsblk \
- util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \
+ util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs
util-linux-fsck \
+ util-linux-blkid util-linux-mkfs util-linux-mcookie
util-linux-reset \
+ util-linux-lsblk util-linux-mkfs.cramfs util-linux-fstrim \
util-linux-partx util-linux-hwclock util-linux-mountpoint \
util-linux-findfs util-linux-getopt util-linux-sulogin
util-linux-prlimit"
PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount',
'util-linux-pylibmount', '', d)}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 09/25] musl: Fix issues in relative symlink creation
Make use of lnr/ln -r while creating relative symlinks than guessing the
relalive path.
Signed-off-by: Amarnath Valluri
---
...dynamic-linker-a-relative-symlink-to-libc.patch | 62 ++
meta/recipes-core/musl/musl_git.bb | 2 +-
2 files changed, 53 insertions(+), 11 deletions(-)
diff --git
a/meta/recipes-core/musl/files/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
b/meta/recipes-core/musl/files/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
index 5490b1c..462d338 100644
---
a/meta/recipes-core/musl/files/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
+++
b/meta/recipes-core/musl/files/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
@@ -1,6 +1,6 @@
-From 94c0b97b62125d8bbc92dce0694e387d5b2ad181 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Sun, 10 Jan 2016 12:14:02 -0800
+From 0ec74744a4cba7c5fdfaa2685995119a4fca0260 Mon Sep 17 00:00:00 2001
+From: Amarnath Valluri
+Date: Wed, 18 Jan 2017 16:14:37 +0200
Subject: [PATCH] Make dynamic linker a relative symlink to libc
absolute symlink into $(libdir) fails to load in a cross build
@@ -9,26 +9,68 @@ applications, which cross build systems often do, since not
everything
can be computed during cross builds, qemu in usermode often comes to aid
in such situations to feed into cross builds.
+V2:
+ Make use of 'ln -r' to create relative symlinks, as most fo the distros
+ shipping coreutils 8.16+
+
Signed-off-by: Khem Raj
+Signed-off-by: Amarnath Valluri
---
Upstream-Status: Pending
-
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+---
+ Makefile | 2 +-
+ tools/install.sh | 8 +---
+ 2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
-index b2226fa..0d71f7f 100644
+index 8246b78..d1dbe39 100644
--- a/Makefile
+++ b/Makefile
-@@ -189,7 +189,7 @@ $(DESTDIR)$(includedir)/%: include/%
+@@ -215,7 +215,7 @@ $(DESTDIR)$(includedir)/%: $(srcdir)/include/%
$(INSTALL) -D -m 644 $< $@
$(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so
- $(INSTALL) -D -l $(libdir)/libc.so $@ || true
-+ $(INSTALL) -D -l ..$(libdir)/libc.so $@ || true
++ $(INSTALL) -D -r $(DESTDIR)$(libdir)/libc.so $@ || true
install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(if
$(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),)
+diff --git a/tools/install.sh b/tools/install.sh
+index d913b60..b6a7f79 100755
+--- a/tools/install.sh
b/tools/install.sh
+@@ -6,18 +6,20 @@
+ #
+
+ usage() {
+-printf "usage: %s [-D] [-l] [-m mode] src dest\n" "$0" 1>&2
++printf "usage: %s [-D] [-l] [-r] [-m mode] src dest\n" "$0" 1>&2
+ exit 1
+ }
+
+ mkdirp=
+ symlink=
++symlinkflags="-s"
+ mode=755
+
+-while getopts Dlm: name ; do
++while getopts Dlrm: name ; do
+ case "$name" in
+ D) mkdirp=yes ;;
+ l) symlink=yes ;;
++r) symlink=yes; symlinkflags="$symlinkflags -r" ;;
+ m) mode=$OPTARG ;;
+ ?) usage ;;
+ esac
+@@ -48,7 +50,7 @@ trap 'rm -f "$tmp"' EXIT INT QUIT TERM HUP
+ umask 077
+
+ if test "$symlink" ; then
+-ln -s "$1" "$tmp"
++ln $symlinkflags "$1" "$tmp"
+ else
+ cat < "$1" > "$tmp"
+ chmod "$mode" "$tmp"
--
-2.7.0
+2.7.4
diff --git a/meta/recipes-core/musl/musl_git.bb
b/meta/recipes-core/musl/musl_git.bb
index e9b9fef..5775184 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -49,7 +49,7 @@ do_install() {
oe_runmake install DESTDIR='${D}'
install -d ${D}${bindir}
- ln -s ../../${libdir}/libc.so ${D}${bindir}/ldd
+ lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd
for l in crypt dl m pthread resolv rt util xnet
do
ln -s libc.so ${D}${libdir}/lib$l.so
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 15/25] util-linux, shadow: Make 'nologin' alternative command
Both shadow and util-linux packages provides 'nologin' binary in ${base_sbindir}
and ${sbindir} respectively, this leads to conflict when 'usrmerge' feature is
enabled, where ${sbindir} == ${base_sbindir}. Hance, handle this to alternative
system to resolve the conflict.
Signed-off-by: Amarnath Valluri
---
meta/recipes-core/util-linux/util-linux.inc | 5 +++--
meta/recipes-extended/shadow/shadow.inc | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc
b/meta/recipes-core/util-linux/util-linux.inc
index 5934fb5..afc3c73 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -151,7 +151,7 @@ do_install () {
mkdir -p ${D}${base_bindir}
sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
-sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup
swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root"
+sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup
swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root nologin"
binprogs_a="dmesg getopt kill more umount mount login reset su
mountpoint"
if [ "${base_sbindir}" != "${sbindir}" ]; then
@@ -194,7 +194,7 @@ ALTERNATIVE_PRIORITY = "80"
ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root"
ALTERNATIVE_${PN} += "hexdump last lastb logger mesg renice wall"
-ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject"
+ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject nologin"
ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
@@ -204,6 +204,7 @@ ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
+ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8
sulogin.8 utmpdump.1 reset.1 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3"
diff --git a/meta/recipes-extended/shadow/shadow.inc
b/meta/recipes-extended/shadow/shadow.inc
index 4c4db00..91b6f46 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/meta/recipes-extended/shadow/shadow.inc
@@ -170,10 +170,11 @@ inherit update-alternatives
ALTERNATIVE_PRIORITY = "200"
-ALTERNATIVE_${PN} = "passwd chfn chsh chpasswd vipw vigr"
+ALTERNATIVE_${PN} = "passwd chfn chsh chpasswd vipw vigr nologin"
ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd"
ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw"
ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr"
+ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
ALTERNATIVE_${PN}-base = "newgrp groups login su"
ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 12/25] attr/acl: Do not create broken static library link when not needed
Stop creating the static library archieve(liba(ttr|cl).a) when --disable-static configure option used. Signed-off-by: Amarnath Valluri --- meta/recipes-support/attr/ea-acl.inc | 2 + ...gure-option-to-enable-disable-static-libr.patch | 70 ++ 2 files changed, 72 insertions(+) create mode 100644 meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc index a88ce90..c587b3c 100644 --- a/meta/recipes-support/attr/ea-acl.inc +++ b/meta/recipes-support/attr/ea-acl.inc @@ -2,6 +2,8 @@ SRC_URI += "file://relative-libdir.patch;striplevel=0 \ " +# This patch should be applied after '(attr\|acl)-Missing-configure.ac.patch' +SRC_URI_append = " file://0001-Added-configure-option-to-enable-disable-static-libr.patch" inherit autotools-brokensep gettext diff --git a/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch b/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch new file mode 100644 index 000..1c1159f --- /dev/null +++ b/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch @@ -0,0 +1,70 @@ +From 01256c61ba126449c46dd4ab5d5e145488b981fa Mon Sep 17 00:00:00 2001 +From: Amarnath Valluri +Date: Mon, 23 Jan 2017 13:25:13 +0200 +Subject: [PATCH] Added configure option to enable/disable static library + +Create static library archive only in case of --enable-static. + +Upstream-Status: Pending + +Signed-off-by: Amarnath Valluri +--- + configure.ac | 6 ++ + include/builddefs.in | 1 + + include/buildmacros | 3 +++ + 3 files changed, 10 insertions(+) + +diff --git a/configure.ac b/configure.ac +index b966d0e..e48268b 100644 +--- a/configure.ac b/configure.ac +@@ -26,6 +26,12 @@ AC_ARG_ENABLE(shared, + enable_shared=yes) + AC_SUBST(enable_shared) + ++AC_ARG_ENABLE(static, ++[ --enable-static=[yes/no] Enable use of static libraries [default=yes]],, ++ enable_static=yes) ++AC_SUBST(enable_static) ++ ++ + AC_ARG_ENABLE(gettext, + [ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, + enable_gettext=yes) +diff --git a/include/builddefs.in b/include/builddefs.in +index d9931db..3b3dbd2 100644 +--- a/include/builddefs.in b/include/builddefs.in +@@ -71,6 +71,7 @@ RPMBUILD = @rpmbuild@ + RPM_VERSION = @rpm_version@ + + ENABLE_SHARED = @enable_shared@ ++ENABLE_STATIC = @enable_static@ + ENABLE_GETTEXT= @enable_gettext@ + + HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@ +diff --git a/include/buildmacros b/include/buildmacros +index 39fa7e2..b0f25c5 100644 +--- a/include/buildmacros b/include/buildmacros +@@ -80,6 +80,7 @@ endif + # /usr/lib. + ifeq ($(ENABLE_SHARED),yes) + INSTALL_LTLIB_DEV = \ ++ set -x; \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ + ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ + ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \ +@@ -88,7 +89,9 @@ INSTALL_LTLIB_DEV = \ + ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ + if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \ + rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ ++ if test "$(ENABLE_STATIC)" = "yes" ; then \ + ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ ++ fi ;\ + ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ + rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ + ../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \ +-- +2.7.4 + -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 22/25] lsb: Make use of appropriate bitbake variables.
Using of bitbake environment variables in-place of hardcoded strings makes this
recipe portable to all environments.
Signed-off-by: Amarnath Valluri
---
meta/recipes-extended/lsb/lsb_4.1.bb | 40 +---
1 file changed, 19 insertions(+), 21 deletions(-)
diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb
b/meta/recipes-extended/lsb/lsb_4.1.bb
index ece0eab..7194505 100644
--- a/meta/recipes-extended/lsb/lsb_4.1.bb
+++ b/meta/recipes-extended/lsb/lsb_4.1.bb
@@ -33,14 +33,14 @@ S = "${WORKDIR}/lsb-release-1.4"
CLEANBROKEN = "1"
do_install(){
- oe_runmake install prefix=${D} mandir=${D}/${datadir}/man/ DESTDIR=${D}
+ oe_runmake install prefix=${D}/${prefix} mandir=${D}/${datadir}/man/
DESTDIR=${D}
# this 2 dirs are needed by package lsb-dist-checker
mkdir -p ${D}${sysconfdir}/opt
mkdir -p ${D}${localstatedir}/opt
mkdir -p ${D}${base_bindir}
- mkdir -p ${D}/${baselib}
+ mkdir -p ${D}${base_libdir}
mkdir -p ${D}${sysconfdir}/lsb-release.d
printf "LSB_VERSION=\"core-4.1-noarch:" > ${D}${sysconfdir}/lsb-release
@@ -86,47 +86,45 @@ do_install_append(){
install -m 0755 ${WORKDIR}/${i} ${D}${sysconfdir}/core-lsb
done
- install -d ${D}/lib/lsb
- install -m 0755 ${WORKDIR}/init-functions ${D}/lib/lsb
+ install -d ${D}/${nonarch_base_libdir}/lsb
+ install -m 0755 ${WORKDIR}/init-functions
${D}/${nonarch_base_libdir}/lsb
# creat links for LSB test
- install -d ${D}/usr/lib/lsb
- ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/install_initd
- ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/remove_initd
+ if [ "${nonarch_base_libdir}" != "${nonarch_libdir}" ; then
+ install -d ${D}/${nonarch_libdir}/lsb
+ fi
+ ln -sf ${sbindir}/chkconfig
${D}/${nonarch_base_libdir}/lsb/install_initd
+ ln -sf ${sbindir}/chkconfig ${D}/${nonarch_base_libdir}/lsb/remove_initd
if [ "${TARGET_ARCH}" = "x86_64" ];then
- cd ${D}
if [ "${baselib}" != "lib64" ]; then
- ln -sf ${baselib} lib64
+ lnr ${D}${base_libdir} ${D}/lib64
fi
- cd ${D}/${baselib}
+ cd ${D}/${base_libdir}
ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2
ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3
fi
if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ];then
- cd ${D}/${baselib}
+ cd ${D}/${base_libdir}
ln -sf ld-linux.so.2 ld-lsb.so.2
ln -sf ld-linux.so.2 ld-lsb.so.3
fi
if [ "${TARGET_ARCH}" = "powerpc64" ];then
- cd ${D}
if [ "${baselib}" != "lib64" ]; then
- ln -sf ${baselib} lib64
+ lnr ${D}${base_libdir} ${D}/lib64
fi
- cd ${D}/${baselib}
+ cd ${D}/${base_libdir}
ln -sf ld64.so.1 ld-lsb-ppc64.so.2
ln -sf ld64.so.1 ld-lsb-ppc64.so.3
fi
if [ "${TARGET_ARCH}" = "powerpc" ];then
- cd ${D}/${baselib}
+ cd ${D}/${base_libdir}
ln -sf ld.so.1 ld-lsb-ppc32.so.2
ln -sf ld.so.1 ld-lsb-ppc32.so.3
fi
}
-FILES_${PN} += "/lib64 \
-${base_libdir} \
-/usr/lib/lsb \
-${base_libdir}/lsb/* \
-/lib/lsb/* \
- "
+FILES_${PN} += "${base_bindir} ${base_libdir} \
+${nonarch_libdir}/lsb \
+${nonarch_base_libdir}/lsb/* \
+${@'/lib64' if d.getVar('TARGET_ARCH') == ('x86_64' or
'powerpc64') and '${baselib}' != 'lib64' else ''}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 17/25] kernel: use ${nonarch_base_libdir} for kernel modules installation.
Replace hardcoded '/lib' in kernel modules installation path with
${nonarch_base_libdir}, which is meant exactly for this.
Signed-off-by: Amarnath Valluri
---
meta/classes/kernel-module-split.bbclass | 2 +-
meta/classes/kernel.bbclass | 14 +++---
meta/classes/module.bbclass | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/meta/classes/kernel-module-split.bbclass
b/meta/classes/kernel-module-split.bbclass
index ba9cc15..5e10dcf 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -138,7 +138,7 @@ python split_kernel_module_packages () {
postinst = d.getVar('pkg_postinst_modules')
postrm = d.getVar('pkg_postrm_modules')
-modules = do_split_packages(d, root='/lib/modules',
file_regex=module_regex, output_pattern=module_pattern, description='%s kernel
module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata,
extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION")))
+modules = do_split_packages(d, root='${nonarch_base_libdir}/modules',
file_regex=module_regex, output_pattern=module_pattern, description='%s kernel
module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata,
extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION")))
if modules:
metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE')
d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules))
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 97cba92..bb02ba5 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -297,11 +297,11 @@ kernel_do_install() {
#
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
- oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
- rm "${D}/lib/modules/${KERNEL_VERSION}/build"
- rm "${D}/lib/modules/${KERNEL_VERSION}/source"
+ oe_runmake DEPMOD=echo
MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}
INSTALL_FW_PATH=${D}${nonarch_base_libdir}/firmware modules_install
+ rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
+ rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source"
# If the kernel/ directory is empty remove it to prevent QA
issues
- rmdir --ignore-fail-on-non-empty
"${D}/lib/modules/${KERNEL_VERSION}/kernel"
+ rmdir --ignore-fail-on-non-empty
"${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel"
else
bbnote "no modules to install"
fi
@@ -479,9 +479,9 @@ EXPORT_FUNCTIONS do_compile do_install do_configure
# kernel-image becomes kernel-image-${KERNEL_VERSION}
PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev
kernel-modules"
FILES_${PN} = ""
-FILES_kernel-base = "/lib/modules/${KERNEL_VERSION}/modules.order
/lib/modules/${KERNEL_VERSION}/modules.builtin"
+FILES_kernel-base =
"${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.order
${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin"
FILES_kernel-image = ""
-FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config*
${KERNEL_SRC_PATH} /lib/modules/${KERNEL_VERSION}/build"
+FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config*
${KERNEL_SRC_PATH} ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
FILES_kernel-vmlinux = "/boot/vmlinux-${KERNEL_VERSION_NAME}"
FILES_kernel-modules = ""
RDEPENDS_kernel = "kernel-base"
@@ -512,7 +512,7 @@ pkg_postinst_kernel-base () {
PACKAGESPLITFUNCS_prepend = "split_kernel_packages "
python split_kernel_packages () {
-do_split_packages(d, root='/lib/firmware',
file_regex='^(.*)\.(bin|fw|cis|csp|dsp)$', output_pattern='kernel-firmware-%s',
description='Firmware for %s', recursive=True, extra_depends='')
+do_split_packages(d, root='${nonarch_base_libdir}/firmware',
file_regex='^(.*)\.(bin|fw|cis|csp|dsp)$', output_pattern='kernel-firmware-%s',
description='Firmware for %s', recursive=True, extra_depends='')
}
# Many scripts want to look in arch/$arch/boot for the bootable
diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
index a588873..e894c89 100644
--- a/meta/classes/module.bbclass
+++ b/meta/classes/module.bbclass
@@ -31,7 +31,7 @@ module_do_compile() {
module_do_install() {
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
- oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" \
+ oe_runmake DEPMOD=echo
MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}" \
CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
O=${STAGING_KERNEL_BUILDDIR} \
${MODULES_INSTALL_TARGET}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedde
[OE-core] [PATCH v2 23/25] lttng-modules: Replace '/lib' with ${nonarch_base_libdir}
Do not assume '/lib' for kernel modules location, instead use
${nonarch_base_libdir}. Because when 'usrmerge' distro feature is enabled,
kernel modules are not located in /lib/modules, instead /usr/lib/modules.
Signed-off-by: Amarnath Valluri
---
meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
b/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
index e59d6bc..3536f26 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
@@ -22,11 +22,11 @@ EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'"
do_install_append() {
# Delete empty directories to avoid QA failures if no modules were built
- find ${D}/lib -depth -type d -empty -exec rmdir {} \;
+ find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \;
}
python do_package_prepend() {
-if not os.path.exists(os.path.join(d.getVar('D'), 'lib/modules')):
+if not os.path.exists(os.path.join(d.getVar('D'),
d.getVar('nonarch_base_libdir')[1:], 'modules')):
bb.warn("%s: no modules were created; this may be due to
CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN'))
}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 16/25] libarchive: Backport upstream fixes.
These set of patches backported from upstream, which fixes the issues in
extracting hardlinks over softlinks while etracting packages by opkg.
Signed-off-by: Amarnath Valluri
---
...te_disk_posix.c-make-_fsobj-functions-mor.patch | 245 +
...02-Fix-extracting-hardlinks-over-symlinks.patch | 120 ++
.../libarchive/libarchive_3.2.2.bb | 2 +
3 files changed, 367 insertions(+)
create mode 100644
meta/recipes-extended/libarchive/files/0001-archive_write_disk_posix.c-make-_fsobj-functions-mor.patch
create mode 100644
meta/recipes-extended/libarchive/files/0002-Fix-extracting-hardlinks-over-symlinks.patch
diff --git
a/meta/recipes-extended/libarchive/files/0001-archive_write_disk_posix.c-make-_fsobj-functions-mor.patch
b/meta/recipes-extended/libarchive/files/0001-archive_write_disk_posix.c-make-_fsobj-functions-mor.patch
new file mode 100644
index 000..7d93142
--- /dev/null
+++
b/meta/recipes-extended/libarchive/files/0001-archive_write_disk_posix.c-make-_fsobj-functions-mor.patch
@@ -0,0 +1,245 @@
+From 90881d24d3f6d5fb207e97df3b91bbea8598e84e Mon Sep 17 00:00:00 2001
+From: Martin Matuska
+Date: Tue, 29 Nov 2016 16:47:37 +0100
+Subject: [PATCH 1/2] archive_write_disk_posix.c: make *_fsobj functions more
+ readable
+
+Upstream-Status: Backport
+
+Signed-off-by: Amarnath Valluri
+---
+ libarchive/archive_write_disk_posix.c | 121 +-
+ 1 file changed, 61 insertions(+), 60 deletions(-)
+
+diff --git a/libarchive/archive_write_disk_posix.c
b/libarchive/archive_write_disk_posix.c
+index 17c23b0..d786bc2 100644
+--- a/libarchive/archive_write_disk_posix.c
b/libarchive/archive_write_disk_posix.c
+@@ -336,6 +336,8 @@ struct archive_write_disk {
+
+ #define HFS_BLOCKS(s) ((s) >> 12)
+
++static void fsobj_error(int *, struct archive_string *, int, const char *,
++ const char *);
+ static intcheck_symlinks_fsobj(char *path, int *error_number, struct
archive_string *error_string, int flags);
+ static intcheck_symlinks(struct archive_write_disk *);
+ static intcreate_filesystem_object(struct archive_write_disk *);
+@@ -2005,8 +2007,9 @@ restore_entry(struct archive_write_disk *a)
+
+ if (en) {
+ /* Everything failed; give up here. */
+- archive_set_error(&a->archive, en, "Can't create '%s'",
+- a->name);
++ if ((&a->archive)->error == NULL)
++ archive_set_error(&a->archive, en, "Can't create '%s'",
++ a->name);
+ return (ARCHIVE_FAILED);
+ }
+
+@@ -2388,6 +2391,17 @@ current_fixup(struct archive_write_disk *a, const char
*pathname)
+ return (a->current_fixup);
+ }
+
++/* Error helper for new *_fsobj functions */
++static void
++fsobj_error(int *a_eno, struct archive_string *a_estr,
++int err, const char *errstr, const char *path)
++{
++ if (a_eno)
++ *a_eno = err;
++ if (a_estr)
++ archive_string_sprintf(a_estr, errstr, path);
++}
++
+ /*
+ * TODO: Someday, integrate this with the deep dir support; they both
+ * scan the path and both can be optimized by comparing against other
+@@ -2400,7 +2414,7 @@ current_fixup(struct archive_write_disk *a, const char
*pathname)
+ * ARCHIVE_OK if there are none, otherwise puts an error in errmsg.
+ */
+ static int
+-check_symlinks_fsobj(char *path, int *error_number, struct archive_string
*error_string, int flags)
++check_symlinks_fsobj(char *path, int *a_eno, struct archive_string *a_estr,
int flags)
+ {
+ #if !defined(HAVE_LSTAT)
+ /* Platform doesn't have lstat, so we can't look for symlinks. */
+@@ -2474,19 +2488,20 @@ check_symlinks_fsobj(char *path, int *error_number,
struct archive_string *error
+ if (errno == ENOENT) {
+ break;
+ } else {
+- /* Treat any other error as fatal - best to be
paranoid here
+- * Note: This effectively disables deep
directory
+- * support when security checks are enabled.
+- * Otherwise, very long pathnames that trigger
+- * an error here could evade the sandbox.
+- * TODO: We could do better, but it would
probably
+- * require merging the symlink checks with the
+- * deep-directory editing. */
+- if (error_number) *error_number = errno;
+- if (error_string)
+- archive_string_sprintf(error_string,
+- "Could not stat %s",
+- path);
++ /*
++ * Treat any other error as
[OE-core] [PATCH v2 21/25] net-tools: Place package content as per bitbake environment.
net-tools Makefile was hardcoded sbin, bin installation paths to /bin and /sbin
respectively. This change moves the installed files to appropriate location as
per configured bitbake environment.
This might be solved much better way by patching Makefile, but that causing
build issues, as net-tools recipe is using pre-generated config.{h/status}.
Signed-off-by: Amarnath Valluri
---
meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 11 +++
1 file changed, 11 insertions(+)
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
index 49a65f8..c4af7ef 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
@@ -93,6 +93,17 @@ do_install() {
unset CFLAGS
unset LDFLAGS
oe_runmake 'BASEDIR=${D}' install
+
+ if [ "${base_bindir}" != "/bin" ]; then
+ mkdir -p ${D}/${base_bindir}
+ mv ${D}/bin/* ${D}/${base_bindir}/
+ rmdir ${D}/bin
+ fi
+ if [ "${base_sbindir}" != "/sbin" ]; then
+ mkdir ${D}/${base_sbindir}
+ mv ${D}/sbin/* ${D}/${base_sbindir}/
+ rmdir ${D}/sbin
+ fi
}
inherit update-alternatives
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 20/25] mktemp: Move installed files only when needed
Move binary(ies) only when ${base_bindir} != ${bindir}.
When usrmerge distro feature is enabled they both might point to same location.
Signed-off-by: Amarnath Valluri
---
meta/recipes-extended/mktemp/mktemp_1.7.bb | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/mktemp/mktemp_1.7.bb
b/meta/recipes-extended/mktemp/mktemp_1.7.bb
index 9accc6e..e8ae5c6 100644
--- a/meta/recipes-extended/mktemp/mktemp_1.7.bb
+++ b/meta/recipes-extended/mktemp/mktemp_1.7.bb
@@ -20,9 +20,11 @@ inherit autotools update-alternatives
EXTRA_OECONF = "--with-libc"
do_install_append () {
- install -d ${D}${base_bindir}
- mv ${D}${bindir}/mktemp ${D}${base_bindir}/mktemp
- rmdir ${D}${bindir}
+ if [ "${base_bindir}" != "${bindir}" ] ; then
+ install -d ${D}${base_bindir}
+ mv ${D}${bindir}/mktemp ${D}${base_bindir}/mktemp
+ rmdir ${D}${bindir}
+ fi
}
ALTERNATIVE_${PN} = "mktemp"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 25/25] insane.bbclass: Add package QA check for merged /usr.
This check makes sure that, when usrmerge distro feature enabled, no package
installs files to root (/bin, /sbin, /lib, /lib64) folders.
Signed-off-by: Amarnath Valluri
---
meta/classes/insane.bbclass | 16
1 file changed, 16 insertions(+)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index e8e54f0..011eb99 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -40,6 +40,9 @@ ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch
pkgconfig la \
version-going-backwards expanded-d invalid-chars \
license-checksum dev-elf \
"
+# Add usrmerge QA check based on distro feature
+ERROR_QA_append = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '
usrmerge', '', d)}"
+
FAKEROOT_QA = "host-user-contaminated"
FAKEROOT_QA[doc] = "QA tests which need to run under fakeroot. If any \
enabled tests are listed here, the do_package_qa task will run under fakeroot."
@@ -1035,6 +1038,18 @@ def package_qa_check_deps(pkg, pkgdest, skip, d):
check_valid_deps('RREPLACES')
check_valid_deps('RCONFLICTS')
+QAPKGTEST[usrmerge] = "package_qa_check_usrmerge"
+def package_qa_check_usrmerge(pkg, d, messages):
+pkgdest = d.getVar('PKGDEST')
+pkg_dir = pkgdest + os.sep + pkg + os.sep
+merged_dirs = ['bin', 'sbin', 'lib'] +
d.getVar('MULTILIB_VARIANTS').split()
+for f in merged_dirs:
+if os.path.exists(pkg_dir + f) and not os.path.islink(pkg_dir + f):
+msg = "%s package is not obeying usrmerge distro feature. /%s
should be relocated to /usr." % (pkg, f)
+package_qa_add_message(messages, "usrmerge", msg)
+return False
+return True
+
QAPKGTEST[expanded-d] = "package_qa_check_expanded_d"
def package_qa_check_expanded_d(package, d, messages):
"""
@@ -1108,6 +1123,7 @@ def package_qa_check_host_user(path, name, d, elf,
messages):
return False
return True
+
# The PACKAGE FUNC to scan each package
python do_package_qa () {
import subprocess
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 24/25] image: create symlinks needed for merged /usr
Prepare the symlinks required for merged /usr at the time of rootfs creation.
The links created in rootfs are:
/bin --> /usr/sbin
/sbin --> /usr/sbin
/lib --> /usr/lib
/lib64 --> /usr/lib64
We cannot make these symlinks as part of 'base-files' or some other package.
Because at rootfs creation, installation of the package(say kernel) that depends
on these root folders/links fails, if package manager installs this package
prior to base-files.
These symbolic links in top level folder should present as long as
- kerenl tools use /lib/{module,firmware}
- shell scripts uses "#!/bin/sh"
Signed-off-by: Amarnath Valluri
---
meta/classes/image.bbclass | 23 +++
1 file changed, 23 insertions(+)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 127e62d..4a9b40e 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -617,3 +617,26 @@ do_bundle_initramfs () {
:
}
addtask bundle_initramfs after do_image_complete
+
+# Prepare the root links to point to the /usr counterparts.
+create_merged_usr_symlinks() {
+install -m 0755 -d ${IMAGE_ROOTFS}/${base_bindir}
+install -m 0755 -d ${IMAGE_ROOTFS}/${base_sbindir}
+install -m 0755 -d ${IMAGE_ROOTFS}/${base_libdir}
+lnr ${IMAGE_ROOTFS}${base_bindir} ${IMAGE_ROOTFS}/bin
+lnr ${IMAGE_ROOTFS}${base_sbindir} ${IMAGE_ROOTFS}/sbin
+lnr ${IMAGE_ROOTFS}${base_libdir} ${IMAGE_ROOTFS}/${baselib}
+
+if [ "${nonarch_base_libdir}" != "${base_libdir}" ]; then
+ install -m 0755 -d ${IMAGE_ROOTFS}/${nonarch_base_libdir}
+ lnr ${IMAGE_ROOTFS}${nonarch_base_libdir} ${IMAGE_ROOTFS}/lib
+fi
+
+# create base links for multilibs
+multi_libdirs="${@d.getVar('MULTILIB_VARIANTS')}"
+for d in $multi_libdirs; do
+install -m 0755 -d ${IMAGE_ROOTFS}/${exec_prefix}/$d
+lnr ${IMAGE_ROOTFS}/${exec_prefix}/$d ${IMAGE_ROOTFS}/$d
+done
+}
+ROOTFS_PREPROCESS_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES',
'usrmerge', 'create_merged_usr_symlinks; ', '',d)}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 18/25] firmware: use ${nonarch_base_libdir} for firmware installation.
Replace hardcoded '/lib' in kernel firmware installation path with
${nonarch_base_libdir}.
Signed-off-by: Amarnath Valluri
---
.../linux-firmware/linux-firmware_git.bb | 168 ++---
1 file changed, 84 insertions(+), 84 deletions(-)
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 0aba740..5a74a57 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -195,27 +195,27 @@ do_compile() {
}
do_install() {
- install -d ${D}/lib/firmware/
- cp -r * ${D}/lib/firmware/
+ install -d ${D}${nonarch_base_libdir}/firmware/
+ cp -r * ${D}${nonarch_base_libdir}/firmware/
# Avoid Makefile to be deployed
- rm ${D}/lib/firmware/Makefile
+ rm ${D}${nonarch_base_libdir}/firmware/Makefile
# Remove unbuild firmware which needs cmake and bash
- rm ${D}/lib/firmware/carl9170fw -rf
+ rm ${D}${nonarch_base_libdir}/firmware/carl9170fw -rf
# Remove pointless bash script
- rm ${D}/lib/firmware/configure
+ rm ${D}${nonarch_base_libdir}/firmware/configure
# Libertas sd8686
- ln -sf libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin
- ln -sf libertas/sd8686_v9_helper.bin ${D}/lib/firmware/sd8686_helper.bin
+ ln -sf libertas/sd8686_v9.bin
${D}${nonarch_base_libdir}/firmware/sd8686.bin
+ ln -sf libertas/sd8686_v9_helper.bin
${D}${nonarch_base_libdir}/firmware/sd8686_helper.bin
# fixup wl12xx location, after 2.6.37 the kernel searches a different
location for it
- ( cd ${D}/lib/firmware ; ln -sf ti-connectivity/* . )
+ ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . )
# Copy the iwlwifi ucode
-cp ${WORKDIR}/iwlwifi-8000C-19.ucode ${D}/lib/firmware/
+cp ${WORKDIR}/iwlwifi-8000C-19.ucode
${D}${nonarch_base_libdir}/firmware/
}
@@ -252,23 +252,23 @@ LICENSE_${PN}-ath6k = "Firmware-atheros_firmware"
LICENSE_${PN}-ath9k = "Firmware-atheros_firmware"
LICENSE_${PN}-atheros-license = "Firmware-atheros_firmware"
-FILES_${PN}-atheros-license = "/lib/firmware/LICENCE.atheros_firmware"
+FILES_${PN}-atheros-license =
"${nonarch_base_libdir}/firmware/LICENCE.atheros_firmware"
FILES_${PN}-ar9170 = " \
- /lib/firmware/ar9170*.fw \
+ ${nonarch_base_libdir}/firmware/ar9170*.fw \
"
FILES_${PN}-carl9170 = " \
- /lib/firmware/carl9170*.fw \
+ ${nonarch_base_libdir}/firmware/carl9170*.fw \
"
FILES_${PN}-ath6k = " \
- /lib/firmware/ath6k \
+ ${nonarch_base_libdir}/firmware/ath6k \
"
FILES_${PN}-ath9k = " \
- /lib/firmware/ar9271.fw \
- /lib/firmware/ar7010*.fw \
- /lib/firmware/htc_9271.fw \
- /lib/firmware/htc_7010.fw \
- /lib/firmware/ath9k_htc/htc_7010-1.4.0.fw \
- /lib/firmware/ath9k_htc/htc_9271-1.4.0.fw \
+ ${nonarch_base_libdir}/firmware/ar9271.fw \
+ ${nonarch_base_libdir}/firmware/ar7010*.fw \
+ ${nonarch_base_libdir}/firmware/htc_9271.fw \
+ ${nonarch_base_libdir}/firmware/htc_7010.fw \
+ ${nonarch_base_libdir}/firmware/ath9k_htc/htc_7010-1.4.0.fw \
+ ${nonarch_base_libdir}/firmware/ath9k_htc/htc_9271-1.4.0.fw \
"
RDEPENDS_${PN}-ar9170 += "${PN}-atheros-license"
@@ -282,14 +282,14 @@ LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k"
LICENSE_${PN}-ath10k = "Firmware-qualcommAthos_ath10k"
LICENSE_${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k"
-FILES_${PN}-ar3k-license = "/lib/firmware/LICENSE.QualcommAtheros_ar3k"
+FILES_${PN}-ar3k-license =
"${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ar3k"
FILES_${PN}-ar3k = " \
- /lib/firmware/ar3k \
+ ${nonarch_base_libdir}/firmware/ar3k \
"
-FILES_${PN}-ath10k-license = "/lib/firmware/LICENSE.QualcommAtheros_ath10k"
+FILES_${PN}-ath10k-license =
"${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ath10k"
FILES_${PN}-ath10k = " \
- /lib/firmware/ath10k \
+ ${nonarch_base_libdir}/firmware/ath10k \
"
RDEPENDS_${PN}-ar3k += "${PN}-ar3k-license"
@@ -299,9 +299,9 @@ RDEPENDS_${PN}-ath10k += "${PN}-ath10k-license"
LICENSE_${PN}-ralink = "Firmware-ralink-firmware"
LICENSE_${PN}-ralink-license = "Firmware-ralink-firmware"
-FILES_${PN}-ralink-license = "/lib/firmware/LICENCE.ralink-firmware.txt"
+FILES_${PN}-ralink-license =
"${nonarch_base_libdir}/firmware/LICENCE.ralink-firmware.txt"
FILES_${PN}-ralink = " \
- /lib/firmware/rt*.bin \
+ ${nonarch_base_libdir}/firmware/rt*.bin \
"
RDEPENDS_${PN}-ralink += "${PN}-ralink-license"
@@ -310,9 +310,9 @@ RDEPENDS_${PN}-ralink += "${PN}-ralink-license"
LICENSE_${PN}-radeon = "Firmware-radeon"
LICENSE_${PN}-radeon-license = "Firmware-radeon"
-FILES_${PN}-radeon-license = "/lib/firmware/LICENSE.radeon"
+FILES_${PN}-radeon-license = "${nonarch_base_libdir}/firmware/LICENSE.radeon"
FILES_${PN}-radeon = " \
- /lib/firmware/radeon \
+ ${nonarch_base_libdir}/firmware/radeon \
"
RDEPEND
[OE-core] [PATCH v2 19/25] mdadm: Avoid using hardocded udev, sbin paths
Use appropriate bitbake variables inplace of below hardcoded locations:
/sbin -> ${base_sbindir}
/lib/udev -> ${nonarch_base_libdir}/udev
Signed-off-by: Amarnath Valluri
---
meta/recipes-extended/mdadm/mdadm_4.0.bb | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/mdadm/mdadm_4.0.bb
b/meta/recipes-extended/mdadm/mdadm_4.0.bb
index c228899..8a77204 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.0.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.0.bb
@@ -33,7 +33,9 @@ CFLAGS_append_mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__'
CFLAGS_append_mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__'
do_compile() {
- oe_runmake SYSROOT="${STAGING_DIR_TARGET}"
+ # Point to right sbindir
+ sed -i -e 's;BINDIR = /sbin;BINDIR = $base_sbindir;' ${S}/Makefile
+ oe_runmake SYSROOT="${STAGING_DIR_TARGET}"
UDEVDIR="${nonarch_libdir}/udev"
}
do_install() {
@@ -51,7 +53,7 @@ do_install_ptest() {
cp -a ${S}/tests ${D}${PTEST_PATH}/tests
cp ${S}/test ${D}${PTEST_PATH}
sed -e 's!sleep 0.*!sleep 1!g; s!/var/tmp!/!g' -i ${D}${PTEST_PATH}/test
- ln -s /sbin/mdadm ${D}${PTEST_PATH}/mdadm
+ ln -s ${base_sbindir}/mdadm ${D}${PTEST_PATH}/mdadm
for prg in test_stripe swap_super raid6check
do
install -D -m 755 $prg ${D}${PTEST_PATH}/
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] python-native: extend RPROVIDES
On 22 February 2017 at 07:34, wrote: > Let RPROVIDES include identical packages as listed in PROVIDES of > python-2.7-manifest.inc, to satisfy the native runtime requirement > on python-native. > How about changing the script so that the generated manifest also contains the RPROVIDES? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Task sequence question
On 21 February 2017 at 23:20, Andreas Müller wrote: > after some fixing in meta-oe it seems I am able to build some > xfce-image again. Watching the tasks go by I noticed that do_rootfs is > running already while many recipes still do their do_package_qa. This > looks a bit odd to me. Not that I am happy about an early do_rootfs > but what would happen if do_package_qa fails? Isn't that a kind of > prerequisite for an image that do_package_qa passes for all packages > within this image? > If there are any failures in do_package_qa then the build will fail, so this is basically optimistically running the rootfs whilst doing QA in parallel. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V5 1/1] ltp: upgrade to 20170116
1. Upgrade ltp from 20160126 to 20170116.
2. Delete some patches because these have been integrated in upstream.
0001-ltp-Don-t-link-against-libfl.patch
0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
0007-replace-SIGCLD-with-SIGCHLD.patch
0009-Guard-error.h-with-__GLIBC__.patch
0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
0013-include-fcntl.h-for-getting-O_-definitions.patch
0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch
0015-mincore01-Rename-PAGESIZE-to-pagesize.patch
0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
0017-replace-sigval_t-with-union-sigval.patch
0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch
0022-include-sys-types.h.patch
0029-trace_shed-Fix-build-with-musl.patch
0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch
0032-regen.sh-Include-asm-unistd.h-explicitly.patch
0037-containers-netns_netlink-Avoid-segmentation-fault.patch
0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch
0040-containers-userns05-use-unsigned-int-for-ns-id.patch
3. Add new patch based on Khem Raj's 0007-replace-SIGCLD-with-SIGCHLD.patch
0001-add-_GNU_SOURCE-to-pec_listener.c.patch
4. Add new patches fix building errors with musl:
0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch
0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch
0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch
Add new patch fix building errors, when the distro is poky-lsb
0012-fix-faccessat01.c-build-fails-with-security-flags.patch
5. Modify some patches because the upstream contains changes, those patches
maybe failed when they apply to the new version of ltp.
0011-Rename-sigset-variable-to-sigset1.patch
0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
0035-fix-test_proc_kill-hang.patch
6. Rename and modify this patch.
fcntl-fix-the-time-def-to-use-time_t.patch to
0039-fcntl-fix-the-time-def-to-use-time_t.patch
7. The new version of ltp add the checking for ksh and csh, we doesn't support
ksh and csh in oe-core, so remove the checking files when the system executes
do_install function.
Signed-off-by: Dengke Du
---
.../0001-add-_GNU_SOURCE-to-pec_listener.c.patch | 39 ++
.../ltp/0001-ltp-Don-t-link-against-libfl.patch| 30 --
...TH_MAX-undeclared-when-building-with-musl.patch | 30 ++
...sendfile-Use-off64_t-instead-of-__off64_t.patch | 31 --
...RDSIZE-undeclared-when-building-with-musl.patch | 30 ++
.../ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch | 394 -
.../ltp/0009-Guard-error.h-with-__GLIBC__.patch| 270 --
...ition-of-struct-msgbuf-error-building-wit.patch | 35 ++
.../0011-Rename-sigset-variable-to-sigset1.patch | 77 ++--
...essat01.c-build-fails-with-security-flags.patch | 70
...fsstress.c-Replace-__int64_t-with-int64_t.patch | 351 --
...nclude-fcntl.h-for-getting-O_-definitions.patch | 67
...ing-Include-sys-types.h-for-pid_t-definit.patch | 56 ---
...015-mincore01-Rename-PAGESIZE-to-pagesize.patch | 64
...Change-header-from-ustat.h-to-sys-ustat.h.patch | 45 ---
.../0017-replace-sigval_t-with-union-sigval.patch | 88 -
...lace-canonicalize_file_name-with-realpath.patch | 32 --
.../ltp/ltp/0022-include-sys-types.h.patch | 29 --
...sconf01-Use-_SC_2_C_VERSION-conditionally.patch | 23 +-
.../ltp/0029-trace_shed-Fix-build-with-musl.patch | 32 --
...READ_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch | 26 +-
...age-size-offset-as-per-page-size-alignmen.patch | 33 --
...-regen.sh-Include-asm-unistd.h-explicitly.patch | 30 --
.../ltp/ltp/0035-fix-test_proc_kill-hang.patch | 27 +-
...rs-netns_netlink-Avoid-segmentation-fault.patch | 50 ---
...ix-option-group-test-replace-CWD-qith-PWD.patch | 44 ---
...0039-fcntl-fix-the-time-def-to-use-time_t.patch | 17 +-
...iners-userns05-use-unsigned-int-for-ns-id.patch | 60
.../ltp/{ltp_20160126.bb => ltp_20170116.bb} | 35 +-
29 files changed, 306 insertions(+), 1809 deletions(-)
create mode 100644
meta/recipes-extended/ltp/ltp/0001-add-_GNU_SOURCE-to-pec_listener.c.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-against-libfl.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0009-Guard-e
[OE-core] [PATCH V5 0/1] ltp: upgrade to 20170116
Changed in V5:
Fix build errors when distro is poky-lsb
Changed in V4:
Rebase on the latest oe-core master branch
Changed in V3:
Add the runtime depends packages: "unzip gzip cpio cronie logrotate
which at" according to Yi zhao's
suggestion.
Changed in V2:
Add Upstream-Status for 0001-add-_GNU_SOURCE-to-pec_listener.c.patch
The following changes since commit e436a6398684d2872cb541f1cfb0f67b3618d15a:
layer.conf: bump version for change in eSDK selftest behaviour (2017-02-19
09:39:03 -0800)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib
dengke/ltp-upgrade-to-20170116
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=dengke/ltp-upgrade-to-20170116
Dengke Du (1):
ltp: upgrade to 20170116
.../0001-add-_GNU_SOURCE-to-pec_listener.c.patch | 39 ++
.../ltp/0001-ltp-Don-t-link-against-libfl.patch| 30 --
...TH_MAX-undeclared-when-building-with-musl.patch | 30 ++
...sendfile-Use-off64_t-instead-of-__off64_t.patch | 31 --
...RDSIZE-undeclared-when-building-with-musl.patch | 30 ++
.../ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch | 394 -
.../ltp/0009-Guard-error.h-with-__GLIBC__.patch| 270 --
...ition-of-struct-msgbuf-error-building-wit.patch | 35 ++
.../0011-Rename-sigset-variable-to-sigset1.patch | 77 ++--
...essat01.c-build-fails-with-security-flags.patch | 70
...fsstress.c-Replace-__int64_t-with-int64_t.patch | 351 --
...nclude-fcntl.h-for-getting-O_-definitions.patch | 67
...ing-Include-sys-types.h-for-pid_t-definit.patch | 56 ---
...015-mincore01-Rename-PAGESIZE-to-pagesize.patch | 64
...Change-header-from-ustat.h-to-sys-ustat.h.patch | 45 ---
.../0017-replace-sigval_t-with-union-sigval.patch | 88 -
...lace-canonicalize_file_name-with-realpath.patch | 32 --
.../ltp/ltp/0022-include-sys-types.h.patch | 29 --
...sconf01-Use-_SC_2_C_VERSION-conditionally.patch | 23 +-
.../ltp/0029-trace_shed-Fix-build-with-musl.patch | 32 --
...READ_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch | 26 +-
...age-size-offset-as-per-page-size-alignmen.patch | 33 --
...-regen.sh-Include-asm-unistd.h-explicitly.patch | 30 --
.../ltp/ltp/0035-fix-test_proc_kill-hang.patch | 27 +-
...rs-netns_netlink-Avoid-segmentation-fault.patch | 50 ---
...ix-option-group-test-replace-CWD-qith-PWD.patch | 44 ---
...0039-fcntl-fix-the-time-def-to-use-time_t.patch | 17 +-
...iners-userns05-use-unsigned-int-for-ns-id.patch | 60
.../ltp/{ltp_20160126.bb => ltp_20170116.bb} | 35 +-
29 files changed, 306 insertions(+), 1809 deletions(-)
create mode 100644
meta/recipes-extended/ltp/ltp/0001-add-_GNU_SOURCE-to-pec_listener.c.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-against-libfl.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0009-Guard-error.h-with-__GLIBC__.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0012-fix-faccessat01.c-build-fails-with-security-flags.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0013-include-fcntl.h-for-getting-O_-definitions.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0015-mincore01-Rename-PAGESIZE-to-pagesize.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0017-replace-sigval_t-with-union-sigval.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0022-include-sys-types.h.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-build-with-musl.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0032-regen.sh-Include-asm-unistd.h-explicitly.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch
delete mode 1006
Re: [OE-core] Task sequence question
On Wed, Feb 22, 2017 at 11:01 AM, Burton, Ross wrote: > > On 21 February 2017 at 23:20, Andreas Müller > wrote: >> >> after some fixing in meta-oe it seems I am able to build some >> xfce-image again. Watching the tasks go by I noticed that do_rootfs is >> running already while many recipes still do their do_package_qa. This >> looks a bit odd to me. Not that I am happy about an early do_rootfs >> but what would happen if do_package_qa fails? Isn't that a kind of >> prerequisite for an image that do_package_qa passes for all packages >> within this image? > > > If there are any failures in do_package_qa then the build will fail, so this > is basically optimistically running the rootfs whilst doing QA in parallel. > > Ross OK & thanks Andreas -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bitbake.conf: fix ineffective include conf/target/${TARGET_SYS}.conf
TARGET_SYS is defined in terms of TARGET_ARCH, so it's not valid
until after TUNE_ARCH has been set by the machine config. The
original order of includes resulted in an attempt to include
non-existent files such as:
conf/target/INVALID-oe-linux.conf
Signed-off-by: Andre McCurdy
---
meta/conf/bitbake.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index e421650..18d1cfb 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -705,9 +705,9 @@ include conf/auto.conf
include conf/local.conf
require conf/multiconfig/${BB_CURRENT_MC}.conf
include conf/build/${BUILD_SYS}.conf
-include conf/target/${TARGET_SYS}.conf
include conf/machine/${MACHINE}.conf
include conf/machine-sdk/${SDKMACHINE}.conf
+include conf/target/${TARGET_SYS}.conf
include conf/distro/${DISTRO}.conf
include conf/distro/defaultsetup.conf
include conf/documentation.conf
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] image_types_wic: fix expansion error
Variable WKS_SEARCH_PATH was not fully expanded when used directly
in this expression:
WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(),
'${WKS_SEARCH_PATH}') or ''}"
This caused expansion error: bb.data_smart.ExpansionError: Failure expanding
variable WKS_FULL_PATH,
which triggered exception SyntaxError: invalid syntax (WKS_FULL_PATH, line
1)
Using d.getVar('WKS_SEARCH_PATH') instead of directly referencing
WKS_SEARCH_PATH variable should fix the issue.
Signed-off-by: Ed Bartosh
---
meta/classes/image_types_wic.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/image_types_wic.bbclass
b/meta/classes/image_types_wic.bbclass
index 43b2917..c6e92fb 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -8,7 +8,7 @@ WICVARS ?= "\
WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks"
WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks"
WKS_SEARCH_PATH ?= "${THISDIR}:${@':'.join('%s/wic' % p for p in
'${BBPATH}'.split(':'))}:${@':'.join('%s/scripts/lib/wic/canned-wks' % l for l
in '${BBPATH}:${COREBASE}'.split(':'))}"
-WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(), '${WKS_SEARCH_PATH}')
or ''}"
+WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(),
d.getVar('WKS_SEARCH_PATH')) or ''}"
def wks_search(files, search_path):
for f in files:
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] image_types_wic: fix expansion error
On Wed, Feb 22, 2017 at 01:12:29PM +0200, Ed Bartosh wrote:
> Variable WKS_SEARCH_PATH was not fully expanded when used directly
> in this expression:
> WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(),
> '${WKS_SEARCH_PATH}') or ''}"
> This caused expansion error: bb.data_smart.ExpansionError: Failure expanding
> variable WKS_FULL_PATH,
> which triggered exception SyntaxError: invalid syntax (WKS_FULL_PATH,
> line 1)
>
> Using d.getVar('WKS_SEARCH_PATH') instead of directly referencing
> WKS_SEARCH_PATH variable should fix the issue.
Allows me to parse oe-core again, thanks!
Acked-by: Martin Jansa
> Signed-off-by: Ed Bartosh
> ---
> meta/classes/image_types_wic.bbclass | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/image_types_wic.bbclass
> b/meta/classes/image_types_wic.bbclass
> index 43b2917..c6e92fb 100644
> --- a/meta/classes/image_types_wic.bbclass
> +++ b/meta/classes/image_types_wic.bbclass
> @@ -8,7 +8,7 @@ WICVARS ?= "\
> WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks"
> WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks"
> WKS_SEARCH_PATH ?= "${THISDIR}:${@':'.join('%s/wic' % p for p in
> '${BBPATH}'.split(':'))}:${@':'.join('%s/scripts/lib/wic/canned-wks' % l for
> l in '${BBPATH}:${COREBASE}'.split(':'))}"
> -WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(), '${WKS_SEARCH_PATH}')
> or ''}"
> +WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(),
> d.getVar('WKS_SEARCH_PATH')) or ''}"
>
> def wks_search(files, search_path):
> for f in files:
> --
> 2.1.4
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] image_types_wic: fix expansion error
On 22 February 2017 at 11:12, Ed Bartosh wrote:
> -WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(),
> '${WKS_SEARCH_PATH}') or ''}"
> +WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(),
> d.getVar('WKS_SEARCH_PATH')) or ''}"
>
I think it would be safer to always use getVar instead of using the
implicit expansion of WKS_FILES and the later expansion of WKS_SEARCH_PATH.
Ross
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python-pexpect: BBCLASSEXTEND to native
From: Ming Liu
Some developers might need it.
Signed-off-by: Ming Liu
---
meta/recipes-devtools/python/python-pexpect_4.2.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/python/python-pexpect_4.2.1.bb
b/meta/recipes-devtools/python/python-pexpect_4.2.1.bb
index 95a0790..1321797 100644
--- a/meta/recipes-devtools/python/python-pexpect_4.2.1.bb
+++ b/meta/recipes-devtools/python/python-pexpect_4.2.1.bb
@@ -25,4 +25,4 @@ RDEPENDS_${PN} = "\
python-ptyprocess \
"
-BBCLASSEXTEND = "nativesdk"
+BBCLASSEXTEND = "native nativesdk"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python-ptyprocess: BBCLASSEXTEND to native
From: Ming Liu
Some developers might need it.
Signed-off-by: Ming Liu
---
meta/recipes-devtools/python/python-ptyprocess_0.5.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/python/python-ptyprocess_0.5.1.bb
b/meta/recipes-devtools/python/python-ptyprocess_0.5.1.bb
index 931e5a7..eed24ad 100644
--- a/meta/recipes-devtools/python/python-ptyprocess_0.5.1.bb
+++ b/meta/recipes-devtools/python/python-ptyprocess_0.5.1.bb
@@ -20,4 +20,4 @@ RDEPENDS_${PN} = "\
python-core \
"
-BBCLASSEXTEND = "nativesdk"
+BBCLASSEXTEND = "native nativesdk"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] Version upgrades
A bunch of minor version upgrades.
The one that might need a closer look is gdk-pixbuf: There's now yet
another tool that's required at build time and the build system is
broken for the cross-compile case.
Please drop the earlier gdk-pixbuf (2.36.4) upgrade.
Cheers,
Jussi
The following changes since commit e436a6398684d2872cb541f1cfb0f67b3618d15a:
layer.conf: bump version for change in eSDK selftest behaviour (2017-02-19
09:39:03 -0800)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/m3-upgrades
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/m3-upgrades
Jussi Kukkonen (6):
glib-2.0: Upgrade 2.50.2 -> 2.50.3
gtk+3: Upgrade 3.22.7 -> 3.22.8
libgudev: Upgrade 230 -> 231
libdrm: Upgrade 2.4.74 -> 2.4.75
menu-cache: Upgrade 1.0.1 -> 1.0.2
gdk-pixbuf: Upgrade 2.36.1 -> 2.36.5
.../{glib-2.0_2.50.2.bb => glib-2.0_2.50.3.bb} | 4 +-
...-around-thumbnailer-cross-compile-failure.patch | 47 ++
.../{gdk-pixbuf_2.36.1.bb => gdk-pixbuf_2.36.5.bb} | 12 --
.../gtk+/{gtk+3_3.22.7.bb => gtk+3_3.22.8.bb} | 4 +-
...e_3.22.7.bb => gtk-icon-utils-native_3.22.8.bb} | 4 +-
.../libgudev/{libgudev_230.bb => libgudev_231.bb} | 6 ++-
.../recipes-graphics/drm/libdrm/installtests.patch | 28 -
.../drm/{libdrm_2.4.74.bb => libdrm_2.4.75.bb} | 6 +--
.../{menu-cache_1.0.1.bb => menu-cache_1.0.2.bb} | 4 +-
9 files changed, 89 insertions(+), 26 deletions(-)
rename meta/recipes-core/glib-2.0/{glib-2.0_2.50.2.bb => glib-2.0_2.50.3.bb}
(86%)
create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.36.1.bb =>
gdk-pixbuf_2.36.5.bb} (88%)
rename meta/recipes-gnome/gtk+/{gtk+3_3.22.7.bb => gtk+3_3.22.8.bb} (84%)
rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.22.7.bb =>
gtk-icon-utils-native_3.22.8.bb} (93%)
rename meta/recipes-gnome/libgudev/{libgudev_230.bb => libgudev_231.bb} (65%)
rename meta/recipes-graphics/drm/{libdrm_2.4.74.bb => libdrm_2.4.75.bb} (91%)
rename meta/recipes-graphics/menu-cache/{menu-cache_1.0.1.bb =>
menu-cache_1.0.2.bb} (79%)
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] glib-2.0: Upgrade 2.50.2 -> 2.50.3
Tiny bug fix release.
Signed-off-by: Jussi Kukkonen
---
meta/recipes-core/glib-2.0/{glib-2.0_2.50.2.bb => glib-2.0_2.50.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/glib-2.0/{glib-2.0_2.50.2.bb => glib-2.0_2.50.3.bb}
(86%)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.50.2.bb
b/meta/recipes-core/glib-2.0/glib-2.0_2.50.3.bb
similarity index 86%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.50.2.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.50.3.bb
index b7a0670..22ea347 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.50.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.50.3.bb
@@ -21,5 +21,5 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz
\
SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \
file://relocate-modules.patch"
-SRC_URI[md5sum] = "5eeb2bfaf78a07be59585e8b6e80b1d6"
-SRC_URI[sha256sum] =
"be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5"
+SRC_URI[md5sum] = "381ab22934f296750d036aa55a397ded"
+SRC_URI[sha256sum] =
"82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999"
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] libdrm: Upgrade 2.4.74 -> 2.4.75
* Remove udev from depends (it's not actually used).
* Rebase a patch
Signed-off-by: Jussi Kukkonen
---
.../recipes-graphics/drm/libdrm/installtests.patch | 28 +++---
.../drm/{libdrm_2.4.74.bb => libdrm_2.4.75.bb} | 6 ++---
2 files changed, 22 insertions(+), 12 deletions(-)
rename meta/recipes-graphics/drm/{libdrm_2.4.74.bb => libdrm_2.4.75.bb} (91%)
diff --git a/meta/recipes-graphics/drm/libdrm/installtests.patch
b/meta/recipes-graphics/drm/libdrm/installtests.patch
index 30e0a61..ec1fb02 100644
--- a/meta/recipes-graphics/drm/libdrm/installtests.patch
+++ b/meta/recipes-graphics/drm/libdrm/installtests.patch
@@ -1,15 +1,25 @@
-tests: also install tests app
+From 5c6eb43c2f6e7f2ee7c25c92e42f4e4403fa0527 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen
+Date: Tue, 21 Feb 2017 14:37:52 +0200
+Subject: [PATCH] tests: also install test apps
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Yu Ke
+Signed-off-by: Jussi Kukkonen
+---
+ tests/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
-Index: libdrm-2.4.66/tests/Makefile.am
-===
libdrm-2.4.66.orig/tests/Makefile.am
-+++ libdrm-2.4.66/tests/Makefile.am
-@@ -73,3 +73,4 @@ TESTS += \
- endif
-
- check_PROGRAMS += $(TESTS)
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 0355a92..b4882cd 100644
+--- a/tests/Makefile.am
b/tests/Makefile.am
+@@ -45,3 +45,4 @@ TESTS = \
+ check_PROGRAMS = \
+ $(TESTS) \
+ drmdevice
+bin_PROGRAMS = $(check_PROGRAMS)
+--
+2.1.4
+
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.74.bb
b/meta/recipes-graphics/drm/libdrm_2.4.75.bb
similarity index 91%
rename from meta/recipes-graphics/drm/libdrm_2.4.74.bb
rename to meta/recipes-graphics/drm/libdrm_2.4.75.bb
index 06d7642..56963d4 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.74.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.75.bb
@@ -8,7 +8,7 @@ SECTION = "x11/base"
LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
PROVIDES = "drm"
-DEPENDS = "libpthread-stubs udev libpciaccess"
+DEPENDS = "libpthread-stubs libpciaccess"
SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
file://installtests.patch \
@@ -16,8 +16,8 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
file://0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch \
"
-SRC_URI[md5sum] = "31964aa15bdea1a40c5941d4ce0962ee"
-SRC_URI[sha256sum] =
"d80dd5a76c401f4c8756dcccd999c63d7e0a3bad258d96a829055cfd86ef840b"
+SRC_URI[md5sum] = "57b0589122ec4b8d5dfb9e430a21f0b3"
+SRC_URI[sha256sum] =
"2d5a500eef412cc287d12268eed79d571e262d4957a2ec9258073f305985054f"
inherit autotools pkgconfig manpages
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] gtk+3: Upgrade 3.22.7 -> 3.22.8
Bug fix release.
Signed-off-by: Jussi Kukkonen
---
meta/recipes-gnome/gtk+/{gtk+3_3.22.7.bb => gtk+3_3.22.8.bb} | 4 ++--
...tk-icon-utils-native_3.22.7.bb => gtk-icon-utils-native_3.22.8.bb} | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-gnome/gtk+/{gtk+3_3.22.7.bb => gtk+3_3.22.8.bb} (84%)
rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.22.7.bb =>
gtk-icon-utils-native_3.22.8.bb} (93%)
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.22.7.bb
b/meta/recipes-gnome/gtk+/gtk+3_3.22.8.bb
similarity index 84%
rename from meta/recipes-gnome/gtk+/gtk+3_3.22.7.bb
rename to meta/recipes-gnome/gtk+/gtk+3_3.22.8.bb
index 6b74525..1cc57f9 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.22.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.22.8.bb
@@ -8,8 +8,8 @@ SRC_URI =
"http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
file://0003-Add-disable-opengl-configure-option.patch \
file://0004-configure.ac-Fix-wayland-protocols-path.patch \
"
-SRC_URI[md5sum] = "e05a7e8e9b89a71fd016883b5431e429"
-SRC_URI[sha256sum] =
"a3a27564bfb1679ebbc75c37cd2bcd6e727c8bdfbcd3984d29305bf9ee60d432"
+SRC_URI[md5sum] = "b4fb39a829e4425b3fa05adbe7f52fef"
+SRC_URI[sha256sum] =
"c7254a88df5c17e9609cee9e848c3d0104512707edad4c3b4f256b131f8d3af1"
S = "${WORKDIR}/gtk+-${PV}"
diff --git a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.7.bb
b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.8.bb
similarity index 93%
rename from meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.7.bb
rename to meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.8.bb
index 77bb6e7..7283418 100644
--- a/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.8.bb
@@ -10,8 +10,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI =
"http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch"
-SRC_URI[md5sum] = "e05a7e8e9b89a71fd016883b5431e429"
-SRC_URI[sha256sum] =
"a3a27564bfb1679ebbc75c37cd2bcd6e727c8bdfbcd3984d29305bf9ee60d432"
+SRC_URI[md5sum] = "b4fb39a829e4425b3fa05adbe7f52fef"
+SRC_URI[sha256sum] =
"c7254a88df5c17e9609cee9e848c3d0104512707edad4c3b4f256b131f8d3af1"
LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] libgudev: Upgrade 230 -> 231
Very small bug fix release.
Use --disable-umockdev: Testing is great but a single regression test
isn't really worth a new build dependency (that isn't in oe-core yet).
Signed-off-by: Jussi Kukkonen
---
meta/recipes-gnome/libgudev/{libgudev_230.bb => libgudev_231.bb} | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/libgudev/{libgudev_230.bb => libgudev_231.bb} (65%)
diff --git a/meta/recipes-gnome/libgudev/libgudev_230.bb
b/meta/recipes-gnome/libgudev/libgudev_231.bb
similarity index 65%
rename from meta/recipes-gnome/libgudev/libgudev_230.bb
rename to meta/recipes-gnome/libgudev/libgudev_231.bb
index 709553b..ae0f1c7 100644
--- a/meta/recipes-gnome/libgudev/libgudev_230.bb
+++ b/meta/recipes-gnome/libgudev/libgudev_231.bb
@@ -1,10 +1,12 @@
SUMMARY = "GObject wrapper for libudev"
-SRC_URI[archive.md5sum] = "e4dee8f3f349e9372213d33887819a4d"
-SRC_URI[archive.sha256sum] =
"a2e77faced0c66d7498403adefcc0707105e03db71a2b2abd620025b86347c18"
+SRC_URI[archive.md5sum] = "916c10c51ec61131e244c3936bbb2e0c"
+SRC_URI[archive.sha256sum] =
"3b1ef99d4a8984c35044103d8ddfc3cc52c80035c36abab2bcc5e3532e063f96"
DEPENDS = "glib-2.0 udev"
+EXTRA_OECONF = "--disable-umockdev"
+
RCONFLICTS_${PN} = "systemd (<= 220)"
LICENSE = "LGPLv2.1"
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] gdk-pixbuf: Upgrade 2.36.1 -> 2.36.5
Mostly bug fix releases.
Generating the thumbnailer metadata now requires running yet another
tool at build time. This is broken for cross-compiling, add a
work-around.
Add gdk-pixbuf-native to DEPENDS to make the above workaround possible:
We already build gdk-pixbuf-native anyway so this is not a huge deal.
Signed-off-by: Jussi Kukkonen
---
...-around-thumbnailer-cross-compile-failure.patch | 47 ++
.../{gdk-pixbuf_2.36.1.bb => gdk-pixbuf_2.36.5.bb} | 12 --
2 files changed, 55 insertions(+), 4 deletions(-)
create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.36.1.bb =>
gdk-pixbuf_2.36.5.bb} (88%)
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
new file mode 100644
index 000..31ed988
--- /dev/null
+++
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
@@ -0,0 +1,47 @@
+From 6646e8aadc4030d891ac27c25494e5793d59dc85 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen
+Date: Wed, 22 Feb 2017 11:24:39 +0200
+Subject: [PATCH] Work-around thumbnailer cross-compile failure
+
+Install gdk-pixbuf-print-mime-types that's needed for thumbnail
+metadata generation.
+
+Use native gdk-pixbuf-print-mime-types when generating the thumbnail
+metadata. This works but the mime types will come from native
+loader.cache (which will only contain in-tree loaders), not from the
+target loader.cache.
+
+The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057
+
+Upstream-Status: Inappropriate [workaround]
+Signed-off-by: Jussi Kukkonen
+---
+ thumbnailer/Makefile.am | 7 +++
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
+index c9fe123..b0c6c70 100644
+--- a/thumbnailer/Makefile.am
b/thumbnailer/Makefile.am
+@@ -1,5 +1,4 @@
+-bin_PROGRAMS = gdk-pixbuf-thumbnailer
+-noinst_PROGRAMS = gdk-pixbuf-print-mime-types
++bin_PROGRAMS = gdk-pixbuf-thumbnailer gdk-pixbuf-print-mime-types
+
+ gdk_pixbuf_thumbnailer_SOURCES = gdk-pixbuf-thumbnailer.c
gnome-thumbnailer-skeleton.c gnome-thumbnailer-skeleton.h
+ gdk_pixbuf_thumbnailer_CPPFLAGS = \
+@@ -25,9 +24,9 @@ gdk_pixbuf_print_mime_types_LDADD = \
+
+ thumbnailerdir = $(datadir)/thumbnailers/
+ thumbnailer_DATA = gdk-pixbuf-thumbnailer.thumbnailer
+-gdk-pixbuf-thumbnailer.thumbnailer: gdk-pixbuf-thumbnailer.thumbnailer.in
Makefile gdk-pixbuf-print-mime-types$(EXEEXT)
$(top_builddir)/gdk-pixbuf/loaders.cache
++gdk-pixbuf-thumbnailer.thumbnailer: gdk-pixbuf-thumbnailer.thumbnailer.in
Makefile gdk-pixbuf-print-mime-types$(EXEEXT)
+ $(AM_V_GEN) $(SED) -e "s|\@bindir\@|$(bindir)|"
\
+- -e
"s|\@mimetypes\@|`GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/loaders.cache
GDK_PIXBUF_PIXDATA=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-pixdata
$(builddir)/gdk-pixbuf-print-mime-types`|" \
++ -e "s|\@mimetypes\@|`gdk-pixbuf-print-mime-types`|" \
+ $< > $@
+
+ EXTRA_DIST = gdk-pixbuf-thumbnailer.thumbnailer.in
+--
+2.1.4
+
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.5.bb
similarity index 88%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.5.bb
index 98e5090..5d42697 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.5.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
SECTION = "libs"
-DEPENDS = "glib-2.0"
+DEPENDS = "glib-2.0 gdk-pixbuf-native"
MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
@@ -17,10 +17,10 @@ SRC_URI =
"${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://extending-libinstall-dependencies.patch \
file://run-ptest \
file://fatal-loader.patch \
+ file://0001-Work-around-thumbnailer-cross-compile-failure.patch \
"
-
-SRC_URI[md5sum] = "fe30b0420e013f2c4590ae6226d895d4"
-SRC_URI[sha256sum] =
"9d5ba72070460c1b5b74115d395a3e33daeb7b7b67fb256cdccc9d7187c42a38"
+SRC_URI[md5sum] = "0173fd5c11a5d2030d09201090636477"
+SRC_URI[sha256sum] =
"7ace06170291a1f21771552768bace072ecdea9bd4a02f7658939b9a314c40fc"
inherit autotools pkgconfig gettext pixbufcache ptest-gnome
upstream-version-is-even gobject-introspection gtk-doc lib_package
@@ -53,6 +53,7 @@ FILES_${PN}-bin +=
"${datadir}/thumbnailers/gdk-pixbuf-thumbnailer.thumbnailer"
FILES_${PN}-dev += " \
${bindir}/gdk-pixbuf-csource \
${bindir}/gdk-pixbuf-pixdata \
+${bindir}/gdk-pixbuf-print-mime-types \
${includedir}/* \
${
[OE-core] [PATCH 5/6] menu-cache: Upgrade 1.0.1 -> 1.0.2
Small bug fix release.
Signed-off-by: Jussi Kukkonen
---
.../menu-cache/{menu-cache_1.0.1.bb => menu-cache_1.0.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/menu-cache/{menu-cache_1.0.1.bb =>
menu-cache_1.0.2.bb} (79%)
diff --git a/meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb
b/meta/recipes-graphics/menu-cache/menu-cache_1.0.2.bb
similarity index 79%
rename from meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb
rename to meta/recipes-graphics/menu-cache/menu-cache_1.0.2.bb
index a1a8e26..71540cf 100644
--- a/meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb
+++ b/meta/recipes-graphics/menu-cache/menu-cache_1.0.2.bb
@@ -10,8 +10,8 @@ DEPENDS = "glib-2.0 libfm-extra"
SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.xz"
-SRC_URI[md5sum] = "a856ba860b16fdc8c69ee784bc4ade36"
-SRC_URI[sha256sum] =
"0ac72649919946070258320aafc320467dd040bcef7b3a225e2ab7241ddffd59"
+SRC_URI[md5sum] = "8dde7a3f5bd9798d0129d1979a5d7640"
+SRC_URI[sha256sum] =
"6f83edf2de34f83e701dcb52145d755250a5677580cd413476cc4d7f2d2012d5"
UPSTREAM_CHECK_URI =
"http://sourceforge.net/projects/lxde/files/menu-cache/1.0/";
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] State of bitbake world, Failed tasks 2017-02-22
Big thanks to Andreas who sent most of the fixes!
I've dropped only the last unblacklist for mpd which is still failing,
will try it now with unblacklist, but without the version upgrade.
== Number of issues - stats ==
{| class='wikitable'
!|Date !!colspan='3'|Failed tasks
!!colspan='6'|Failed depencencies!!|Signatures
!!colspan='12'|QA !!Comment
|-
|| ||qemuarm ||qemux86 ||qemux86_64
||qemuarm||max||min ||qemux86||max||min ||all ||already-stripped
||libdir||textrel ||build-deps||file-rdeps
||version-going-backwards ||host-user-contaminated
||installed-vs-shipped ||unknown-configure-option ||symlink-to-sysroot
||invalid-pkgconfig ||pkgname ||
|-
||2017-02-22||4 ||3 ||2 ||N/A ||N/A ||N/A ||N/A ||N/A
||N/A ||0 ||0 ||0 ||0 ||0
||0 ||112 ||0 ||0 ||0
||0 ||0 ||0 ||
|}
http://www.openembedded.org/wiki/Bitbake_World_Status
== Failed tasks 2017-02-22 ==
INFO: jenkins-job.sh-1.8.18 Complete log available at
http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.report.20170222_030938.log
=== common (2) ===
*
openembedded-core/meta/recipes-extended/parted/parted_3.2.bb:do_compile_ptest_base
*
openembedded-core/meta/recipes-support/apr/apr_1.5.2.bb:do_compile_ptest_base
=== common-x86 (0) ===
=== qemuarm (2) ===
*
meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.4.bb:do_compile
*
meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb:do_compile
=== qemux86 (1) ===
*
meta-browser/recipes-browser/chromium/chromium-wayland_53.0.2785.143.bb:do_compile
=== qemux86_64 (0) ===
=== Number of failed tasks (9) ===
{| class=wikitable
|-
|| qemuarm || 4 ||
http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.world.qemuarm.20170222_001759.log/
|| http://errors.yoctoproject.org/Errors/Build/32807/
|-
|| qemux86 || 3 ||
http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.world.qemux86.20170222_001805.log/
|| http://errors.yoctoproject.org/Errors/Build/32808/
|-
|| qemux86_64 || 2 ||
http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.world.qemux86-64.20170222_014051.log/
|| http://errors.yoctoproject.org/Errors/Build/32809/
|}
=== PNBLACKLISTs (381) ===
=== QA issues (112) ===
{| class=wikitable
!| Count||Issue
|-
||0 ||already-stripped
|-
||0 ||build-deps
|-
||0 ||file-rdeps
|-
||0 ||host-user-contaminated
|-
||0 ||installed-vs-shipped
|-
||0 ||invalid-pkgconfig
|-
||0 ||libdir
|-
||0 ||pkgname
|-
||0 ||symlink-to-sysroot
|-
||0 ||textrel
|-
||0 ||unknown-configure-option
|-
||112 ||version-going-backwards
|}
=== Incorrect PACKAGE_ARCH or sstate signatures (0) ===
Complete log:
http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.signatures.20170222_013010.log/
No issues detected
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] initscripts/sysfs.sh: mount configfs if present
configfs is another kernel virtual file system that should be mounted if configured, so if it's configured into the kernel, mount it. It is used to configure e.g. USB gadget mode and devicetree overlays. Signed-off-by: Mike Looijmans --- meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh index 0a52c90..f5b5b99 100644 --- a/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh @@ -22,6 +22,10 @@ if [ -e /sys/kernel/debug ] && grep -q debugfs /proc/filesystems; then mount -t debugfs debugfs /sys/kernel/debug fi +if [ -e /sys/kernel/config ] && grep -q configfs /proc/filesystems; then + mount -t configfs configfs /sys/kernel/config +fi + if ! [ -e /dev/zero ] && [ -e /dev ] && grep -q devtmpfs /proc/filesystems; then mount -n -t devtmpfs devtmpfs /dev fi -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] image_types_wic: fix expansion error
Variable WKS_SEARCH_PATH was not fully expanded when used directly
in this expression:
WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(),
'${WKS_SEARCH_PATH}') or ''}"
This caused expansion error: bb.data_smart.ExpansionError:
Failure expanding variable WKS_FULL_PATH, which triggered exception
SyntaxError: invalid syntax (WKS_FULL_PATH, line 1)
Calling d.getVar instead of directly referencing variables
should fix the issue.
Signed-off-by: Ed Bartosh
---
meta/classes/image_types_wic.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/image_types_wic.bbclass
b/meta/classes/image_types_wic.bbclass
index 43b2917..500c8c5 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -8,7 +8,7 @@ WICVARS ?= "\
WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks"
WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks"
WKS_SEARCH_PATH ?= "${THISDIR}:${@':'.join('%s/wic' % p for p in
'${BBPATH}'.split(':'))}:${@':'.join('%s/scripts/lib/wic/canned-wks' % l for l
in '${BBPATH}:${COREBASE}'.split(':'))}"
-WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(), '${WKS_SEARCH_PATH}')
or ''}"
+WKS_FULL_PATH = "${@wks_search(d.getVar('WKS_FILES').split(),
d.getVar('WKS_SEARCH_PATH')) or ''}"
def wks_search(files, search_path):
for f in files:
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] pulseaudio: 9.0 -> 10.0
On 3 February 2017 at 07:06, Tanu Kaskinen wrote: > Relase notes: > https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/10.0/ > I'm seeing a new warning now: WARNING: pulseaudio-10.0-r0 do_package_qa: QA Issue: ELF binary '/data/poky-master/tmp-glibc/work/corei7-64-poky-linux/pulseaudio/10.0-r0/packages-split/pulseaudio-server/usr/bin/pulseaudio' has relocations in .text [textrel] Would you be able to identify where this comes from? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/24] Recipe updates and version check fixes
I've skipped openssl 1.1 update
(https://bugzilla.yoctoproject.org/show_bug.cgi?id=11091)
and gperf 3.1 update (incompatible with latest libcap 2.25).
The following changes since commit f04f4981c1309f07b569dc953f9b2f25695eb58f:
wget.py: match .lz tarballs as well when determining latest version
(2017-02-21 13:36:01 +0200)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib akanavin/package-version-updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates
Alexander Kanavin (24):
ruby: fix upstream version check
zlib: fix upstream version check
kconfig-frontends: fetch source from git
sysprof: inherit upstream-version-is-even
libepoxy: fix upstream version check
libva: fix upstream version check
babeltrace: update to 1.5.2
bash-completion: update to 2.5
boost: update to 1.63.0
btrfs-tools: update to 4.9.1
cmake: update to 3.7.2
lzip: add a recipe from meta-oe
ed: update to 1.14.1
webkitgtk: update to 2.14.5
epiphany: update to 3.22.6
ffmpeg: update to 3.2.4
gnutls: update to 3.5.9
iso-codes: update to 3.74
kbd: update to 2.0.4
libiconv: remove recipe
libnl: update to 3.2.29
libwebp: update to 0.6.0
nss: update to 3.28.1
systemtap: update to 3.1
.../kbd/{kbd_2.0.3.bb => kbd_2.0.4.bb} |4 +-
meta/recipes-core/zlib/zlib_1.2.8.bb |1 +
.../{btrfs-tools_4.8.5.bb => btrfs-tools_4.9.1.bb} |2 +-
...cmake-native_3.7.1.bb => cmake-native_3.7.2.bb} |0
meta/recipes-devtools/cmake/cmake.inc |4 +-
.../cmake/{cmake_3.7.1.bb => cmake_3.7.2.bb} |0
.../kconfig-frontends_3.12.0.0.bb |9 +-
meta/recipes-devtools/ruby/ruby.inc|1 +
.../ed/{ed_1.9.bb => ed_1.14.1.bb} | 12 +-
meta/recipes-extended/lzip/lzip_1.18.bb| 41 +
.../{epiphany_3.22.3.bb => epiphany_3.22.6.bb} |4 +-
meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb |1 +
meta/recipes-graphics/libva/libva_1.7.3.bb |1 +
.../{babeltrace_1.5.1.bb => babeltrace_1.5.2.bb} |4 +-
meta/recipes-kernel/sysprof/sysprof_3.22.3.bb |2 +-
...configure-write-a-python-location-into-th.patch | 25 +
.../systemtap/systemtap/fix-monitor-linking.patch | 41 -
.../systemtap/systemtap/monitor-option.patch | 26 +-
.../systemtap/systemtap/no-msgfmt-check.patch | 22 +-
.../systemtap/obsolete_automake_macros.patch | 15 -
meta/recipes-kernel/systemtap/systemtap_git.bb |9 +-
meta/recipes-kernel/systemtap/systemtap_git.inc|7 +-
.../ffmpeg/{ffmpeg_3.2.2.bb => ffmpeg_3.2.4.bb}|4 +-
.../webp/{libwebp_0.5.1.bb => libwebp_0.6.0.bb}|4 +-
.../{webkitgtk_2.14.2.bb => webkitgtk_2.14.5.bb} |4 +-
...sh-completion_2.4.bb => bash-completion_2.5.bb} |4 +-
...bjam-native_1.62.0.bb => bjam-native_1.63.0.bb} |0
.../boost/{boost-1.62.0.inc => boost-1.63.0.inc} |4 +-
...soft-float-on-ARM-we-should-not-expect-th.patch | 29 +
...execution_monitor.hpp-fix-mips-soft-float.patch | 145 -
.../boost/boost/consider-hardfp.patch | 19 -
.../boost/{boost_1.62.0.bb => boost_1.63.0.bb} |3 +-
...cli-args.h-to-cli-args.stamp-Makefile-tar.patch | 27 -
.../gnutls/0001-configure.ac-fix-sed-command.patch | 26 +-
.../gnutls/{gnutls_3.5.7.bb => gnutls_3.5.9.bb}|5 +-
.../{iso-codes_3.72.bb => iso-codes_3.74.bb} |4 +-
.../libiconv/libiconv-1.11.1/autoconf.patch| 50 -
.../shared_preloadable_libiconv_linux.patch| 26 -
.../libiconv-1.14/add-relocatable-module.patch | 5008
.../libiconv/libiconv-1.14/autoconf.patch | 50 -
meta/recipes-support/libiconv/libiconv_1.11.1.bb | 47 -
meta/recipes-support/libiconv/libiconv_1.14.bb | 51 -
...01-lib-add-utility-function-nl_strerror_l.patch | 146 -
...to-using-strerror_l-instead-of-strerror_r.patch | 403 --
...to-using-strerror_l-instead-of-strerror_r.patch | 82 -
.../libnl/{libnl_3.2.28.bb => libnl_3.2.29.bb} |7 +-
... => 0001-nss-fix-support-cross-compiling.patch} | 51 +-
.../nss/{nss_3.27.1.bb => nss_3.28.1.bb} |8 +-
48 files changed, 215 insertions(+), 6223 deletions(-)
rename meta/recipes-core/kbd/{kbd_2.0.3.bb => kbd_2.0.4.bb} (92%)
rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.8.5.bb =>
btrfs-tools_4.9.1.bb} (95%)
rename meta/recipes-devtools/cmake/{cmake-native_3.7.1.bb =>
cmake-native_3.7.2.bb} (100%)
rename meta/recipes-devtools/cmake/{cmake_3.7.1.bb => cmake_3.7.2.bb} (100%)
rename meta/recipes-extended/ed/{ed_1.9.bb => ed_1.14.1.bb} (51%)
create mode 100644 meta/recipes-extended/lzip/lzip_1.18.bb
rename meta/recipes-gnome/epiphany/{epiphany_3.22.3.bb => epiphany_3.22.6.bb}
(83%)
rename meta/recipes-kernel/lttng/{babeltrace_1.5.1.bb => babeltrace_1.5.2.bb}
(82%)
create mode 100644
meta/recipes-kernel/systemtap/s
[OE-core] [PATCH 03/24] kconfig-frontends: fetch source from git
This is where development happens; tarballs are no longer produced.
Signed-off-by: Alexander Kanavin
---
.../kconfig-frontends/kconfig-frontends_3.12.0.0.bb | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb
b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb
index 09e10c9e0e0..4ca0e4da3ae 100644
--- a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb
+++ b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb
@@ -13,14 +13,15 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408"
SECTION = "devel"
DEPENDS += "ncurses flex bison gperf-native"
RDEPENDS_${PN} += "python bash"
-SRC_URI = "http://ymorin.is-a-geek.org/download/${BPN}/${BP}.tar.xz";
+SRC_URI = "git://ymorin.is-a-geek.org/kconfig-frontends"
-SRC_URI[md5sum] = "b939280dcc83f8feabd87a1d5f9b00c2"
-SRC_URI[sha256sum] =
"ea2615a62c74bea6ce3b38402f00c7513858f307f6ba7aa9fdbf0bbc12bcf407"
+SRCREV = "75d35b172fc0f7b6620dd659af41f2ce04edc4e6"
+
+S = "${WORKDIR}/git"
inherit autotools pkgconfig
do_configure_prepend () {
- mkdir -p scripts/.autostuff/m4
+ mkdir -p ${S}/scripts/.autostuff/m4
}
do_install_append() {
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/24] ruby: fix upstream version check
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/ruby/ruby.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-devtools/ruby/ruby.inc
b/meta/recipes-devtools/ruby/ruby.inc
index f38ebb0a151..e24ae24187d 100644
--- a/meta/recipes-devtools/ruby/ruby.inc
+++ b/meta/recipes-devtools/ruby/ruby.inc
@@ -22,6 +22,7 @@ SRC_URI =
"http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
file://extmk.patch \
file://0002-Obey-LDFLAGS-for-the-link-of-libruby.patch \
"
+UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/";
inherit autotools
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/24] sysprof: inherit upstream-version-is-even
It is a gnome project, and so is subject to same versioning convention. Signed-off-by: Alexander Kanavin --- meta/recipes-kernel/sysprof/sysprof_3.22.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/sysprof/sysprof_3.22.3.bb b/meta/recipes-kernel/sysprof/sysprof_3.22.3.bb index e1033ca07ca..26310634c64 100644 --- a/meta/recipes-kernel/sysprof/sysprof_3.22.3.bb +++ b/meta/recipes-kernel/sysprof/sysprof_3.22.3.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875" -inherit gnomebase gettext systemd +inherit gnomebase gettext systemd upstream-version-is-even DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/24] zlib: fix upstream version check
Signed-off-by: Alexander Kanavin
---
meta/recipes-core/zlib/zlib_1.2.8.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-core/zlib/zlib_1.2.8.bb
b/meta/recipes-core/zlib/zlib_1.2.8.bb
index 913c7033d44..06d1d21d516 100644
--- a/meta/recipes-core/zlib/zlib_1.2.8.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.8.bb
@@ -12,6 +12,7 @@ SRC_URI =
"${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \
file://ldflags-tests.patch \
file://run-ptest \
"
+UPSTREAM_CHECK_URI = "http://zlib.net/";
SRC_URI[md5sum] = "28f1205d8dd2001f26fec1e8c2cebe37"
SRC_URI[sha256sum] =
"831df043236df8e9a7667b9e3bb37e1fcb1220a0f163b6de2626774b9590d057"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/24] libepoxy: fix upstream version check
Signed-off-by: Alexander Kanavin
---
meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb
b/meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb
index 4d52f126ffa..199e7dc556b 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
SRC_URI =
"https://github.com/anholt/${BPN}/releases/download/v1.4/${BP}.tar.xz";
SRC_URI[md5sum] = "d8d8cbf2beb64975d424fcc5167a2a38"
SRC_URI[sha256sum] =
"25a906b14a921bc2b488cfeaa21a00486fe92630e4a9dd346e4ecabeae52ab41"
+UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases";
inherit autotools pkgconfig distro_features_check
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/24] libva: fix upstream version check
Signed-off-by: Alexander Kanavin
---
meta/recipes-graphics/libva/libva_1.7.3.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-graphics/libva/libva_1.7.3.bb
b/meta/recipes-graphics/libva/libva_1.7.3.bb
index a7b4b90a062..982b48ce943 100644
--- a/meta/recipes-graphics/libva/libva_1.7.3.bb
+++ b/meta/recipes-graphics/libva/libva_1.7.3.bb
@@ -19,6 +19,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
SRC_URI = "git://github.com/01org/libva.git;protocol=http;branch=v1.7-branch"
SRCREV = "dbf9f7e33349c3cee8d131e93a6a4f91255635cb"
+UPSTREAM_CHECK_GITTAGREGEX = "libva-(?P(\d+(\.\d+)+))"
S = "${WORKDIR}/git"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/24] btrfs-tools: update to 4.9.1
Signed-off-by: Alexander Kanavin
---
.../btrfs-tools/{btrfs-tools_4.8.5.bb => btrfs-tools_4.9.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_4.8.5.bb =>
btrfs-tools_4.9.1.bb} (95%)
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.8.5.bb
b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.9.1.bb
similarity index 95%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_4.8.5.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_4.9.1.bb
index 7047c434024..2c7b7ea6852 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.8.5.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.9.1.bb
@@ -13,7 +13,7 @@ SECTION = "base"
DEPENDS = "util-linux attr e2fsprogs lzo acl udev"
RDEPENDS_${PN} = "libgcc"
-SRCREV = "144a19145e248513c7a676defad59836830535c6"
+SRCREV = "96485c34ac0329fb0073476f16d2083c64701f29"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
\
"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/24] boost: update to 1.63.0
Drop backported 0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch
Rebase consider-hardfp.patch to
0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch
Signed-off-by: Alexander Kanavin
---
...bjam-native_1.62.0.bb => bjam-native_1.63.0.bb} | 0
.../boost/{boost-1.62.0.inc => boost-1.63.0.inc} | 4 +-
...soft-float-on-ARM-we-should-not-expect-th.patch | 29 +
...execution_monitor.hpp-fix-mips-soft-float.patch | 145 -
.../boost/boost/consider-hardfp.patch | 19 ---
.../boost/{boost_1.62.0.bb => boost_1.63.0.bb} | 3 +-
6 files changed, 32 insertions(+), 168 deletions(-)
rename meta/recipes-support/boost/{bjam-native_1.62.0.bb =>
bjam-native_1.63.0.bb} (100%)
rename meta/recipes-support/boost/{boost-1.62.0.inc => boost-1.63.0.inc} (84%)
create mode 100644
meta/recipes-support/boost/boost/0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch
delete mode 100644
meta/recipes-support/boost/boost/0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch
delete mode 100644 meta/recipes-support/boost/boost/consider-hardfp.patch
rename meta/recipes-support/boost/{boost_1.62.0.bb => boost_1.63.0.bb} (82%)
diff --git a/meta/recipes-support/boost/bjam-native_1.62.0.bb
b/meta/recipes-support/boost/bjam-native_1.63.0.bb
similarity index 100%
rename from meta/recipes-support/boost/bjam-native_1.62.0.bb
rename to meta/recipes-support/boost/bjam-native_1.63.0.bb
diff --git a/meta/recipes-support/boost/boost-1.62.0.inc
b/meta/recipes-support/boost/boost-1.63.0.inc
similarity index 84%
rename from meta/recipes-support/boost/boost-1.62.0.inc
rename to meta/recipes-support/boost/boost-1.63.0.inc
index 1138de61f13..1c1563050c3 100644
--- a/meta/recipes-support/boost/boost-1.62.0.inc
+++ b/meta/recipes-support/boost/boost-1.63.0.inc
@@ -13,8 +13,8 @@ BOOST_P = "boost_${BOOST_VER}"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2"
-SRC_URI[md5sum] = "5fb94629535c19e48703bdb2b2e9490f"
-SRC_URI[sha256sum] =
"36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0"
+SRC_URI[md5sum] = "1c837ecd990bb022d07e7aab32b09847"
+SRC_URI[sha256sum] =
"beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0"
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/boost/files/";
diff --git
a/meta/recipes-support/boost/boost/0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch
b/meta/recipes-support/boost/boost/0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch
new file mode 100644
index 000..bafd5ce001e
--- /dev/null
+++
b/meta/recipes-support/boost/boost/0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch
@@ -0,0 +1,29 @@
+From 9ab0914207e6d0e6b75ce12147c54b96478feb64 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Tue, 21 Feb 2017 12:50:35 +0200
+Subject: [PATCH] When using soft-float, on ARM we should not expect the FE_*
+ symbols
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj
+Signed-off-by: Alexander Kanavin
+---
+ boost/test/execution_monitor.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/boost/test/execution_monitor.hpp
b/boost/test/execution_monitor.hpp
+index f53348a..86252d7 100644
+--- a/boost/test/execution_monitor.hpp
b/boost/test/execution_monitor.hpp
+@@ -498,7 +498,7 @@ enum masks {
+
+ BOOST_FPE_ALL = MCW_EM,
+
+-#elif defined(BOOST_NO_FENV_H) || defined(BOOST_CLANG) /* *** */
++#elif defined(BOOST_NO_FENV_H) || defined(BOOST_CLANG) || defined(__ARM_PCS)
/* *** */
+ BOOST_FPE_ALL = BOOST_FPE_OFF,
+
+ #else /* *** */
+--
+2.11.0
+
diff --git
a/meta/recipes-support/boost/boost/0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch
b/meta/recipes-support/boost/boost/0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch
deleted file mode 100644
index 569c987336f..000
---
a/meta/recipes-support/boost/boost/0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 5c349a1c391c9ce171a1c80f5164fae764f27dba Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andr=C3=A9=20Draszik?=
-Date: Wed, 24 Aug 2016 20:58:59 +0100
-Subject: [PATCH 2/4] boost/test/execution_monitor.hpp: fix mips soft float
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-gcc.compile.c++
/boost/bin.v2/libs/test/build/gcc-4.3.1/release/threading-multi/execution_monitor.o
-
-"mipsel-poky-linux-musl-g++" "-mel" "-mabi=32" "-msoft-float"
"-march=mips32r2" "-mips16" "-minterlink-compressed" "-mtune=24kec" "-mdsp"
"-Wl,-O1" "-Wl,--as-needed" "-fstack-protector-strong" "-Wl,-z,relro,-z,now"
"--sysroot=" -ftemplate-depth-128 -O2 -pipe -g
-feliminate-unused-debug-types
-fdebug-prefix-map==/usr/src/debug/boost/1.61.0-r0
-fdebug-prefix-map== -fdebug-prefix-map==
-fstack-protector-strong -pie -fpie -D_FORTIFY_SOURCE=2 -Wformat
-Wformat-security -Werror=format-security -fv
[OE-core] [PATCH 07/24] babeltrace: update to 1.5.2
Signed-off-by: Alexander Kanavin
---
.../recipes-kernel/lttng/{babeltrace_1.5.1.bb => babeltrace_1.5.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-kernel/lttng/{babeltrace_1.5.1.bb => babeltrace_1.5.2.bb}
(82%)
diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.1.bb
b/meta/recipes-kernel/lttng/babeltrace_1.5.2.bb
similarity index 82%
rename from meta/recipes-kernel/lttng/babeltrace_1.5.1.bb
rename to meta/recipes-kernel/lttng/babeltrace_1.5.2.bb
index c22b3a01b4a..c7ea5c1ba41 100644
--- a/meta/recipes-kernel/lttng/babeltrace_1.5.1.bb
+++ b/meta/recipes-kernel/lttng/babeltrace_1.5.2.bb
@@ -15,5 +15,5 @@ SRC_URI =
"http://www.efficios.com/files/babeltrace/babeltrace-${PV}.tar.bz2 \
EXTRA_OECONF = "--disable-debug-info"
-SRC_URI[md5sum] = "3f7d29ba2821a966d24759a928a15cdf"
-SRC_URI[sha256sum] =
"379e96f1cf867f0a198cf1c315c52ec7d7ad67898402bbe22d1404fc38d19d98"
+SRC_URI[md5sum] = "1176e7f69e128112d5f29fefec39c6ce"
+SRC_URI[sha256sum] =
"696ee46e5750ab57a258663e73915d2901b7cd4fc53b06eb3f7a0d7b1012fa56"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/24] cmake: update to 3.7.2
Signed-off-by: Alexander Kanavin
---
.../cmake/{cmake-native_3.7.1.bb => cmake-native_3.7.2.bb}| 0
meta/recipes-devtools/cmake/cmake.inc | 4 ++--
meta/recipes-devtools/cmake/{cmake_3.7.1.bb => cmake_3.7.2.bb}| 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/cmake/{cmake-native_3.7.1.bb =>
cmake-native_3.7.2.bb} (100%)
rename meta/recipes-devtools/cmake/{cmake_3.7.1.bb => cmake_3.7.2.bb} (100%)
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.7.1.bb
b/meta/recipes-devtools/cmake/cmake-native_3.7.2.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.7.1.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.7.2.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc
b/meta/recipes-devtools/cmake/cmake.inc
index 18e547de0cc..131ff70e584 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -17,8 +17,8 @@ SRC_URI =
"https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
file://avoid-gcc-warnings-with-Wstrict-prototypes.patch \
"
-SRC_URI[md5sum] = "d031d5a06e9f1c5367cdfc56fbd2a1c8"
-SRC_URI[sha256sum] =
"449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1"
+SRC_URI[md5sum] = "79bd7e65cd81ea3aa2619484ad6ff25a"
+SRC_URI[sha256sum] =
"dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0"
UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/cmake/cmake_3.7.1.bb
b/meta/recipes-devtools/cmake/cmake_3.7.2.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.7.1.bb
rename to meta/recipes-devtools/cmake/cmake_3.7.2.bb
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/24] bash-completion: update to 2.5
Signed-off-by: Alexander Kanavin
---
.../{bash-completion_2.4.bb => bash-completion_2.5.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/bash-completion/{bash-completion_2.4.bb =>
bash-completion_2.5.bb} (88%)
diff --git a/meta/recipes-support/bash-completion/bash-completion_2.4.bb
b/meta/recipes-support/bash-completion/bash-completion_2.5.bb
similarity index 88%
rename from meta/recipes-support/bash-completion/bash-completion_2.4.bb
rename to meta/recipes-support/bash-completion/bash-completion_2.5.bb
index 42719f14367..dd22857a70c 100644
--- a/meta/recipes-support/bash-completion/bash-completion_2.4.bb
+++ b/meta/recipes-support/bash-completion/bash-completion_2.5.bb
@@ -9,8 +9,8 @@ SECTION = "console/utils"
SRC_URI =
"https://github.com/scop/bash-completion/releases/download/${PV}/${BPN}-${PV}.tar.xz";
-SRC_URI[md5sum] = "1ea94864fb2b2446fbbdf82f10bd25df"
-SRC_URI[sha256sum] =
"c0f76b5202fec9ef8ffba82f5605025ca003f27cfd7a85115f838ba5136890f6"
+SRC_URI[md5sum] = "15300010bd4034de12c3fc4f171692e3"
+SRC_URI[sha256sum] =
"b0b9540c65532825eca030f1241731383f89b2b65e80f3492c5dd2f0438c95cf"
UPSTREAM_CHECK_REGEX = "bash-completion-(?P(?!2008).+)\.tar"
UPSTREAM_CHECK_URI = "https://github.com/scop/bash-completion/releases";
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/24] lzip: add a recipe from meta-oe
ed tarballs are now available only in .lz format, which saves them
an amazing 30 kilobytes over gz.
Signed-off-by: Alexander Kanavin
---
meta/recipes-extended/lzip/lzip_1.18.bb | 41 +
1 file changed, 41 insertions(+)
create mode 100644 meta/recipes-extended/lzip/lzip_1.18.bb
diff --git a/meta/recipes-extended/lzip/lzip_1.18.bb
b/meta/recipes-extended/lzip/lzip_1.18.bb
new file mode 100644
index 000..30c7dd5a6d2
--- /dev/null
+++ b/meta/recipes-extended/lzip/lzip_1.18.bb
@@ -0,0 +1,41 @@
+SUMMARY = "Lossless data compressor based on the LZMA algorithm"
+HOMEPAGE = "http://lzip.nongnu.org/lzip.html";
+SECTION = "console/utils"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \
+
file://decoder.cc;beginline=3;endline=16;md5=db09fe3f9573f94d0076f7f07959e6e1"
+
+SRC_URI = "${SAVANNAH_GNU_MIRROR}/lzip/lzip-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "3838567460ce4a10143de4bccc64fe1c"
+SRC_URI[sha256sum] =
"47f9882a104ab05532f467a7b8f4ddbb898fa2f1e8d9d468556d6c2d04db14dd"
+
+CONFIGUREOPTS = "\
+'--srcdir=${S}' \
+'--prefix=${prefix}' \
+'--exec-prefix=${exec_prefix}' \
+'--bindir=${bindir}' \
+'--datadir=${datadir}' \
+'--infodir=${infodir}' \
+'--sysconfdir=${sysconfdir}' \
+'CXX=${CXX}' \
+'CPPFLAGS=${CPPFLAGS}' \
+'CXXFLAGS=${CXXFLAGS}' \
+'LDFLAGS=${LDFLAGS}' \
+"
+EXTRA_OEMAKE = ""
+
+B = "${S}/obj"
+do_configure () {
+${S}/configure ${CONFIGUREOPTS}
+}
+
+do_install () {
+oe_runmake 'DESTDIR=${D}' install
+# Info dir listing isn't interesting at this point so remove it if it
exists.
+if [ -e "${D}${infodir}/dir" ]; then
+rm -f ${D}${infodir}/dir
+fi
+}
+
+BBCLASSEXTEND += "native nativesdk"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 14/24] webkitgtk: update to 2.14.5
Signed-off-by: Alexander Kanavin
---
meta/recipes-sato/webkit/{webkitgtk_2.14.2.bb => webkitgtk_2.14.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-sato/webkit/{webkitgtk_2.14.2.bb => webkitgtk_2.14.5.bb}
(97%)
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.14.2.bb
b/meta/recipes-sato/webkit/webkitgtk_2.14.5.bb
similarity index 97%
rename from meta/recipes-sato/webkit/webkitgtk_2.14.2.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.14.5.bb
index 6338101395a..8e79ef1f82a 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.14.2.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.14.5.bb
@@ -23,8 +23,8 @@ SRC_URI =
"http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
file://x32_support.patch \
"
-SRC_URI[md5sum] = "2fe3cadbc546d93ca68a13756c2be015"
-SRC_URI[sha256sum] =
"2edbcbd5105046aea55af9671c4de8deedb5b0e3567c618034d440a760675556"
+SRC_URI[md5sum] = "7fe3cb2699e64f969b285823c5ae2516"
+SRC_URI[sha256sum] =
"3ca8f1c33a9b43d6c753dcac1c0788656930e06382b10fdf5c2805ea8f96369f"
inherit cmake pkgconfig gobject-introspection perlnative distro_features_check
upstream-version-is-even gtk-doc
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 13/24] ed: update to 1.14.1
Revert to the upstream server, now that we can handle .lz files.
License checksum changes are due to copyright years.
Signed-off-by: Alexander Kanavin
---
meta/recipes-extended/ed/{ed_1.9.bb => ed_1.14.1.bb} | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
rename meta/recipes-extended/ed/{ed_1.9.bb => ed_1.14.1.bb} (51%)
diff --git a/meta/recipes-extended/ed/ed_1.9.bb
b/meta/recipes-extended/ed/ed_1.14.1.bb
similarity index 51%
rename from meta/recipes-extended/ed/ed_1.9.bb
rename to meta/recipes-extended/ed/ed_1.14.1.bb
index 83c31fc6db7..5d89a87805b 100644
--- a/meta/recipes-extended/ed/ed_1.9.bb
+++ b/meta/recipes-extended/ed/ed_1.14.1.bb
@@ -2,19 +2,19 @@ SUMMARY = "Line-oriented text editor"
HOMEPAGE = "http://www.gnu.org/software/ed/";
LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
-
file://ed.h;endline=20;md5=375a20cc2545ac1115eeb7b323c60ae3 \
-
file://main.c;endline=17;md5=14dbb325c1f2d4daf50e0aa5c5038e96"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7 \
+
file://ed.h;endline=20;md5=4e36b7a40e137f42aee718165590d125 \
+
file://main.c;endline=17;md5=c5b8f78f115df187af76868a2aead16a"
SECTION = "base"
# LSB states that ed should be in /bin/
bindir = "${base_bindir}"
-SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/${BP}.tar.gz";
+SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.lz"
-SRC_URI[md5sum] = "565b6d1d5a9a8816b9b304fc4ed9405d"
-SRC_URI[sha256sum] =
"d5b372cfadf073001823772272fceac2cfa87552c5cd5a8efc1c8aae61f45a88"
+SRC_URI[md5sum] = "7f4a54fa7f366479f03654b8af645fd0"
+SRC_URI[sha256sum] =
"ffb97eb8f2a2b5a71a9b97e3872adce953aa1b8958e04c5b7bf11d556f32552a"
EXTRA_OEMAKE = "-e MAKEFLAGS="
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 17/24] gnutls: update to 3.5.9
Drop 0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch, it's
merged upstream.
Rebase 0001-configure.ac-fix-sed-command.patch.
Signed-off-by: Alexander Kanavin
---
...cli-args.h-to-cli-args.stamp-Makefile-tar.patch | 27 --
.../gnutls/0001-configure.ac-fix-sed-command.patch | 26 ++---
.../gnutls/{gnutls_3.5.7.bb => gnutls_3.5.9.bb}| 5 ++--
3 files changed, 15 insertions(+), 43 deletions(-)
delete mode 100644
meta/recipes-support/gnutls/gnutls/0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch
rename meta/recipes-support/gnutls/{gnutls_3.5.7.bb => gnutls_3.5.9.bb} (52%)
diff --git
a/meta/recipes-support/gnutls/gnutls/0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch
b/meta/recipes-support/gnutls/gnutls/0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch
deleted file mode 100644
index 099081022db..000
---
a/meta/recipes-support/gnutls/gnutls/0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 68ef47ab3472472780939671731c295481b5535f Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin
-Date: Wed, 14 Dec 2016 17:42:45 +0200
-Subject: [PATCH] Do not add cli-args.h to cli-args.stamp Makefile target
-
-Upstream-Status: Submitted [https://gitlab.com/gnutls/gnutls/issues/155]
-Signed-off-by: Alexander Kanavin
- src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 49d3af3..827638e 100644
a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -261,7 +261,7 @@ cli-debug-args.stamp: $(srcdir)/cli-debug-args.def
$(srcdir)/args-std.def
-
- cli-args.h: cli-args.stamp
- cli-args.c: cli-args.stamp
--cli-args.stamp cli-args.h: $(srcdir)/cli-args.def $(srcdir)/args-std.def
-+cli-args.stamp: $(srcdir)/cli-args.def $(srcdir)/args-std.def
- -$(AUTOGEN) $<
- touch $@
-
---
-2.10.2
-
diff --git
a/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
b/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
index c5b95eb5bfb..f0b7ca2ec84 100644
--- a/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
+++ b/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
@@ -1,6 +1,6 @@
-From 67c638c7e209554d9b19627e9402a20fdabead21 Mon Sep 17 00:00:00 2001
+From eaab55bb6d48643163eebbc9ca575a9ca2a8e03f Mon Sep 17 00:00:00 2001
From: Alexander Kanavin
-Date: Fri, 4 Dec 2015 13:19:28 +0200
+Date: Tue, 21 Feb 2017 17:10:07 +0200
Subject: [PATCH] configure.ac: fix sed command
The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors
@@ -15,18 +15,18 @@ Signed-off-by: Alexander Kanavin
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index e634236..dc9e6a8 100644
+index 6907b21..7c70d9e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -549,7 +549,7 @@ if test "$enable_tools" != "no" || test "$enable_doc" !=
"no"; then
- dnl replace libopts-generated files with distributed backups,
if present
- missing_baks=
- for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak;
do
-- nam=`echo $i|sed 's/.bak//g'`
-+nam=`echo $i|sed 's/\.bak$//'`
- if test -f $i;then
- cp -f $i $nam
- else
+@@ -948,7 +948,7 @@ YEAR=`date +%Y`
+ AC_SUBST([YEAR], $YEAR)
+
+ for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
+- nam=$(basename $i|sed 's/.bak//g')
++ nam=$(basename $i|sed 's/\.bak$//')
+ if test "$create_libopts_links" = "yes";then
+ rm -f "src/$nam"
+ AC_CONFIG_LINKS([src/$nam:$i])
--
-2.6.2
+2.11.0
diff --git a/meta/recipes-support/gnutls/gnutls_3.5.7.bb
b/meta/recipes-support/gnutls/gnutls_3.5.9.bb
similarity index 52%
rename from meta/recipes-support/gnutls/gnutls_3.5.7.bb
rename to meta/recipes-support/gnutls/gnutls_3.5.9.bb
index 9508a8edcf5..8f84dbbf495 100644
--- a/meta/recipes-support/gnutls/gnutls_3.5.7.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.5.9.bb
@@ -3,9 +3,8 @@ require gnutls.inc
SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
file://0001-configure.ac-fix-sed-command.patch \
file://use-pkg-config-to-locate-zlib.patch \
-
file://0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch \
file://arm_eabi.patch \
"
-SRC_URI[md5sum] = "08ad2c539bc1d91283f610539deef34e"
-SRC_URI[sha256sum] =
"60cbfc119e6268cfa38d712621daa473298a0c5b129c0842caec4c1ed4d7861a"
+SRC_URI[md5sum] = "0ab25eb6a1509345dd085bc21a387951"
+SRC_URI[sha256sum] =
"82b10f0c4ef18f4e64ad8cef5dbaf14be732f5095a41cf366b4ecb4050382951"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
[OE-core] [PATCH 18/24] iso-codes: update to 3.74
Signed-off-by: Alexander Kanavin
---
.../iso-codes/{iso-codes_3.72.bb => iso-codes_3.74.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/iso-codes/{iso-codes_3.72.bb => iso-codes_3.74.bb}
(76%)
diff --git a/meta/recipes-support/iso-codes/iso-codes_3.72.bb
b/meta/recipes-support/iso-codes/iso-codes_3.74.bb
similarity index 76%
rename from meta/recipes-support/iso-codes/iso-codes_3.72.bb
rename to meta/recipes-support/iso-codes/iso-codes_3.74.bb
index 8fe7ad2512a..c436a1dd2bc 100644
--- a/meta/recipes-support/iso-codes/iso-codes_3.72.bb
+++ b/meta/recipes-support/iso-codes/iso-codes_3.74.bb
@@ -3,8 +3,8 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SRC_URI =
"https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-${PV}.tar.xz";
-SRC_URI[md5sum] = "423fdab41c2c40555b2edaddd64f129e"
-SRC_URI[sha256sum] =
"d0bd4785c3ec564a966c5792a4e15d119bf1c4dda10e2e60ce9107da1acc44c7"
+SRC_URI[md5sum] = "d5448475d087756b78391b8c53c5b83a"
+SRC_URI[sha256sum] =
"21f4f3cea8fe09f5b53784522303a0e1e7d083964ecaf1c75b1441d4d9ec6aee"
# inherit gettext cannot be used, because it adds gettext-native to
BASEDEPENDS which
# are inhibited by allarch
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 16/24] ffmpeg: update to 3.2.4
Signed-off-by: Alexander Kanavin
---
meta/recipes-multimedia/ffmpeg/{ffmpeg_3.2.2.bb => ffmpeg_3.2.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-multimedia/ffmpeg/{ffmpeg_3.2.2.bb => ffmpeg_3.2.4.bb}
(97%)
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.2.bb
b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb
similarity index 97%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.2.bb
rename to meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb
index c376d82dfc6..6f37106a84f 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.2.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb
@@ -16,8 +16,8 @@ LIC_FILES_CHKSUM =
"file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
file://mips64_cpu_detection.patch \
"
-SRC_URI[md5sum] = "e34d1b92c5d844f2a3611c741a6dba18"
-SRC_URI[sha256sum] =
"3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc"
+SRC_URI[md5sum] = "39fd71024ac76ba35f04397021af5606"
+SRC_URI[sha256sum] =
"6e38ff14f080c98b58cf5967573501b8cb586e3a173b591f3807d8f0660daf7a"
# Build fails when thumb is enabled:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
ARM_INSTRUCTION_SET = "arm"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 22/24] libwebp: update to 0.6.0
Signed-off-by: Alexander Kanavin
---
meta/recipes-multimedia/webp/{libwebp_0.5.1.bb => libwebp_0.6.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-multimedia/webp/{libwebp_0.5.1.bb => libwebp_0.6.0.bb}
(93%)
diff --git a/meta/recipes-multimedia/webp/libwebp_0.5.1.bb
b/meta/recipes-multimedia/webp/libwebp_0.6.0.bb
similarity index 93%
rename from meta/recipes-multimedia/webp/libwebp_0.5.1.bb
rename to meta/recipes-multimedia/webp/libwebp_0.6.0.bb
index b882db75b64..bc565e90196 100644
--- a/meta/recipes-multimedia/webp/libwebp_0.5.1.bb
+++ b/meta/recipes-multimedia/webp/libwebp_0.6.0.bb
@@ -14,8 +14,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb \
file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7"
SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz";
-SRC_URI[md5sum] = "3d7db92ebba5b4f679413d25c6040881"
-SRC_URI[sha256sum] =
"6ad66c6fcd60a023de20b6856b03da8c7d347269d76b1fd9c3287e8b5e8813df"
+SRC_URI[md5sum] = "19a6e926ab1721268df03161b84bb4a0"
+SRC_URI[sha256sum] =
"c928119229d4f8f35e20113ffb61f281eda267634a8dc2285af4b0ee27cf2b40"
UPSTREAM_CHECK_URI =
"http://downloads.webmproject.org/releases/webp/index.html";
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 15/24] epiphany: update to 3.22.6
Signed-off-by: Alexander Kanavin
---
.../recipes-gnome/epiphany/{epiphany_3.22.3.bb => epiphany_3.22.6.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/epiphany/{epiphany_3.22.3.bb => epiphany_3.22.6.bb}
(83%)
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.22.3.bb
b/meta/recipes-gnome/epiphany/epiphany_3.22.6.bb
similarity index 83%
rename from meta/recipes-gnome/epiphany/epiphany_3.22.3.bb
rename to meta/recipes-gnome/epiphany/epiphany_3.22.6.bb
index 78a5bc77527..651fef1bf08 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.22.3.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.22.6.bb
@@ -10,8 +10,8 @@ inherit gnomebase gsettings distro_features_check
upstream-version-is-even gette
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch"
-SRC_URI[archive.md5sum] = "bfb6347acb91163aec3883bb3397372f"
-SRC_URI[archive.sha256sum] =
"a11fe3495009f776e354bcafac3ab8fc52788f5bdb9d5ee2c2f1f2f021fb49c2"
+SRC_URI[archive.md5sum] = "e08762c6bb01c4d291b3d22c7adb1a65"
+SRC_URI[archive.sha256sum] =
"de7ea87dc450702bde620033f9e2ce807859727d007396d86b09f2b82397fcc2"
EXTRA_OECONF += " --with-distributor-name=${DISTRO}"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 19/24] kbd: update to 2.0.4
Signed-off-by: Alexander Kanavin
---
meta/recipes-core/kbd/{kbd_2.0.3.bb => kbd_2.0.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/kbd/{kbd_2.0.3.bb => kbd_2.0.4.bb} (92%)
diff --git a/meta/recipes-core/kbd/kbd_2.0.3.bb
b/meta/recipes-core/kbd/kbd_2.0.4.bb
similarity index 92%
rename from meta/recipes-core/kbd/kbd_2.0.3.bb
rename to meta/recipes-core/kbd/kbd_2.0.4.bb
index 54d16835fce..acecfd049a6 100644
--- a/meta/recipes-core/kbd/kbd_2.0.3.bb
+++ b/meta/recipes-core/kbd/kbd_2.0.4.bb
@@ -15,8 +15,8 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \
${@bb.utils.contains('DISTRO_FEATURES', 'ptest',
'file://set-proper-path-of-resources.patch', '', d)} \
"
-SRC_URI[md5sum] = "231b46e7142eb41ea3ae06d2ded3c208"
-SRC_URI[sha256sum] =
"7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e"
+SRC_URI[md5sum] = "c1635a5a83b63aca7f97a3eab39ebaa6"
+SRC_URI[sha256sum] =
"5fd90af6beb225a9bb9b9fb414c090fba53c9a55793e172f508cd43652e59a88"
PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '',
d)}"
PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam,"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 24/24] systemtap: update to 3.1
Removed patches are in upstream.
Rebase monitor-option.patch and no-msgfmt-check.patch
Add support for python 3 probes
(this necessitates the
0001-Do-not-let-configure-write-a-python-location-into-th.patch)
Add perl to RDEPENDS to fix a QA warning about one of the installed files.
Signed-off-by: Alexander Kanavin
---
...configure-write-a-python-location-into-th.patch | 25 +
.../systemtap/systemtap/fix-monitor-linking.patch | 41 --
.../systemtap/systemtap/monitor-option.patch | 26 ++
.../systemtap/systemtap/no-msgfmt-check.patch | 22 ++--
.../systemtap/obsolete_automake_macros.patch | 15
meta/recipes-kernel/systemtap/systemtap_git.bb | 9 ++---
meta/recipes-kernel/systemtap/systemtap_git.inc| 7 ++--
7 files changed, 72 insertions(+), 73 deletions(-)
create mode 100644
meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch
delete mode 100644
meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch
delete mode 100644
meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch
diff --git
a/meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch
b/meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch
new file mode 100644
index 000..742b1187fc3
--- /dev/null
+++
b/meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch
@@ -0,0 +1,25 @@
+From ab29615ed6c2e779b472903564dc683dc1015de7 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Wed, 22 Feb 2017 13:37:33 +0200
+Subject: [PATCH] Do not let configure write a python location into the dtrace
+ binary
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin
+---
+ dtrace.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dtrace.in b/dtrace.in
+index 5e1cf8079..a24229cbc 100644
+--- a/dtrace.in
b/dtrace.in
+@@ -1,4 +1,4 @@
+-#!@preferred_python@
++#!/usr/bin/python3
+ # vim: et sta sts=4 sw=4 ts=8
+
+ # This handles the systemtap equivalent of
+--
+2.11.0
+
diff --git a/meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch
b/meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch
deleted file mode 100644
index 2bf0742a1df..000
--- a/meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton
-
-From d940aa0079c253b958cf9158e9ec7922ecf464f9 Mon Sep 17 00:00:00 2001
-From: Ross Burton
-Date: Wed, 9 Nov 2016 00:00:48 +
-Subject: [PATCH] staprun: fix linking if monitor is enabled
-
-If the monitor is enabled, monitor.c needs to link against json-c and ncurses.
-Instead of adding these linker flags to AM_CFLAGS (global CC flags) add them to
-stapio_LDADD.
-
-Apart from being the "right" thing to do, this fixes build failures on systems
-such as current Ubuntu (which defaults to using --as-needed and similar) where
-link order is important.
- staprun/Makefile.am | 7 +++
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/staprun/Makefile.am b/staprun/Makefile.am
-index 63d4088..66b3e21 100644
a/staprun/Makefile.am
-+++ b/staprun/Makefile.am
-@@ -42,12 +42,11 @@ staprun_CXXFLAGS += $(nss_CFLAGS)
- staprun_LDADD += $(nss_LIBS)
- endif
-
--if HAVE_MONITOR_LIBS
--AM_CFLAGS += $(jsonc_LIBS) $(ncurses_LIBS)
--endif
--
- stapio_SOURCES = stapio.c mainloop.c common.c ctl.c relay.c relay_old.c
monitor.c
- stapio_LDADD = libstrfloctime.a -lpthread
-+if HAVE_MONITOR_LIBS
-+stapio_LDADD += $(jsonc_LIBS) $(ncurses_LIBS)
-+endif
-
- man_MANS = staprun.8
-
---
-2.8.1
diff --git a/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch
b/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch
index 7d43a79e21a..b7ee0701b1a 100644
--- a/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch
+++ b/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch
@@ -1,21 +1,30 @@
+From 93fc4744fedf6fc593ee656968da97f7b1862ada Mon Sep 17 00:00:00 2001
+From: Ross Burton
+Date: Tue, 4 Oct 2016 16:37:53 +0100
+Subject: [PATCH 4/6] systemtap: rationalise dependencies
+
Add an option to explicitly disable the monitor (and therefore the dependency
on
json-c and ncurses).
Upstream-Status: Pending
Signed-off-by: Ross Burton
+---
+ configure.ac | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
diff --git a/configure.ac b/configure.ac
-index cd781a2..e56079a 100644
+index 6bd0c5fc4..2ea9b3cbf 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -570,13 +574,16 @@ dnl See if we have enough libraries and tools to build
the virt server
- fi
- AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" == "yes" -a
"${have_libxml2}" == "yes" -a "$enable_virt" != "no"])
-
+@@ -752,13 +752,16 @@ dnl We want either (or both)
[OE-core] [PATCH 23/24] nss: update to 3.28.1
Rebase nss-fix-support-cross-compiling.patch
Signed-off-by: Alexander Kanavin
---
... => 0001-nss-fix-support-cross-compiling.patch} | 51 ++
.../nss/{nss_3.27.1.bb => nss_3.28.1.bb} | 8 ++--
2 files changed, 18 insertions(+), 41 deletions(-)
rename meta/recipes-support/nss/nss/{nss-fix-support-cross-compiling.patch =>
0001-nss-fix-support-cross-compiling.patch} (49%)
rename meta/recipes-support/nss/{nss_3.27.1.bb => nss_3.28.1.bb} (96%)
diff --git a/meta/recipes-support/nss/nss/nss-fix-support-cross-compiling.patch
b/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
similarity index 49%
rename from meta/recipes-support/nss/nss/nss-fix-support-cross-compiling.patch
rename to
meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
index f0b3550bffd..d5403397e73 100644
--- a/meta/recipes-support/nss/nss/nss-fix-support-cross-compiling.patch
+++ b/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
@@ -1,46 +1,23 @@
-nss: fix support cross compiling
+From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Wed, 22 Feb 2017 11:36:11 +0200
+Subject: [PATCH] nss: fix support cross compiling
Let some make variables be assigned from outside makefile.
-Signed-off-by: Hongxu Jia
Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Hongxu Jia
+Signed-off-by: Alexander Kanavin
---
- nss/coreconf/Linux.mk | 12 +++-
- nss/coreconf/arch.mk| 2 +-
- nss/lib/freebl/Makefile | 6 ++
- 3 files changed, 18 insertions(+), 2 deletions(-)
+ nss/coreconf/arch.mk| 2 +-
+ nss/lib/freebl/Makefile | 6 ++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
-diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk
a/nss/coreconf/Linux.mk
-+++ b/nss/coreconf/Linux.mk
-@@ -16,11 +16,21 @@ ifeq ($(USE_PTHREADS),1)
- IMPL_STRATEGY = _PTH
- endif
-
-+ifndef CC
- CC= gcc
-+endif
-+
-+ifdef CXX
-+CCC = $(CXX)
-+else
- CCC = g++
-+endif
-+
-+ifndef RANLIB
- RANLIB= ranlib
-+endif
-
--DEFAULT_COMPILER = gcc
-+DEFAULT_COMPILER = $(CC)
-
- ifeq ($(OS_TARGET),Android)
- ifndef ANDROID_NDK
diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk
-index 6557348..b722412 100644
+index 06c276f..9c1eb51 100644
--- a/nss/coreconf/arch.mk
+++ b/nss/coreconf/arch.mk
-@@ -37,7 +37,7 @@ OS_TEST := $(shell uname -m)
+@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m)
ifeq ($(OS_TEST),i86pc)
OS_RELEASE := $(shell uname -r)_$(OS_TEST)
else
@@ -50,7 +27,7 @@ index 6557348..b722412 100644
#
diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
-index 0d293f1..678f506 100644
+index 0ce1425..ebeb411 100644
--- a/nss/lib/freebl/Makefile
+++ b/nss/lib/freebl/Makefile
@@ -36,6 +36,12 @@ ifdef USE_64
@@ -59,7 +36,7 @@ index 0d293f1..678f506 100644
+ifeq ($(OS_TEST),mips)
+ifndef USE_64
-+ DEFINES += -DNS_PTR_LE_32
++ DEFINES += -DNS_PTR_LE_32
+endif
+endif
+
@@ -67,5 +44,5 @@ index 0d293f1..678f506 100644
DEFINES += -DNSS_USE_ABI32_FPU
endif
--
-1.8.1.2
+2.11.0
diff --git a/meta/recipes-support/nss/nss_3.27.1.bb
b/meta/recipes-support/nss/nss_3.28.1.bb
similarity index 96%
rename from meta/recipes-support/nss/nss_3.27.1.bb
rename to meta/recipes-support/nss/nss_3.28.1.bb
index c89470fb11c..fed86fc8e92 100644
--- a/meta/recipes-support/nss/nss_3.27.1.bb
+++ b/meta/recipes-support/nss/nss_3.28.1.bb
@@ -15,8 +15,8 @@ LIC_FILES_CHKSUM =
"file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \
file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132"
SRC_URI = "\
-
http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_27_1_RTM/src/${BP}.tar.gz
\
-file://nss-fix-support-cross-compiling.patch \
+
http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_28_1_RTM/src/${BP}.tar.gz
\
+file://0001-nss-fix-support-cross-compiling.patch \
file://nss-no-rpath-for-cross-compiling.patch \
file://nss-fix-incorrect-shebang-of-perl.patch \
file://nss-fix-nsinstall-build.patch \
@@ -26,8 +26,8 @@ SRC_URI = "\
file://nss.pc.in \
file://signlibs.sh \
"
-SRC_URI[md5sum] = "f18e1ebfe07969c84b890e45843edcb7"
-SRC_URI[sha256sum] =
"fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b"
+SRC_URI[md5sum] = "e98d48435cee5792f97ef7fc35a602c3"
+SRC_URI[sha256sum] =
"58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad"
UPSTREAM_CHECK_URI =
"https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases";
UPSTREAM_CHECK_REGEX = "NSS_(?P.+)_release_notes"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 21/24] libnl: update to 3.2.29
Dropped patches are all backports.
Signed-off-by: Alexander Kanavin
---
...01-lib-add-utility-function-nl_strerror_l.patch | 146
...to-using-strerror_l-instead-of-strerror_r.patch | 403 -
...to-using-strerror_l-instead-of-strerror_r.patch | 82 -
.../libnl/{libnl_3.2.28.bb => libnl_3.2.29.bb} | 7 +-
4 files changed, 2 insertions(+), 636 deletions(-)
delete mode 100644
meta/recipes-support/libnl/libnl/0001-lib-add-utility-function-nl_strerror_l.patch
delete mode 100644
meta/recipes-support/libnl/libnl/0002-lib-switch-to-using-strerror_l-instead-of-strerror_r.patch
delete mode 100644
meta/recipes-support/libnl/libnl/0003-src-switch-to-using-strerror_l-instead-of-strerror_r.patch
rename meta/recipes-support/libnl/{libnl_3.2.28.bb => libnl_3.2.29.bb} (80%)
diff --git
a/meta/recipes-support/libnl/libnl/0001-lib-add-utility-function-nl_strerror_l.patch
b/meta/recipes-support/libnl/libnl/0001-lib-add-utility-function-nl_strerror_l.patch
deleted file mode 100644
index b734028c739..000
---
a/meta/recipes-support/libnl/libnl/0001-lib-add-utility-function-nl_strerror_l.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 683f27fbb68ca2028a7b3468f17164d484df2759 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andr=C3=A9=20Draszik?=
-Date: Thu, 25 Aug 2016 13:14:59 +0100
-Subject: [PATCH 1/3] lib: add utility function nl_strerror_l()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-libnl currently uses strerror_r() throughout, but this is
-problematic because there is a non-standard GNU version
-implemented in glibc, and the standard POSIX version, which
-differ in signature. When using glibc, one can choose
-between the two versions using feature test macros
-_GNU_SOURCE and _POSIX_C_SOURCE.
-
-Given libnl is built using the former, we always get the
-glibc special version, and all code so far has been written
-for that non-standard version.
-
-Other C libraries like musl on the other hand only try
-to be posix compliant, and only ever provide the posix
-version of strerror_r(), which has a different signature.
-
-The alternative is to use strerror_l() rather than
-strerror_r() http://austingroupbugs.net/view.php?id=655
-- this will avoid the non-confirming versions issue
-- strerror_l() is now recommended by POSIX to replace
- strerror_r() usage
-
-So rather than changing all uses of strerror_r() to be in
-line with posix, we are going to switch to the recommended
-interface strerror_l().
-
-Since strerror_l() is slightly more difficuly to use, we
-add a little (private) wrapper that we can use from all
-current callsites of strerror_r().
-
-Signed-off-by: André Draszik
-Reviewed-by: Stephane Ayotte
-Signed-off-by: Thomas Haller
-Upstream-Status: Backport
https://github.com/thom311/libnl/commit/683f27fbb68ca2028a7b3468f17164d484df2759
- include/Makefile.am | 1 +
- include/netlink-private/utils.h | 17 +
- lib/utils.c | 24
- libnl-3.sym | 5 +
- 4 files changed, 47 insertions(+)
- create mode 100644 include/netlink-private/utils.h
-
-diff --git a/include/Makefile.am b/include/Makefile.am
-index 804e984..f8b977a 100644
a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -166,6 +166,7 @@ noinst_HEADERS = \
- netlink-private/socket.h \
- netlink-private/tc.h \
- netlink-private/types.h \
-+ netlink-private/utils.h \
- netlink-private/cache-api.h \
- netlink-private/object-api.h \
- netlink-private/route/link/api.h \
-diff --git a/include/netlink-private/utils.h b/include/netlink-private/utils.h
-new file mode 100644
-index 000..77aadb3
/dev/null
-+++ b/include/netlink-private/utils.h
-@@ -0,0 +1,17 @@
-+/*
-+ * netlink-private/utils.hLocal Utility Functions
-+ *
-+ *This library is free software; you can redistribute it and/or
-+ *modify it under the terms of the GNU Lesser General Public
-+ *License as published by the Free Software Foundation version 2.1
-+ *of the License.
-+ *
-+ * Copyright (c) 2003-2012 Thomas Graf
-+ */
-+
-+#ifndef NETLINK_UTILS_PRIV_H_
-+#define NETLINK_UTILS_PRIV_H_
-+
-+extern const char * nl_strerror_l(int err);
-+
-+#endif
-diff --git a/lib/utils.c b/lib/utils.c
-index 61c3d95..c1c1b72 100644
a/lib/utils.c
-+++ b/lib/utils.c
-@@ -25,10 +25,12 @@
- */
-
- #include
-+#include
- #include
- #include
- #include
- #include /* exit() */
-+#include
-
- /**
- * Global variable indicating the desired level of debugging output.
-@@ -118,6 +120,28 @@ int __nl_read_num_str_file(const char *path, int
(*cb)(long, const char *))
-
- return 0;
- }
-+
-+const char *nl_strerror_l(int err)
-+{
-+ int errno_save = errno;
-+ locale_t loc = newlocale(LC_MESSAGES_MASK, "", (locale_t)0);
-+ const char *buf;
-+
-+ if (loc == (locale_t)0) {
-+ if (errno == ENOENT)
-+
[OE-core] [PATCH] license.bbclass: run chown only under pseudo
The copy_license_files() function in license.bbclass is called in two
different contexts. First, it is run as part of the do_populate_lic
task. In addition, it is called from do_package task when
LICENSE_CREATE_PACKAGE is enabled. The function has code that changes
the owner of license files to root which is meant only to happend in the
latter case - i.e. under do_package which is run under pseudo.
Previously, the code was blindly always running chown and just ignored
errors that happened when running from do_populate_lic. This patch
changes it to be more intelligent, only doing chown when running under
pseudo.
[YOCTO #10897]
Signed-off-by: Markus Lehtonen
---
meta/classes/license.bbclass | 15 +++
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 9923aac..96c0040 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -364,18 +364,9 @@ def copy_license_files(lic_files_paths, destdir):
canlink = False
else:
raise
-try:
-if canlink:
-os.chown(dst,0,0)
-except OSError as err:
-if err.errno in (errno.EPERM, errno.EINVAL):
-# Suppress "Operation not permitted" error, as
-# sometimes this function is not executed under pseudo.
-# Also ignore "Invalid argument" errors that happen in
-# some (unprivileged) container environments (no root).
-pass
-else:
-raise
+# Only chown if we did hardling, and, we're running under
pseudo
+if canlink and os.environ.get('PSEUDO_DISABLED') == '0':
+os.chown(dst,0,0)
if not canlink:
begin_idx = int(beginline)-1 if beginline is not None else None
end_idx = int(endline) if endline is not None else None
--
2.10.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
