* Re: [PATCH] gstreamer1.0: Upgrade to 1.10.1
From: Khem Raj @ 2016-11-30 21:47 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
In-Reply-To: <CAJTo0LYHeb28My6Ek5wBr-dv8budpprpXwZ84T5TYqW_Uj3SFQ@mail.gmail.com>
> On Nov 30, 2016, at 7:17 AM, Burton, Ross <ross.burton@intel.com> wrote:
>
> Breaks if built from a empty sysroot with wayland enabled:
>
> gst-plugins-bad:
> | make[3]: *** No rule to make target 'viewporter-protocol.c', needed by 'all'. Stop.
>
I am not able to reproduce it however I have added a dep on wayland-protocols
> Also rtsp-server gains various runtime dependencies on util-linux, can you verify that these are expected and in the depends?
I did a clean build of util-linux and then rtsp-server it reported no missing build time deps
I am doing it for raspberrypi, how do you reproduce it.
>
> Ross
^ permalink raw reply
* [PATCH 1/2] lighttpd: Add many packageconfig options
From: Andreas Oberritter @ 2016-11-30 21:47 UTC (permalink / raw)
To: openembedded-core
Respect largefile and xattr distro features.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-extended/lighttpd/lighttpd_1.4.43.bb | 37 ++++++++++++++---------
1 file changed, 22 insertions(+), 15 deletions(-)
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.43.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.43.bb
index 322f212..237c07f 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.43.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.43.bb
@@ -6,7 +6,6 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579"
SECTION = "net"
-DEPENDS = "zlib libpcre"
RDEPENDS_${PN} += " \
lighttpd-module-access \
lighttpd-module-accesslog \
@@ -26,22 +25,30 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
SRC_URI[md5sum] = "95eda531c27b161ef8fa2b9bf4948caf"
SRC_URI[sha256sum] = "fe0c4a06dd2408a83ee7a2bfedc45e09597f3313cbda82485507573ae8fa948a"
-PACKAGECONFIG ??= "openssl \
+PACKAGECONFIG ??= "openssl pcre zlib \
${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'lfs', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \
"
-PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl"
-PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-
-EXTRA_OECONF = " \
- --without-bzip2 \
- --without-ldap \
- --without-lua \
- --without-memcached \
- --with-pcre \
- --without-webdav-props \
- --without-webdav-locks \
- --disable-static \
-"
+PACKAGECONFIG[lfs] = "--enable-lfs,--disable-lfs"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"
+PACKAGECONFIG[mmap] = "--enable-mmap,--disable-mmap"
+PACKAGECONFIG[libev] = "--with-libev,--without-libev,libev"
+PACKAGECONFIG[mysql] = "--with-mysql,--without-mysql,mariadb"
+PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap"
+PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr"
+PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind"
+PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
+PACKAGECONFIG[kerberos5] = "--with-kerberos5,--without-kerberos5"
+PACKAGECONFIG[pcre] = "--with-pcre,--without-pcre,libpcre"
+PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
+PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2"
+PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin"
+PACKAGECONFIG[webdav-props] = "--with-webdav-props,--without-webdav-props,libxml2 sqlite3"
+PACKAGECONFIG[webdav-locks] = "--with-webdav-locks,--without-webdav-locks,util-linux"
+PACKAGECONFIG[gdbm] = "--with-gdbm,--without-gdbm,gdbm"
+PACKAGECONFIG[memcache] = "--with-memcached,--without-memcached,libmemcached"
+PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua5.1"
inherit autotools pkgconfig update-rc.d gettext systemd
^ permalink raw reply related
* [PATCH 2/2] lighttpd: access and accesslog are optional modules
From: Andreas Oberritter @ 2016-11-30 21:47 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1480542437-22778-1-git-send-email-obi@opendreambox.org>
Move them from RDEPENDS to RRECOMMENDS.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-extended/lighttpd/lighttpd_1.4.43.bb | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.43.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.43.bb
index 237c07f..cb95f98 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.43.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.43.bb
@@ -6,13 +6,11 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579"
SECTION = "net"
-RDEPENDS_${PN} += " \
- lighttpd-module-access \
- lighttpd-module-accesslog \
- lighttpd-module-indexfile \
- lighttpd-module-dirlisting \
- lighttpd-module-staticfile \
-"
+RDEPENDS_${PN} = "lighttpd-module-dirlisting \
+ lighttpd-module-indexfile \
+ lighttpd-module-staticfile"
+RRECOMMENDS_${PN} = "lighttpd-module-access \
+ lighttpd-module-accesslog"
SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.xz \
file://index.html.lighttpd \
^ permalink raw reply related
* [PATCH 2/2] gptfdisk: put sgdisk into its own package
From: Andreas Oberritter @ 2016-11-30 21:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1480542646-26954-1-git-send-email-obi@opendreambox.org>
This allows to avoid pulling in ncurses if only sgdisk is needed.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-devtools/fdisk/gptfdisk_1.0.1.bb | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-devtools/fdisk/gptfdisk_1.0.1.bb b/meta/recipes-devtools/fdisk/gptfdisk_1.0.1.bb
index d62a903..047aa97 100644
--- a/meta/recipes-devtools/fdisk/gptfdisk_1.0.1.bb
+++ b/meta/recipes-devtools/fdisk/gptfdisk_1.0.1.bb
@@ -23,4 +23,10 @@ do_install() {
install -m 0755 fixparts ${D}${sbindir}
}
+PACKAGES =+ "${PN}-sgdisk"
+
+RRECOMMENDS_${PN} = "${PN}-sgdisk"
+
+FILES_${PN}-sgdisk = "${sbindir}/sgdisk"
+
BBCLASSEXTEND = "native nativesdk"
--
2.7.4
^ permalink raw reply related
* [PATCH 1/2] gptfdisk: fix support for 'large' drives
From: Andreas Oberritter @ 2016-11-30 21:50 UTC (permalink / raw)
To: openembedded-core
Make's switch '-e' replaced important compiler flags from the
project's Makefile, i.e. -D_FILE_OFFSET_BITS=64.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-devtools/fdisk/gptfdisk_1.0.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/fdisk/gptfdisk_1.0.1.bb b/meta/recipes-devtools/fdisk/gptfdisk_1.0.1.bb
index 8fab28f..d62a903 100644
--- a/meta/recipes-devtools/fdisk/gptfdisk_1.0.1.bb
+++ b/meta/recipes-devtools/fdisk/gptfdisk_1.0.1.bb
@@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "864c8aee2efdda50346804d7e6230407d5f42a8ae754df70404dd8b2fd
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/"
UPSTREAM_CHECK_REGEX = "/gptfdisk/(?P<pver>(\d+[\.\-_]*)+)/"
-EXTRA_OEMAKE = "-e MAKEFLAGS="
+EXTRA_OEMAKE = "'CC=${CC}' 'CXX=${CXX}'"
do_install() {
install -d ${D}${sbindir}
--
2.7.4
^ permalink raw reply related
* [PATCH 1/6] nfs-utils: systemd fixes
From: Andreas Oberritter @ 2016-11-30 22:43 UTC (permalink / raw)
To: openembedded-core
- Start daemons by default like the initscripts do, but only if
/etc/exports exists.
- Inform systemd.bbclass about nfs-utils-client package.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service | 1 +
meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service | 1 +
meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
index 613ddc0..28b7388 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
@@ -2,6 +2,7 @@
Description=NFS Mount Daemon
After=rpcbind.service nfs-server.service
Requires=rpcbind.service nfs-server.service
+ConditionPathExists=@SYSCONFDIR@/exports
[Service]
EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
index 147d7a7..b9dfe74 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
@@ -2,6 +2,7 @@
Description=NFS Server
Requires=rpcbind.service nfs-mountd.service
After=rpcbind.service
+ConditionPathExists=@SYSCONFDIR@/exports
[Service]
Type=oneshot
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
index 4d6d808..d4b401e 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
@@ -48,9 +48,9 @@ INITSCRIPT_PARAMS_${PN}-client = "defaults 19 21"
inherit autotools-brokensep update-rc.d systemd pkgconfig
+SYSTEMD_PACKAGES = "${PN} ${PN}-client"
SYSTEMD_SERVICE_${PN} = "nfs-server.service nfs-mountd.service"
SYSTEMD_SERVICE_${PN}-client = "nfs-statd.service"
-SYSTEMD_AUTO_ENABLE = "disable"
# --enable-uuid is need for cross-compiling
EXTRA_OECONF = "--with-statduser=rpcuser \
--
2.7.4
^ permalink raw reply related
* [PATCH 2/6] nfs-utils: create package nfs-utils-mount
From: Andreas Oberritter @ 2016-11-30 22:43 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1480545786-5069-1-git-send-email-obi@opendreambox.org>
Contains just enough to mount and unmount nfs volumes, i.e.
the same as nfs-utils-client before commit 39bb7e3 ("nfs-utils:
separate package as Debain style").
Drop nfs-utils-client's dependency on bash. It contains two shell
scripts, /etc/init.d/nfscommon and /usr/sbin/start-statd, both
using /bin/sh.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
index d4b401e..eb8e99a 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84"
# util-linux for libblkid
DEPENDS = "libcap libnfsidmap libevent util-linux sqlite3 libtirpc"
-RDEPENDS_${PN}-client = "rpcbind bash"
RDEPENDS_${PN} = "${PN}-client bash"
RRECOMMENDS_${PN} = "kernel-module-nfsd"
@@ -71,7 +70,7 @@ PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wr
PACKAGECONFIG[nfsidmap] = "--enable-nfsidmap,--disable-nfsidmap,keyutils"
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-PACKAGES =+ "${PN}-client ${PN}-stats"
+PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats"
CONFFILES_${PN}-client += "${localstatedir}/lib/nfs/etab \
${localstatedir}/lib/nfs/rmtab \
@@ -79,7 +78,7 @@ CONFFILES_${PN}-client += "${localstatedir}/lib/nfs/etab \
${localstatedir}/lib/nfs/statd/state \
${sysconfdir}/nfsmount.conf"
-FILES_${PN}-client = "${base_sbindir}/*mount.nfs* ${sbindir}/*statd \
+FILES_${PN}-client = "${sbindir}/*statd \
${sbindir}/rpc.idmapd ${sbindir}/sm-notify \
${sbindir}/showmount ${sbindir}/nfsstat \
${localstatedir}/lib/nfs \
@@ -87,6 +86,10 @@ FILES_${PN}-client = "${base_sbindir}/*mount.nfs* ${sbindir}/*statd \
${sysconfdir}/nfsmount.conf \
${sysconfdir}/init.d/nfscommon \
${systemd_unitdir}/system/nfs-statd.service"
+RDEPENDS_${PN}-client = "${PN}-mount rpcbind"
+
+FILES_${PN}-mount = "${base_sbindir}/*mount.nfs*"
+
FILES_${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat"
RDEPENDS_${PN}-stats = "python3-core"
--
2.7.4
^ permalink raw reply related
* [PATCH 3/6] keyutils: new recipe (version 1.5.9)
From: Andreas Oberritter @ 2016-11-30 22:43 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1480545786-5069-1-git-send-email-obi@opendreambox.org>
Used by nfs-utils for nfsidmap, if available.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
.../nfs-utils/keyutils_1.5.9.bb | 32 ++++++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 meta/recipes-connectivity/nfs-utils/keyutils_1.5.9.bb
diff --git a/meta/recipes-connectivity/nfs-utils/keyutils_1.5.9.bb b/meta/recipes-connectivity/nfs-utils/keyutils_1.5.9.bb
new file mode 100644
index 0000000..8430bb2
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/keyutils_1.5.9.bb
@@ -0,0 +1,32 @@
+SUMMARY = "Linux Key Management Utilities"
+HOMEPAGE = "https://people.redhat.com/~dhowells/keyutils/"
+LICENSE = "GPLv2+ & LGPLv2.1+"
+LICENSE_${PN} = "GPLv2+"
+LICENSE_lib${PN} = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45 \
+ file://LICENCE.LGPL;md5=7d1cacaa3ea752b72ea5e525df54a21f"
+
+SRC_URI = "https://people.redhat.com/~dhowells/keyutils/${BP}.tar.bz2"
+SRC_URI[md5sum] = "7f8ac985c45086b5fbcd12cecd23cf07"
+SRC_URI[sha256sum] = "4da2c5552c688b65ab14d4fd40fbdf720c8b396d8ece643e040cf6e707e083ae"
+
+EXTRA_OEMAKE = " \
+ DESTDIR=${D} \
+ ETCDIR=${sysconfdir} \
+ BINDIR=${bindir} \
+ SBINDIR=${sbindir} \
+ SHAREDIR=${datadir}/${BPN} \
+ MANDIR=${mandir} \
+ INCLUDEDIR=${includedir} \
+ LIBDIR=${base_libdir} \
+ USRLIBDIR=${libdir} \
+ BUILDFOR= \
+"
+
+do_install() {
+ oe_runmake install
+}
+
+PACKAGES =+ "lib${PN}"
+
+FILES_lib${PN} = "${base_libdir}/lib*${SOLIBS}"
--
2.7.4
^ permalink raw reply related
* [PATCH 5/6] nfs-utils: don't try to load kernel module
From: Andreas Oberritter @ 2016-11-30 22:43 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1480545786-5069-1-git-send-email-obi@opendreambox.org>
This conflicts with KERNEL_MODULE_AUTOLOAD += "nfsd".
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
index 018afb7..4355237 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
@@ -126,8 +126,6 @@ do_install_append () {
-e 's,@SYSCONFDIR@,${sysconfdir},g' \
${D}${systemd_unitdir}/system/*.service
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
- install -d ${D}${sysconfdir}/modules-load.d
- echo "nfsd" > ${D}${sysconfdir}/modules-load.d/nfsd.conf
install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/
install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/
ln -sf ../proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/sysinit.target.wants/proc-fs-nfsd.mount
--
2.7.4
^ permalink raw reply related
* [PATCH 4/6] nfs-utils: add packageconfig options: blkid, ipv6, libmount, nfsv4, nfsv41 and tirpc
From: Andreas Oberritter @ 2016-11-30 22:43 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1480545786-5069-1-git-send-email-obi@opendreambox.org>
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
index eb8e99a..018afb7 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb
@@ -7,8 +7,7 @@ SECTION = "console/network"
LICENSE = "MIT & GPLv2+ & BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84"
-# util-linux for libblkid
-DEPENDS = "libcap libnfsidmap libevent util-linux sqlite3 libtirpc"
+DEPENDS = "libcap"
RDEPENDS_${PN} = "${PN}-client bash"
RRECOMMENDS_${PN} = "kernel-module-nfsd"
@@ -54,21 +53,23 @@ SYSTEMD_SERVICE_${PN}-client = "nfs-statd.service"
# --enable-uuid is need for cross-compiling
EXTRA_OECONF = "--with-statduser=rpcuser \
--enable-mountconfig \
- --enable-libmount-mount \
- --disable-nfsv41 \
- --enable-uuid \
--disable-gss \
--disable-nfsdcltrack \
--with-statdpath=/var/lib/nfs/statd \
"
-PACKAGECONFIG ??= "tcp-wrappers \
- ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
+PACKAGECONFIG ??= "blkid libmount nfsv4 tcp-wrappers \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6 tirpc', '', d)} \
"
PACKAGECONFIG_remove_libc-musl = "tcp-wrappers"
PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers"
PACKAGECONFIG[nfsidmap] = "--enable-nfsidmap,--disable-nfsidmap,keyutils"
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
+PACKAGECONFIG[tirpc] = "--enable-tirpc,--disable-tirpc,libtirpc"
+PACKAGECONFIG[blkid] = "--enable-uuid,--disable-uuid,util-linux"
+PACKAGECONFIG[libmount] = "--enable-libmount-mount,--disable-libmount-mount,util-linux"
+PACKAGECONFIG[nfsv4] = "--enable-nfsv4,--disable-nfsv4,libevent libnfsidmap keyutils sqlite3"
+PACKAGECONFIG[nfsv41] = "--enable-nfsv41,--disable-nfsv41,lvm2"
PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats"
--
2.7.4
^ permalink raw reply related
* [PATCH 6/6] nfs-utils: sync systemd unit files with nfs-utils.git
From: Andreas Oberritter @ 2016-11-30 22:43 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1480545786-5069-1-git-send-email-obi@opendreambox.org>
nfs-server failed to start after installation from a package feed.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
.../nfs-utils/nfs-utils/nfs-mountd.service | 7 +++++--
.../nfs-utils/nfs-utils/nfs-server.service | 11 ++++++++---
.../nfs-utils/nfs-utils/nfs-statd.service | 9 +++++----
3 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
index 28b7388..27ea58d 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
@@ -1,7 +1,10 @@
[Unit]
Description=NFS Mount Daemon
-After=rpcbind.service nfs-server.service
-Requires=rpcbind.service nfs-server.service
+DefaultDependencies=no
+Requires=proc-fs-nfsd.mount
+After=proc-fs-nfsd.mount
+After=network.target local-fs.target
+BindsTo=nfs-server.service
ConditionPathExists=@SYSCONFDIR@/exports
[Service]
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
index b9dfe74..6481377 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
@@ -1,7 +1,11 @@
[Unit]
-Description=NFS Server
-Requires=rpcbind.service nfs-mountd.service
-After=rpcbind.service
+Description=NFS server and services
+DefaultDependencies=no
+Requires=network.target proc-fs-nfsd.mount
+Requires=nfs-mountd.service
+Wants=rpcbind.service
+After=local-fs.target
+After=network.target proc-fs-nfsd.mount rpcbind.service nfs-mountd.service
ConditionPathExists=@SYSCONFDIR@/exports
[Service]
@@ -10,6 +14,7 @@ EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf
ExecStartPre=@SBINDIR@/exportfs -r
ExecStart=@SBINDIR@/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
ExecStop=@SBINDIR@/rpc.nfsd 0
+ExecStopPost=@SBINDIR@/exportfs -au
ExecStopPost=@SBINDIR@/exportfs -f
ExecReload=@SBINDIR@/exportfs -r
StandardError=syslog
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
index 746dacf..6e196b8 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
@@ -1,8 +1,9 @@
[Unit]
-Description=NFS file locking service
-After=rpcbind.service
-Requires=rpcbind.service
-Before=remote-fs-pre.target
+Description=NFS status monitor for NFSv2/3 locking.
+DefaultDependencies=no
+Conflicts=umount.target
+Requires=nss-lookup.target rpcbind.service
+After=network.target nss-lookup.target rpcbind.service
[Service]
EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf
--
2.7.4
^ permalink raw reply related
* [PATCH] ffmpeg: disable unsupported extensions on mips32r1
From: Andreas Oberritter @ 2016-11-30 23:26 UTC (permalink / raw)
To: openembedded-core
| Warning: the `dsp' extension requires MIPS32 revision 2 or greater
| Warning: the `dspr2' extension requires MIPS32 revision 2 or greater
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.1.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.1.bb
index 86279f2..c988d57 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.1.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.1.bb
@@ -88,6 +88,7 @@ EXTRA_OECONF = " \
--libdir=${libdir} \
--shlibdir=${libdir} \
--datadir=${datadir}/ffmpeg \
+ ${@bb.utils.contains('AVAILTUNES', 'mips32r2', '', '--disable-mipsdsp --disable-mipsdspr2', d)} \
"
do_configure() {
--
2.7.4
^ permalink raw reply related
* [PATCH 1/5] kernel.bbclass: allow uncompressed initramfs archives
From: Andreas Oberritter @ 2016-11-30 23:36 UTC (permalink / raw)
To: openembedded-core
The code failed to copy the initramfs in case it was a plain
cpio archive.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/classes/kernel.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 25a153c..4aeeacb 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -165,7 +165,7 @@ copy_initramfs() {
mkdir -p ${B}/usr
# Find and use the first initramfs image archive type we find
rm -f ${B}/usr/${INITRAMFS_IMAGE}-${MACHINE}.cpio
- for img in cpio.gz cpio.lz4 cpio.lzo cpio.lzma cpio.xz; do
+ for img in cpio cpio.gz cpio.lz4 cpio.lzo cpio.lzma cpio.xz; do
if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then
cp ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img ${B}/usr/.
case $img in
--
2.7.4
^ permalink raw reply related
* [PATCH 4/5] kernel.bbclass: do not copy bundled initramfs to /boot
From: Andreas Oberritter @ 2016-11-30 23:36 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1480549011-12168-1-git-send-email-obi@opendreambox.org>
These files cause warnings because they don't get packaged, now that they
don't land in kernel-vmlinux anymore.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/classes/kernel.bbclass | 6 ------
1 file changed, 6 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 634553c..b21cdbc 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -235,12 +235,6 @@ do_bundle_initramfs () {
mv -f ${KERNEL_OUTPUT_DIR}/$type.bak ${KERNEL_OUTPUT_DIR}/$type
fi
done
- # Update install area
- for type in ${KERNEL_IMAGETYPES} ; do
- echo "There is kernel image bundled with initramfs: ${B}/${KERNEL_OUTPUT_DIR}/$type.initramfs"
- install -m 0644 ${B}/${KERNEL_OUTPUT_DIR}/$type.initramfs ${D}/boot/$type-initramfs-${MACHINE}.bin
- echo "${B}/${KERNEL_OUTPUT_DIR}/$type.initramfs"
- done
fi
}
do_bundle_initramfs[dirs] = "${B}"
--
2.7.4
^ permalink raw reply related
* [PATCH 3/5] kernel.bbclass: Avoid wildcards for kernel images
From: Andreas Oberritter @ 2016-11-30 23:36 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1480549011-12168-1-git-send-email-obi@opendreambox.org>
With multiple kernel images enabled starting with 'vmlinux', e.g.
vmlinux.gz and vmlinux.bin, all files landed inside the
kernel-vmlinux package.
On top of that, even initramfs images were included, e.g.
vmlinux.gz-initramfs-*.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/classes/kernel.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 0e7ebd4..634553c 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -48,7 +48,7 @@ python __anonymous () {
d.appendVar('PACKAGES', ' ' + 'kernel-image-' + typelower)
- d.setVar('FILES_kernel-image-' + typelower, '/boot/' + type + '*')
+ d.setVar('FILES_kernel-image-' + typelower, '/boot/' + type + '-${KERNEL_VERSION_NAME}')
d.appendVar('RDEPENDS_kernel-image', ' ' + 'kernel-image-' + typelower)
@@ -486,7 +486,7 @@ FILES_${PN} = ""
FILES_kernel-base = "/lib/modules/${KERNEL_VERSION}/modules.order /lib/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-vmlinux = "/boot/vmlinux*"
+FILES_kernel-vmlinux = "/boot/vmlinux-${KERNEL_VERSION_NAME}"
FILES_kernel-modules = ""
RDEPENDS_kernel = "kernel-base"
# Allow machines to override this dependency if kernel image files are
--
2.7.4
^ permalink raw reply related
* [PATCH 2/5] kernel.bbclass: Use real filenames in kernel packages
From: Andreas Oberritter @ 2016-11-30 23:36 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1480549011-12168-1-git-send-email-obi@opendreambox.org>
When iterating over kernel image types to set up their packaging
variables, don't use make targets but the real names.
It was surprising if both vmlinux.bin and vmlinux.gz were enabled
and only the latter had its filename extension removed from the
package name.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/classes/kernel.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 4aeeacb..0e7ebd4 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -43,7 +43,7 @@ python __anonymous () {
typeformake = re.sub(r'\.gz', '', types)
d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake)
- for type in typeformake.split():
+ for type in types.split():
typelower = type.lower()
d.appendVar('PACKAGES', ' ' + 'kernel-image-' + typelower)
--
2.7.4
^ permalink raw reply related
* [PATCH 5/5] kernel.bbclass: fix kernel_do_compile for KERNEL_IMAGETYPE = "vmlinux.gz" on mips
From: Andreas Oberritter @ 2016-11-30 23:36 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1480549011-12168-1-git-send-email-obi@opendreambox.org>
The target directory didn't exist.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/classes/kernel.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index b21cdbc..d07f69c 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -264,6 +264,7 @@ kernel_do_compile() {
oe_runmake ${typeformake} CC="${KERNEL_CC}" LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} $use_alternate_initrd
for type in ${KERNEL_IMAGETYPES} ; do
if test "${typeformake}.gz" = "${type}"; then
+ mkdir -p "${KERNEL_OUTPUT_DIR}"
gzip -9c < "${typeformake}" > "${KERNEL_OUTPUT_DIR}/${type}"
break;
fi
--
2.7.4
^ permalink raw reply related
* [PATCH] libc-package.bbclass: split binary localedata even more if asked to
From: Andreas Oberritter @ 2016-11-30 23:50 UTC (permalink / raw)
To: openembedded-core
If GLIBC_SPLIT_LC_PACKAGES is set to a non-zero value, convert
glibc-binary-localedata-XX-YY to be a meta package depending on
glibc-binary-localedata-XX-YY-lc-address and so on. This enables
saving quite some space if someone doesn't need LC_COLLATE for
example.
Some regex code was removed from output_locale_binary_rdepends,
because legitimize_package_name already converts to lowercase.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/classes/libc-package.bbclass | 39 +++++++++++++++++++++++++--------------
1 file changed, 25 insertions(+), 14 deletions(-)
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 2dc90c4..071978b 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -9,6 +9,8 @@
GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "ondevice"
+GLIBC_SPLIT_LC_PACKAGES ?= "0"
+
python __anonymous () {
enabled = d.getVar("ENABLE_BINARY_LOCALE_GENERATION", True)
@@ -219,13 +221,12 @@ python package_do_split_gconvs () {
(locale, encoding, locale))
def output_locale_binary_rdepends(name, pkgname, locale, encoding):
- m = re.match("(.*)\.(.*)", name)
- if m:
- libc_name = "%s.%s" % (m.group(1), m.group(2).lower())
- else:
- libc_name = name
- d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \
- % (mlprefix+bpn, libc_name)))
+ dep = legitimize_package_name('%s-binary-localedata-%s' % (bpn, name))
+ lcsplit = d.getVar('GLIBC_SPLIT_LC_PACKAGES', True)
+ if lcsplit and int(lcsplit):
+ d.appendVar('PACKAGES', ' ' + dep)
+ d.setVar('ALLOW_EMPTY_%s' % dep, '1')
+ d.setVar('RDEPENDS_%s' % pkgname, mlprefix + dep)
commands = {}
@@ -337,6 +338,11 @@ python package_do_split_gconvs () {
else:
output_locale('%s.%s' % (base, charset), base, charset)
+ def metapkg_hook(file, pkg, pattern, format, basename):
+ name = basename.split('/', 1)[0]
+ metapkg = legitimize_package_name('%s-binary-localedata-%s' % (mlprefix+bpn, name))
+ d.appendVar('RDEPENDS_%s' % metapkg, ' ' + pkg)
+
if use_bin == "compile":
makefile = base_path_join(d.getVar("WORKDIR", True), "locale-tree", "Makefile")
m = open(makefile, "w")
@@ -350,13 +356,18 @@ python package_do_split_gconvs () {
bb.build.exec_func("oe_runmake", d)
bb.note("collecting binary locales from locale tree")
bb.build.exec_func("do_collect_bins_from_locale_tree", d)
- do_split_packages(d, binary_locales_dir, file_regex='(.*)', \
- output_pattern=bpn+'-binary-localedata-%s', \
- description='binary locale definition for %s', extra_depends='', allow_dirs=True)
- elif use_bin == "precompiled":
- do_split_packages(d, binary_locales_dir, file_regex='(.*)', \
- output_pattern=bpn+'-binary-localedata-%s', \
- description='binary locale definition for %s', extra_depends='', allow_dirs=True)
+
+ if use_bin in ('compile', 'precompiled'):
+ lcsplit = d.getVar('GLIBC_SPLIT_LC_PACKAGES', True)
+ if lcsplit and int(lcsplit):
+ do_split_packages(d, binary_locales_dir, file_regex='^(.*/LC_\w+)', \
+ output_pattern=bpn+'-binary-localedata-%s', \
+ description='binary locale definition for %s', recursive=True,
+ hook=metapkg_hook, extra_depends='', allow_dirs=True, match_path=True)
+ else:
+ do_split_packages(d, binary_locales_dir, file_regex='(.*)', \
+ output_pattern=bpn+'-binary-localedata-%s', \
+ description='binary locale definition for %s', extra_depends='', allow_dirs=True)
else:
bb.note("generation of binary locales disabled. this may break i18n!")
--
2.7.4
^ permalink raw reply related
* [PATCH v2] lighttpd: Add many packageconfig options
From: Andreas Oberritter @ 2016-12-01 2:33 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1480542437-22778-1-git-send-email-obi@opendreambox.org>
Respect largefile and xattr distro features.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
v2: In 1.4.42, upstream renamed --with-kerberos5 to --with-krb5
and introduced mod_authn_gssapi with a new dependency on krb5.
meta/recipes-extended/lighttpd/lighttpd_1.4.43.bb | 37 ++++++++++++++---------
1 file changed, 22 insertions(+), 15 deletions(-)
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.43.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.43.bb
index 322f212..38eaf70 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.43.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.43.bb
@@ -6,7 +6,6 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579"
SECTION = "net"
-DEPENDS = "zlib libpcre"
RDEPENDS_${PN} += " \
lighttpd-module-access \
lighttpd-module-accesslog \
@@ -26,22 +25,30 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
SRC_URI[md5sum] = "95eda531c27b161ef8fa2b9bf4948caf"
SRC_URI[sha256sum] = "fe0c4a06dd2408a83ee7a2bfedc45e09597f3313cbda82485507573ae8fa948a"
-PACKAGECONFIG ??= "openssl \
+PACKAGECONFIG ??= "openssl pcre zlib \
${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'lfs', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \
"
-PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl"
-PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-
-EXTRA_OECONF = " \
- --without-bzip2 \
- --without-ldap \
- --without-lua \
- --without-memcached \
- --with-pcre \
- --without-webdav-props \
- --without-webdav-locks \
- --disable-static \
-"
+PACKAGECONFIG[lfs] = "--enable-lfs,--disable-lfs"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"
+PACKAGECONFIG[mmap] = "--enable-mmap,--disable-mmap"
+PACKAGECONFIG[libev] = "--with-libev,--without-libev,libev"
+PACKAGECONFIG[mysql] = "--with-mysql,--without-mysql,mariadb"
+PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap"
+PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr"
+PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind"
+PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
+PACKAGECONFIG[krb5] = "--with-krb5,--without-krb5,krb5"
+PACKAGECONFIG[pcre] = "--with-pcre,--without-pcre,libpcre"
+PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
+PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2"
+PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin"
+PACKAGECONFIG[webdav-props] = "--with-webdav-props,--without-webdav-props,libxml2 sqlite3"
+PACKAGECONFIG[webdav-locks] = "--with-webdav-locks,--without-webdav-locks,util-linux"
+PACKAGECONFIG[gdbm] = "--with-gdbm,--without-gdbm,gdbm"
+PACKAGECONFIG[memcache] = "--with-memcached,--without-memcached,libmemcached"
+PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua5.1"
inherit autotools pkgconfig update-rc.d gettext systemd
--
2.7.4
^ permalink raw reply related
* Re: purpose of variables like "base_bindir_native"?
From: Khem Raj @ 2016-12-01 3:51 UTC (permalink / raw)
To: Robert P. J. Day; +Cc: OE Core mailing list
In-Reply-To: <alpine.LFD.2.20.1611300625420.7224@ca624034.mitel.com>
> On Nov 30, 2016, at 3:34 AM, Robert P. J. Day <rpjday@crashcourse.ca> wrote:
>
>
> i'm putting together a tutorial on the structure of the native
> sysroot and how it's built and variables involved, and was poking
> around in both bitbake.conf and native.bbclass, and i'm curious about
> one or two things.
>
> i could be totally wrong but it *seems* like there's native-related
> content in bitbake.conf that could be moved over to native.bbclass to
> reduce a little of the clutter. i'm perusing bitbake.conf and it's
> hard to keep track of some of the variables just because there's both
> native- and target- related settings in there. but i'll admit i
> haven't finished my inspection.
>
> on a more specific note, in the entire oe-core layer, there are two
> references to the variable "base_bindir_native" (formatted for
> aesthetics):
>
> $ grep -rw base_bindir_native *
> meta/conf/bitbake.conf:base_bindir_native = "/bin"
> meta/conf/bitbake.conf:PATH_prepend =
> "${COREBASE}/scripts:i
> ${STAGING_BINDIR_TOOLCHAIN}:
> ${STAGING_BINDIR_CROSS}:
> ${STAGING_DIR_NATIVE}${sbindir_native}:
> ${STAGING_BINDIR_NATIVE}:
> ${STAGING_DIR_NATIVE}${base_sbindir_native}:
> ${STAGING_DIR_NATIVE}${base_bindir_native}:" <----- there
>
> so, given that that variable is set in bitbake.conf, and is only
> referenced in that same file, what's the point of making it a
> variable? doesn't hurt, of course, but when i see a variable, i
> normally assume it's because it might be modified later somewhere, but
> i don't see that happening here. is there a reason for it? same thing
> could be said for "base_sbindir_native" as well.
>
> thoughts?
you could modify it if you wished to then you just change one var in local
metadata
>
> rday
>
> --
>
> ========================================================================
> Robert P. J. Day Ottawa, Ontario, CANADA
> http://crashcourse.ca
>
> Twitter: http://twitter.com/rpjday
> LinkedIn: http://ca.linkedin.com/in/rpjday
> ========================================================================
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply
* Re: [PATCH] libc-package.bbclass: split binary localedata even more if asked to
From: Khem Raj @ 2016-12-01 4:02 UTC (permalink / raw)
To: Andreas Oberritter; +Cc: openembedded-core
In-Reply-To: <1480549817-16636-1-git-send-email-obi@opendreambox.org>
> On Nov 30, 2016, at 3:50 PM, Andreas Oberritter <obi@opendreambox.org> wrote:
>
> If GLIBC_SPLIT_LC_PACKAGES is set to a non-zero value, convert
> glibc-binary-localedata-XX-YY to be a meta package depending on
> glibc-binary-localedata-XX-YY-lc-address and so on. This enables
> saving quite some space if someone doesn't need LC_COLLATE for
> example.
>
> Some regex code was removed from output_locale_binary_rdepends,
> because legitimize_package_name already converts to lowercase.
>
This looks ok. May be add some documentation around
GLIBC_SPLIT_LC_PACKAGES in extended local.conf sample.
I am worried about dependency changes, may be comparing old and new
would help.
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> ---
> meta/classes/libc-package.bbclass | 39 +++++++++++++++++++++++++--------------
> 1 file changed, 25 insertions(+), 14 deletions(-)
>
> diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
> index 2dc90c4..071978b 100644
> --- a/meta/classes/libc-package.bbclass
> +++ b/meta/classes/libc-package.bbclass
> @@ -9,6 +9,8 @@
>
> GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "ondevice"
>
> +GLIBC_SPLIT_LC_PACKAGES ?= "0"
> +
> python __anonymous () {
> enabled = d.getVar("ENABLE_BINARY_LOCALE_GENERATION", True)
>
> @@ -219,13 +221,12 @@ python package_do_split_gconvs () {
> (locale, encoding, locale))
>
> def output_locale_binary_rdepends(name, pkgname, locale, encoding):
> - m = re.match("(.*)\.(.*)", name)
> - if m:
> - libc_name = "%s.%s" % (m.group(1), m.group(2).lower())
> - else:
> - libc_name = name
> - d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \
> - % (mlprefix+bpn, libc_name)))
> + dep = legitimize_package_name('%s-binary-localedata-%s' % (bpn, name))
> + lcsplit = d.getVar('GLIBC_SPLIT_LC_PACKAGES', True)
> + if lcsplit and int(lcsplit):
> + d.appendVar('PACKAGES', ' ' + dep)
> + d.setVar('ALLOW_EMPTY_%s' % dep, '1')
> + d.setVar('RDEPENDS_%s' % pkgname, mlprefix + dep)
>
> commands = {}
>
> @@ -337,6 +338,11 @@ python package_do_split_gconvs () {
> else:
> output_locale('%s.%s' % (base, charset), base, charset)
>
> + def metapkg_hook(file, pkg, pattern, format, basename):
> + name = basename.split('/', 1)[0]
> + metapkg = legitimize_package_name('%s-binary-localedata-%s' % (mlprefix+bpn, name))
> + d.appendVar('RDEPENDS_%s' % metapkg, ' ' + pkg)
> +
> if use_bin == "compile":
> makefile = base_path_join(d.getVar("WORKDIR", True), "locale-tree", "Makefile")
> m = open(makefile, "w")
> @@ -350,13 +356,18 @@ python package_do_split_gconvs () {
> bb.build.exec_func("oe_runmake", d)
> bb.note("collecting binary locales from locale tree")
> bb.build.exec_func("do_collect_bins_from_locale_tree", d)
> - do_split_packages(d, binary_locales_dir, file_regex='(.*)', \
> - output_pattern=bpn+'-binary-localedata-%s', \
> - description='binary locale definition for %s', extra_depends='', allow_dirs=True)
> - elif use_bin == "precompiled":
> - do_split_packages(d, binary_locales_dir, file_regex='(.*)', \
> - output_pattern=bpn+'-binary-localedata-%s', \
> - description='binary locale definition for %s', extra_depends='', allow_dirs=True)
> +
> + if use_bin in ('compile', 'precompiled'):
> + lcsplit = d.getVar('GLIBC_SPLIT_LC_PACKAGES', True)
> + if lcsplit and int(lcsplit):
> + do_split_packages(d, binary_locales_dir, file_regex='^(.*/LC_\w+)', \
> + output_pattern=bpn+'-binary-localedata-%s', \
> + description='binary locale definition for %s', recursive=True,
> + hook=metapkg_hook, extra_depends='', allow_dirs=True, match_path=True)
> + else:
> + do_split_packages(d, binary_locales_dir, file_regex='(.*)', \
> + output_pattern=bpn+'-binary-localedata-%s', \
> + description='binary locale definition for %s', extra_depends='', allow_dirs=True)
> else:
> bb.note("generation of binary locales disabled. this may break i18n!")
>
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply
* [PATCH] ffmpeg: Add packageconfig for vdpau accelaration
From: Khem Raj @ 2016-12-01 5:56 UTC (permalink / raw)
To: openembedded-core
Fixes dangling dependency QA issue
WARNING: ffmpeg-3.2.1-r0 do_package_qa: QA Issue: libavutil rdepends on libvdpau, but it isn't a build dependency, missing libvdpau in DEPENDS or PACKAGECONFIG? [build-deps]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.1.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.1.bb
index 86279f2..5fca950 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.1.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.1.bb
@@ -57,6 +57,7 @@ PACKAGECONFIG[schroedinger] = "--enable-libschroedinger,--disable-libschroedinge
PACKAGECONFIG[speex] = "--enable-libspeex,--disable-libspeex,speex"
PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora"
PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva"
+PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx"
PACKAGECONFIG[x11] = "--enable-x11grab,--disable-x11grab,virtual/libx11 libxfixes libxext xproto virtual/libsdl"
PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264"
--
2.10.2
^ permalink raw reply related
* [PATCH 0/1] kernel.bbclass: let do_deploy depend on do_packagedata
From: Robert Yang @ 2016-12-01 8:12 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 11063a01d4511b2688ea7ba2d7359e4e07328c66:
ruby: upgrade to 2.3.1 (2016-11-30 15:47:17 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/deploy
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/deploy
Robert Yang (1):
kernel.bbclass: let do_deploy depend on do_packagedata
meta/classes/kernel.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
2.9.0
^ permalink raw reply
* [PATCH 1/1] kernel.bbclass: let do_deploy depend on do_packagedata
From: Robert Yang @ 2016-12-01 8:12 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1480579892.git.liezhi.yang@windriver.com>
The do_deploy runs depmodwrapper which requires
pkgdata/kernel-depmod/kernel-abiversion, which is generated by
PACKAGEFUNCS. So we need let do_deploy depend on do_packagedata.
This can fix the errors which happens sometimes when kernel upgrades:
DEBUG: Executing shell function do_deploy
Error: Kernel version 4.8.8-WR9.0.0.1_standard does not match kernel-abiversion (4.8.8-WR9.0.0.0_standard)
And we only see this error when kernel upgrades and rebuild, but doesn't
see it in a normal build, this is becuase depmodwrapper doesn't exit
error when kernel-depmod/kernel-abiversion doesn't exit, it just prints
an error which should go into log.do_deploy:
if [ ! -r /path/to/sysroots/qemux86-64/pkgdata/kernel-depmod/kernel-abiversion ]; then
echo "Unable to read: /path/to/sysroots/qemux86-64/pkgdata/kernel-depmod/kernel-abiversion" >&2
else
[foo]
fi
We can see that there is no "exit 1", I guess it was designed to let it
can run without kernel-abiversion
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/classes/kernel.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 25a153c..17e85a4 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -630,6 +630,6 @@ do_deploy[cleandirs] = "${DEPLOYDIR}"
do_deploy[dirs] = "${DEPLOYDIR} ${B}"
do_deploy[prefuncs] += "package_get_auto_pr"
-addtask deploy after do_populate_sysroot
+addtask deploy after do_populate_sysroot do_packagedata
EXPORT_FUNCTIONS do_deploy
--
2.9.0
^ permalink raw reply related
* [PATCH] gstreamer1.0-plugins-bad: Add PKG_CONFIG_SYSROOT_DIR to output of pkg-config
From: Khem Raj @ 2016-12-01 8:37 UTC (permalink / raw)
To: openembedded-core
When configure pokes for wayland-protocols isntallations it ended up
using the ones from host, which is because it did not account for sysroot
prefix
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../gstreamer/gstreamer1.0-plugins-bad.inc | 2 +-
...G_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch | 37 ++++++++++++++++++++++
.../gstreamer/gstreamer1.0-plugins-bad_1.10.1.bb | 1 +
3 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index d26a6a9..d3c5326 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -64,7 +64,7 @@ PACKAGECONFIG[srtp] = "--enable-srtp,--disable-srtp,libsrtp"
PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 libgudev"
PACKAGECONFIG[voaacenc] = "--enable-voaacenc,--disable-voaacenc,vo-aacenc"
PACKAGECONFIG[voamrwbenc] = "--enable-voamrwbenc,--disable-voamrwbenc,vo-amrwbenc"
-PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland"
+PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols"
PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
# these plugins have not been ported to 1.0 (yet):
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch
new file mode 100644
index 0000000..eb789df
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch
@@ -0,0 +1,37 @@
+From c271503d7e233428ac0323c51d6517113e26bef7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 1 Dec 2016 00:27:13 -0800
+Subject: [PATCH] Prepend PKG_CONFIG_SYSROOT_DIR to pkg-config output
+
+In cross environment we have to prepend the sysroot to the path found by
+pkgconfig since the path returned from pkgconfig does not have sysroot prefixed
+it ends up using the files from host system. If build host has wayland installed
+the build will succeed but if you dont have wayland-protocols installed on build host then
+it wont find the files on build host
+
+This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR
+will be empty
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8ac96b..dc87b08 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2233,7 +2233,7 @@ AG_GST_CHECK_FEATURE(WAYLAND, [wayland sink], wayland , [
+ PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, wayland-protocols >= 1.4, [
+ if test "x$wayland_scanner" != "x"; then
+ HAVE_WAYLAND="yes"
+- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
++ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, ${PKG_CONFIG_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
+ else
+ AC_MSG_RESULT([wayland-scanner is required to build the wayland plugin])
+ HAVE_WAYLAND="no"
+--
+2.10.2
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.1.bb
index 9cd892e..6c6f011 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.1.bb
@@ -14,6 +14,7 @@ SRC_URI = " \
file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \
file://0009-glimagesink-Downrank-to-marginal.patch \
file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
+ file://0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch \
"
SRC_URI[md5sum] = "491d2d5aab55ffc60c66e714d3d664ea"
SRC_URI[sha256sum] = "133e0ed9fe21011b15d3898e3d3a9d17ab74eed31996da2e353353e688ca921d"
--
2.10.2
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox