* [PATCH 30/33] dpkg: use correct path for perl libraries
From: Andreas Oberritter @ 2016-12-06 11:49 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1481024991-5882-1-git-send-email-obi@opendreambox.org>
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-devtools/dpkg/dpkg.inc | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 414ee5b..1c404fc 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -1,21 +1,19 @@
SUMMARY = "Package maintenance system from Debian"
SECTION = "base"
LICENSE = "GPLv2+"
-DEPENDS = "perl"
DEPENDS_append_class-native = " bzip2-replacement-native"
PROVIDES = "virtual/update-alternatives"
UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/dpkg/"
-inherit autotools gettext perlnative pkgconfig systemd
+inherit autotools cpan-base gettext perlnative pkgconfig systemd
SYSTEMD_SERVICE_${PN} = "dpkg-configure.service"
export PERL = "${bindir}/perl"
PERL_class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl"
-export PERL_LIBDIR = "${libdir}/perl"
-PERL_LIBDIR_class-native = "${libdir}/perl-native/perl"
+export PERL_LIBDIR = "${PERLLIBDIRS}/${PERLVERSION}"
PACKAGECONFIG ??= "bzip2 gzip start-stop-daemon update-alternatives"
PACKAGECONFIG[bzip2] = "--with-bz2,--without-bz2,bzip2"
--
2.7.4
^ permalink raw reply related
* [PATCH 29/33] dpkg: always install dpkg-configure.service
From: Andreas Oberritter @ 2016-12-06 11:49 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1481024991-5882-1-git-send-email-obi@opendreambox.org>
systemd.bbclass handles everything based on DISTRO_FEATURES.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-devtools/dpkg/dpkg.inc | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index db37a7b..414ee5b 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -9,11 +9,7 @@ UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/dpkg/"
inherit autotools gettext perlnative pkgconfig systemd
-python () {
- if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
- pn = d.getVar('PN', True)
- d.setVar('SYSTEMD_SERVICE_%s' % (pn), 'dpkg-configure.service')
-}
+SYSTEMD_SERVICE_${PN} = "dpkg-configure.service"
export PERL = "${bindir}/perl"
PERL_class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl"
@@ -46,15 +42,13 @@ do_install_append_class-native() {
}
do_install_append () {
- if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)};then
- install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/dpkg-configure.service ${D}${systemd_unitdir}/system/
- sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
- -e 's,@SYSCONFDIR@,${sysconfdir},g' \
- -e 's,@BINDIR@,${bindir},g' \
- -e 's,@SYSTEMD_UNITDIR@,${systemd_unitdir},g' \
- ${D}${systemd_unitdir}/system/dpkg-configure.service
- fi
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/dpkg-configure.service ${D}${systemd_unitdir}/system
+ sed -e 's,@BASE_BINDIR@,${base_bindir},g' \
+ -e 's,@SYSCONFDIR@,${sysconfdir},g' \
+ -e 's,@BINDIR@,${bindir},g' \
+ -e 's,@SYSTEMD_UNITDIR@,${systemd_unitdir},g' \
+ -i ${D}${systemd_unitdir}/system/dpkg-configure.service
}
PACKAGES =+ "dpkg-perl dselect libdpkg-perl start-stop-daemon update-alternatives-dpkg"
--
2.7.4
^ permalink raw reply related
* [PATCH 28/33] dpkg: update packages and files to match Debian more closely
From: Andreas Oberritter @ 2016-12-06 11:49 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1481024991-5882-1-git-send-email-obi@opendreambox.org>
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-devtools/dpkg/dpkg.inc | 53 +++++++++++++++++++++++++++++++++----
1 file changed, 48 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 5e838ed..db37a7b 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -57,20 +57,63 @@ do_install_append () {
fi
}
-PACKAGES =+ "start-stop-daemon update-alternatives-dpkg"
+PACKAGES =+ "dpkg-perl dselect libdpkg-perl start-stop-daemon update-alternatives-dpkg"
RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} run-postinsts perl"
RDEPENDS_${PN}_class-native = ""
RRECOMMENDS_${PN} = "start-stop-daemon"
RRECOMMENDS_${PN}_class-native = ""
+RSUGGESTS_${PN} = "apt"
-FILES_start-stop-daemon = "${base_sbindir}/start-stop-daemon"
+RDEPENDS_dpkg-perl = "binutils libdpkg-perl make xz"
+RRECOMMENDS_dpkg-perl = "gnupg gpgv"
+
+RDEPENDS_dselect = "dpkg"
+RSUGGESTS_dselect = "perl"
+
+RDEPENDS_libdpkg-perl = "dpkg libtimedate-perl perl"
+RRECOMMENDS_libdpkg-perl = "xz"
+RSUGGESTS_libdpkg-perl = "binutils gnupg gpgv"
-FILES_update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives"
RPROVIDES_update-alternatives-dpkg = "update-alternatives"
RCONFLICTS_update-alternatives-dpkg = "update-alternatives"
-PACKAGES += "${PN}-perl"
-FILES_${PN}-perl = "${libdir}/perl"
+FILES_dpkg-perl = " \
+ ${bindir}/dpkg-architecture \
+ ${bindir}/dpkg-buildflags \
+ ${bindir}/dpkg-buildpackage \
+ ${bindir}/dpkg-checkbuilddeps \
+ ${bindir}/dpkg-distaddfile \
+ ${bindir}/dpkg-genchanges \
+ ${bindir}/dpkg-gencontrol \
+ ${bindir}/dpkg-gensymbols \
+ ${bindir}/dpkg-mergechangelogs \
+ ${bindir}/dpkg-name \
+ ${bindir}/dpkg-parsechangelog \
+ ${bindir}/dpkg-scanpackages \
+ ${bindir}/dpkg-scansources \
+ ${bindir}/dpkg-shlibdeps \
+ ${bindir}/dpkg-source \
+ ${bindir}/dpkg-vendor \
+ ${datadir}/dpkg/*.mk \
+"
+
+FILES_dselect = "${bindir}/dselect"
+
+FILES_libdpkg-perl = " \
+ ${libdir}/dpkg/parsechangelog \
+ ${libdir}/perl \
+"
+
+FILES_start-stop-daemon = "${base_sbindir}/start-stop-daemon"
+
+FILES_update-alternatives-dpkg = " \
+ ${sysconfdir}/alternatives \
+ ${bindir}/update-alternatives \
+ ${localstatedir}/lib/dpkg/alternatives \
+"
+
+PKG_dpkg-dev = "libdpkg-dev"
+PKG_dpkg-perl = "dpkg-dev"
BBCLASSEXTEND = "native"
--
2.7.4
^ permalink raw reply related
* [PATCH 32/33] apt: fix rpath error during configure
From: Andreas Oberritter @ 2016-12-06 11:49 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1481024991-5882-1-git-send-email-obi@opendreambox.org>
| checking for shared library run path origin... /bin/sh: ../apt-1.0.10.1/buildlib/config.rpath: No such file or directory
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-devtools/apt/apt_1.2.12.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-devtools/apt/apt_1.2.12.bb b/meta/recipes-devtools/apt/apt_1.2.12.bb
index 4d781a2..5dc50a4 100644
--- a/meta/recipes-devtools/apt/apt_1.2.12.bb
+++ b/meta/recipes-devtools/apt/apt_1.2.12.bb
@@ -28,7 +28,10 @@ UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/"
inherit autotools gettext useradd
+AUTOTOOLS_AUXDIR = "${S}/buildlib"
+
EXTRA_AUTORECONF = "--exclude=autopoint,autoheader"
+EXTRA_OECONF = "--disable-rpath"
PACKAGECONFIG ??= "lzma"
PACKAGECONFIG[lzma] = "ac_cv_lib_lzma_lzma_easy_encoder=yes,ac_cv_lib_lzma_lzma_easy_encoder=no,xz"
--
2.7.4
^ permalink raw reply related
* [PATCH 33/33] apt: dselect depends on perl
From: Andreas Oberritter @ 2016-12-06 11:49 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1481024991-5882-1-git-send-email-obi@opendreambox.org>
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-devtools/apt/apt_1.2.12.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/apt/apt_1.2.12.bb b/meta/recipes-devtools/apt/apt_1.2.12.bb
index 5dc50a4..0b640f9 100644
--- a/meta/recipes-devtools/apt/apt_1.2.12.bb
+++ b/meta/recipes-devtools/apt/apt_1.2.12.bb
@@ -110,7 +110,7 @@ do_install_append_class-target() {
PACKAGES =+ "${PN}-dselect ${PN}-transport-https ${PN}-utils lib${PN}-inst lib${PN}-pkg"
RDEPENDS_${PN} = "dpkg debianutils"
-RDEPENDS_${PN}-dselect = "bash"
+RDEPENDS_${PN}-dselect = "bash perl"
RRECOMMENDS_${PN} = "gnupg"
RRECOMMENDS_${PN}_class-native = ""
--
2.7.4
^ permalink raw reply related
* [PATCH 31/33] package_deb.bbclass: compress control.tar with the same algorithm as data.tar
From: Andreas Oberritter @ 2016-12-06 11:49 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1481024991-5882-1-git-send-email-obi@opendreambox.org>
Yields better compression with xz and fixes a problem invoking gzip.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/classes/package_deb.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index fb6034c..fa327dd 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -308,7 +308,7 @@ python do_package_deb () {
conffiles.close()
os.chdir(basedir)
- ret = subprocess.call("PATH=\"%s\" dpkg-deb -b %s %s" % (localdata.getVar("PATH", True), root, pkgoutdir), shell=True)
+ ret = subprocess.call("PATH=\"%s\" dpkg-deb --uniform-compression -b %s %s" % (localdata.getVar("PATH", True), root, pkgoutdir), shell=True)
if ret != 0:
bb.utils.unlockfile(lf)
bb.fatal("dpkg-deb execution failed")
--
2.7.4
^ permalink raw reply related
* Re: [meta-intel] [PATCH 2/2] gstreamer1.0-vaapi: Import from meta-intel
From: Ylinen, Mikko @ 2016-12-06 12:24 UTC (permalink / raw)
To: Burton, Ross; +Cc: meta-intel@yoctoproject.org, OE-core
In-Reply-To: <CAJTo0LbB5_PkVd-XBH7ESUtiGvTi7ziqLjRr9FXjLp7zAVpvqw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 604 bytes --]
Hi,
On Tue, Dec 6, 2016 at 12:48 PM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 6 December 2016 at 09:57, Ylinen, Mikko <mikko.ylinen@intel.com> wrote:
>
>> This suggests the versions should be kept in sync with the gstreamer
>> versions:
>> http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/commit/
>> ?id=3f51f61efe93c104ba7996f54f381c6c1a5e6546
>>
>
> Khem sent a GStreamer upgrade a few days ago, so they'll all be merging at
> once. gst-vaapi 1.8 doesn't build with gst 1.10 anyway.
>
>
OK, I had missed that. I only checked master was still using 1.8.x.
-- Mikko
[-- Attachment #2: Type: text/html, Size: 1604 bytes --]
^ permalink raw reply
* Re: [oe-commits] [openembedded-core] 67/76: gnutls: update to 3.5.6
From: Martin Jansa @ 2016-12-06 13:49 UTC (permalink / raw)
To: openembedded-core, Alexander Kanavin; +Cc: openembedded-commits
In-Reply-To: <20161130154913.0EEAE50166@opal.openembedded.org>
[-- Attachment #1: Type: text/plain, Size: 3091 bytes --]
On Wed, Nov 30, 2016 at 03:49:52PM +0000, git@git.openembedded.org wrote:
> rpurdie pushed a commit to branch master
> in repository openembedded-core.
>
> commit 27f306a752d15ec62d2821d0146be4ffa10b7013
> Author: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> AuthorDate: Mon Nov 28 15:34:20 2016 +0200
>
> gnutls: update to 3.5.6
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
Anyone else also seeing this?
configure:9271: result: no
configure:9337: checking for NETTLE
configure:9345: $PKG_CONFIG --exists --print-errors "nettle >= 3.1"
configure:9348: $? = 0
configure:9363: $PKG_CONFIG --exists --print-errors "nettle >= 3.1"
configure:9366: $? = 0
configure:9412: result: yes
configure:9418: checking for HOGWEED
configure:9426: $PKG_CONFIG --exists --print-errors "hogweed >= 3.1"
Package hogweed was not found in the pkg-config search path.
Perhaps you should add the directory containing `hogweed.pc'
to the PKG_CONFIG_PATH environment variable
No package 'hogweed' found
configure:9429: $? = 1
configure:9444: $PKG_CONFIG --exists --print-errors "hogweed >= 3.1"
Package hogweed was not found in the pkg-config search path.
Perhaps you should add the directory containing `hogweed.pc'
to the PKG_CONFIG_PATH environment variable
No package 'hogweed' found
configure:9447: $? = 1
No package 'hogweed' found
configure:9475: result: no
configure:9478: error:
***
*** Libhogweed (nettle's companion library) was not found. Note that
you must compile nettle with gmp support.
> ---
> meta/recipes-support/gnutls/{gnutls_3.5.5.bb => gnutls_3.5.6.bb} | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-support/gnutls/gnutls_3.5.5.bb b/meta/recipes-support/gnutls/gnutls_3.5.6.bb
> similarity index 60%
> rename from meta/recipes-support/gnutls/gnutls_3.5.5.bb
> rename to meta/recipes-support/gnutls/gnutls_3.5.6.bb
> index d255959..2e70734 100644
> --- a/meta/recipes-support/gnutls/gnutls_3.5.5.bb
> +++ b/meta/recipes-support/gnutls/gnutls_3.5.6.bb
> @@ -4,6 +4,6 @@ SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
> file://0001-configure.ac-fix-sed-command.patch \
> file://use-pkg-config-to-locate-zlib.patch \
> "
> -SRC_URI[md5sum] = "fb84c4d7922c1545da8dda4dcb9487d4"
> -SRC_URI[sha256sum] = "86994fe7804ee16d2811e366b9bf2f75304f8e470ae0e3716d60ffeedac0e529"
> +SRC_URI[md5sum] = "7a38b23757aae009c3eb5bb12fb0afda"
> +SRC_URI[sha256sum] = "6338b715bf31c758606ffa489c7f87ee1beab947114fbd2ffefd73170a8c6b9a"
>
>
> --
> To stop receiving notification emails like this one, please contact
> the administrator of this repository.
> --
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply
* [PATCH 00/13] [jethro] Consolidated pull
From: Robert Yang @ 2016-12-06 14:31 UTC (permalink / raw)
To: openembedded-core
Hi RP,
There are two PULLs, the one on openembedded-core-contrib is for oe-core,
the other one on poky-contrib is for poky, the later one has 2 more commits:
poky.conf: Bump version for 2.0.3 jethro release
build-appliance-image: Update to jethro head revision
I can't send them in oe-core's PULL is because poky.conf is not in oe-core,
and build-appliance-image depends on poky.conf, please verify the commit
is correct after merged.
// Robert
The following changes since commit d39e7ca717b67ad9f2f78b83d90d91e410e52965:
gnupg: fix find-version for beta checking (2016-11-03 17:40:52 +0000)
================== PULL 1 (13 commits for oe-core)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/jethro-next
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/jethro-next
Armin Kuster (13):
gnutils: Security fix CVE-2016-7444
bind: Security fix CVE-2016-2775
bind: Security fix CVE-2016-2776
openssl: Security fix CVE-2016-2179
openssl: Security fix CVE-2016-8610
python-2.7: Security fix CVE-2016-0772
python-2.7: Security fix CVE-2016-5636
python-2.7: Security fix CVE-2016-5699
python-2.7: Security fix CVE-2016-1000110
tzcode-native: update to 2016h
tzdata: Update to 2016h
tzcode: update to 2016i
tzdata: update to 2016i
================== PULL 2 (15 commits for poky, includes PULL 1)
git://git.pokylinux.org/poky-contrib rbt/jethro-next
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/jethro-next
Armin Kuster (13):
gnutils: Security fix CVE-2016-7444
bind: Security fix CVE-2016-2775
bind: Security fix CVE-2016-2776
openssl: Security fix CVE-2016-2179
openssl: Security fix CVE-2016-8610
python-2.7: Security fix CVE-2016-0772
python-2.7: Security fix CVE-2016-5636
python-2.7: Security fix CVE-2016-5699
python-2.7: Security fix CVE-2016-1000110
tzcode-native: update to 2016h
tzdata: Update to 2016h
tzcode: update to 2016i
tzdata: update to 2016i
Robert Yang (2):
poky.conf: Bump version for 2.0.3 jethro release
build-appliance-image: Update to jethro head revision
--
2.10.2
^ permalink raw reply
* Re: [PATCH 00/33] Accumulated patches for deb packaging
From: Burton, Ross @ 2016-12-06 14:36 UTC (permalink / raw)
To: Andreas Oberritter; +Cc: OE-core
In-Reply-To: <1481024991-5882-1-git-send-email-obi@opendreambox.org>
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
On 6 December 2016 at 11:49, Andreas Oberritter <obi@opendreambox.org>
wrote:
> These are most of my patches which accumulated since our distro
> switched from opkg to dpkg and apt two years ago. They were tested
> thoroughly on dora and krogoth and just a little bit on master.
>
Is this on a branch somewhere?
Ross
[-- Attachment #2: Type: text/html, Size: 741 bytes --]
^ permalink raw reply
* [PATCH] dhcp: 4.3.4 -> 4.3.5
From: Huang Qiyu @ 2016-12-06 22:38 UTC (permalink / raw)
To: openembedded-core
Upgrade dhcp from 4.3.4 to 4.3.5.
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
---
meta/recipes-connectivity/dhcp/binutils-gdb | 1 +
meta/recipes-connectivity/dhcp/{dhcp_4.3.4.bb => dhcp_4.3.5.bb} | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
create mode 160000 meta/recipes-connectivity/dhcp/binutils-gdb
rename meta/recipes-connectivity/dhcp/{dhcp_4.3.4.bb => dhcp_4.3.5.bb} (81%)
diff --git a/meta/recipes-connectivity/dhcp/binutils-gdb b/meta/recipes-connectivity/dhcp/binutils-gdb
new file mode 160000
index 0000000..39eeab2
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/binutils-gdb
@@ -0,0 +1 @@
+Subproject commit 39eeab253474493bc9477dbb2bd9c8041f05764b
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.4.bb b/meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb
similarity index 81%
rename from meta/recipes-connectivity/dhcp/dhcp_4.3.4.bb
rename to meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb
index 4151eb1..678c29a 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.3.4.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb
@@ -11,8 +11,8 @@ SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
file://remove-dhclient-script-bash-dependency.patch \
"
-SRC_URI[md5sum] = "0138319fe2b788cf4bdf34fbeaf9ff54"
-SRC_URI[sha256sum] = "f5115aee3dd3e6925de4ba47b80ab732ba48b481c8364b6ebade2d43698d607e"
+SRC_URI[md5sum] = "2b5e5b2fa31c2e27e487039d86f83d3f"
+SRC_URI[sha256sum] = "eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954"
PACKAGECONFIG ?= ""
PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-libxml2,libxml2"
--
2.7.4
^ permalink raw reply related
* Re: [PATCH] dhcp: 4.3.4 -> 4.3.5
From: Burton, Ross @ 2016-12-06 14:41 UTC (permalink / raw)
To: Huang Qiyu; +Cc: OE-core
In-Reply-To: <1481063903-49514-1-git-send-email-huangqy.fnst@cn.fujitsu.com>
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
On 6 December 2016 at 22:38, Huang Qiyu <huangqy.fnst@cn.fujitsu.com> wrote:
> +++ b/meta/recipes-connectivity/dhcp/binutils-gdb
> @@ -0,0 +1 @@
> +Subproject commit 39eeab253474493bc9477dbb2bd9c8041f05764b
>
Can you resend without this bit?
Ross
[-- Attachment #2: Type: text/html, Size: 688 bytes --]
^ permalink raw reply
* Re: [oe-commits] [openembedded-core] 67/76: gnutls: update to 3.5.6
From: Martin Jansa @ 2016-12-06 14:44 UTC (permalink / raw)
To: openembedded-core, Alexander Kanavin; +Cc: openembedded-commits
In-Reply-To: <20161206134904.GA3255@jama>
[-- Attachment #1: Type: text/plain, Size: 3957 bytes --]
On Tue, Dec 06, 2016 at 02:49:04PM +0100, Martin Jansa wrote:
> On Wed, Nov 30, 2016 at 03:49:52PM +0000, git@git.openembedded.org wrote:
> > rpurdie pushed a commit to branch master
> > in repository openembedded-core.
> >
> > commit 27f306a752d15ec62d2821d0146be4ffa10b7013
> > Author: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> > AuthorDate: Mon Nov 28 15:34:20 2016 +0200
> >
> > gnutls: update to 3.5.6
> >
> > Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> > Signed-off-by: Ross Burton <ross.burton@intel.com>
>
> Anyone else also seeing this?
>
> configure:9271: result: no
> configure:9337: checking for NETTLE
> configure:9345: $PKG_CONFIG --exists --print-errors "nettle >= 3.1"
> configure:9348: $? = 0
> configure:9363: $PKG_CONFIG --exists --print-errors "nettle >= 3.1"
> configure:9366: $? = 0
> configure:9412: result: yes
> configure:9418: checking for HOGWEED
> configure:9426: $PKG_CONFIG --exists --print-errors "hogweed >= 3.1"
> Package hogweed was not found in the pkg-config search path.
> Perhaps you should add the directory containing `hogweed.pc'
> to the PKG_CONFIG_PATH environment variable
> No package 'hogweed' found
> configure:9429: $? = 1
> configure:9444: $PKG_CONFIG --exists --print-errors "hogweed >= 3.1"
> Package hogweed was not found in the pkg-config search path.
> Perhaps you should add the directory containing `hogweed.pc'
> to the PKG_CONFIG_PATH environment variable
> No package 'hogweed' found
> configure:9447: $? = 1
> No package 'hogweed' found
> configure:9475: result: no
> configure:9478: error:
> ***
> *** Libhogweed (nettle's companion library) was not found. Note that
> you must compile nettle with gmp support.
Probably caused by nettle upgrade which no longer enables gmp with older
gmp 4.2.1 used in non-GPLv3 builds.
checking for __gmpz_powm_sec in -lgmp... no
configure: WARNING: GNU MP not found, or too old. GMP-5.0 or later is needed, see http://gmplib.org/.
Support for public key algorithms will be unavailable.
configure: Looking for assembler files in arm.
switching to older nettle 2.7.1 doesn't help, because nettle 3.1 is required by gnutls..
| checking for NETTLE... no
| configure: error:
| ***
| *** Libnettle 3.1 was not found.
nettle 3.1 is required by gnutls..
> > meta/recipes-support/gnutls/{gnutls_3.5.5.bb => gnutls_3.5.6.bb} | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-support/gnutls/gnutls_3.5.5.bb b/meta/recipes-support/gnutls/gnutls_3.5.6.bb
> > similarity index 60%
> > rename from meta/recipes-support/gnutls/gnutls_3.5.5.bb
> > rename to meta/recipes-support/gnutls/gnutls_3.5.6.bb
> > index d255959..2e70734 100644
> > --- a/meta/recipes-support/gnutls/gnutls_3.5.5.bb
> > +++ b/meta/recipes-support/gnutls/gnutls_3.5.6.bb
> > @@ -4,6 +4,6 @@ SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
> > file://0001-configure.ac-fix-sed-command.patch \
> > file://use-pkg-config-to-locate-zlib.patch \
> > "
> > -SRC_URI[md5sum] = "fb84c4d7922c1545da8dda4dcb9487d4"
> > -SRC_URI[sha256sum] = "86994fe7804ee16d2811e366b9bf2f75304f8e470ae0e3716d60ffeedac0e529"
> > +SRC_URI[md5sum] = "7a38b23757aae009c3eb5bb12fb0afda"
> > +SRC_URI[sha256sum] = "6338b715bf31c758606ffa489c7f87ee1beab947114fbd2ffefd73170a8c6b9a"
> >
> >
> > --
> > To stop receiving notification emails like this one, please contact
> > the administrator of this repository.
> > --
> > _______________________________________________
> > Openembedded-commits mailing list
> > Openembedded-commits@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-commits
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply
* Re: [oe-commits] [openembedded-core] 67/76: gnutls: update to 3.5.6
From: Burton, Ross @ 2016-12-06 14:47 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-commits@lists.openembedded.org, OE-core
In-Reply-To: <20161206144400.GB3255@jama>
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
On 6 December 2016 at 14:44, Martin Jansa <martin.jansa@gmail.com> wrote:
> Probably caused by nettle upgrade which no longer enables gmp with older
> gmp 4.2.1 used in non-GPLv3 builds.
>
I was going to say I don't see this. Clearly we need to extend the
non-GPL3 testing.
As you can reproduce this, is there a simple fix?
Ross
[-- Attachment #2: Type: text/html, Size: 823 bytes --]
^ permalink raw reply
* what is the closest alternative to red hat's ABRT in OE?
From: Robert P. J. Day @ 2016-12-06 14:49 UTC (permalink / raw)
To: OE Core mailing list
as in:
https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Deployment_Guide/ch-abrt.html
specifically, to manage core files? i would have thought judicious use
of "ulimit" would be the solution. others?
rday
--
========================================================================
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
========================================================================
^ permalink raw reply
* Re: [oe-commits] [openembedded-core] 67/76: gnutls: update to 3.5.6
From: Martin Jansa @ 2016-12-06 15:01 UTC (permalink / raw)
To: Burton, Ross; +Cc: penembedded-commits, OE-core
In-Reply-To: <CAJTo0LbaSgpFSthT55QFroQ8Uc51x4KpOUK8GZK-8=NCf8oE8Q@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1025 bytes --]
On Tue, Dec 06, 2016 at 02:47:42PM +0000, Burton, Ross wrote:
> On 6 December 2016 at 14:44, Martin Jansa <martin.jansa@gmail.com> wrote:
>
> > Probably caused by nettle upgrade which no longer enables gmp with older
> > gmp 4.2.1 used in non-GPLv3 builds.
> >
>
> I was going to say I don't see this. Clearly we need to extend the
> non-GPL3 testing.
>
> As you can reproduce this, is there a simple fix?
Restoring nettle-3.2 (which got replaced with 3.3 in this commit:
commit fc37c0787008437d94bccfaa91d0b84180a393c9
Author: Fabio Berton <fabio.berton@ossystems.com.br>
Date: Mon Nov 21 18:17:24 2016 -0200
nettle: Update to version 3.3
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
)
allows to use gmp-4.2.1 and nettle-3.2 is good enough for
gnutls.do_configure.
Now I need to check if LGPLv3 libnettle or libhogweed end in the image
or not.
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply
* [PATCH] less: 481 -> 487
From: Huang Qiyu @ 2016-12-06 23:05 UTC (permalink / raw)
To: openembedded-core
Upgrade less from 481 to 487.
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
---
meta/recipes-extended/less/{less_481.bb => less_487.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/less/{less_481.bb => less_487.bb} (83%)
diff --git a/meta/recipes-extended/less/less_481.bb b/meta/recipes-extended/less/less_487.bb
similarity index 83%
rename from meta/recipes-extended/less/less_481.bb
rename to meta/recipes-extended/less/less_487.bb
index 0fcd819..23ae484 100644
--- a/meta/recipes-extended/less/less_481.bb
+++ b/meta/recipes-extended/less/less_487.bb
@@ -21,14 +21,14 @@ SECTION = "console/utils"
LICENSE = "GPLv3+ | BSD-2-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
- file://LICENSE;md5=48c26a307f91af700e1f00585f215aaf"
+ file://LICENSE;md5=2ef3e4b8dafc85612bc5254b8081e234"
DEPENDS = "ncurses"
SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \
"
-SRC_URI[md5sum] = "50ef46065c65257141a7340123527767"
-SRC_URI[sha256sum] = "3fa38f2cf5e9e040bb44fffaa6c76a84506e379e47f5a04686ab78102090dda5"
+SRC_URI[md5sum] = "dcc8bf183a83b362d37fe9ef8df1fb60"
+SRC_URI[sha256sum] = "f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706"
UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html"
--
2.7.4
^ permalink raw reply related
* Re: [PATCH] less: 481 -> 487
From: Burton, Ross @ 2016-12-06 15:07 UTC (permalink / raw)
To: Huang Qiyu; +Cc: OE-core
In-Reply-To: <1481065505-49663-1-git-send-email-huangqy.fnst@cn.fujitsu.com>
[-- Attachment #1: Type: text/plain, Size: 542 bytes --]
On 6 December 2016 at 23:05, Huang Qiyu <huangqy.fnst@cn.fujitsu.com> wrote:
> LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> - file://LICENSE;md5=48c26a307f91af700e1f00585f215aaf"
> + file://LICENSE;md5=2ef3e4b8dafc85612bc5254b8081e234"
>
Please resend with an explanation in the commit message as to why the
LICENSE has changed (for example, because it was relicensed to GPLv3, or
because the copyright years were updated, or the text was reformatted).
Ross
[-- Attachment #2: Type: text/html, Size: 1019 bytes --]
^ permalink raw reply
* [PATCH] insane: Add SH4 musl mapping to the QA arch tests
From: Vladimir Zapolskiy @ 2016-12-06 15:17 UTC (permalink / raw)
To: openembedded-core
This change allows to pass QA for packages built with sh4-oe-linux-musl
toolchain, the problem is reproted while building core-image-minimal target:
ERROR: readline-7.0-r0 do_package_qa:
Error executing a python function in exec_python_func() autogenerated
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
---
meta/classes/insane.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 5ddb87b..01494e3 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -138,6 +138,7 @@ def package_qa_get_machine_dict(d):
"microblaze": (189, 0, 0, False, 32),
"microblazeeb":(189, 0, 0, False, 32),
"microblazeel":(189, 0, 0, True, 32),
+ "sh4": ( 42, 0, 0, True, 32),
},
"uclinux-uclibc" : {
"bfin": ( 106, 0, 0, True, 32),
--
2.10.2
^ permalink raw reply related
* [PATCH V6] cleanup subprocess
From: Stephano Cetola @ 2016-12-06 15:30 UTC (permalink / raw)
To: openembedded-core
Changed since V5:
Smart needs to dump the installed packages to a file, as this file
is used to detect changes in the install. This was breaking:
test_incremental_image_generation
Stephano Cetola (1):
package_manager: remove strings and migrate to direct arrays
meta/lib/oe/package.py | 13 +--
meta/lib/oe/package_manager.py | 233 ++++++++++++++++++++---------------------
2 files changed, 121 insertions(+), 125 deletions(-)
--
2.10.2
^ permalink raw reply
* [PATCH V6] package_manager: remove strings and migrate to direct arrays
From: Stephano Cetola @ 2016-12-06 15:30 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161206153059.101115-1-stephano.cetola@linux.intel.com>
When using subprocess call and check_output, it is better to use arrays
rather than strings when possible to avoid whitespace and quoting
problems.
[ YOCTO #9342 ]
Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com>
---
meta/lib/oe/package.py | 13 +--
meta/lib/oe/package_manager.py | 233 ++++++++++++++++++++---------------------
2 files changed, 121 insertions(+), 125 deletions(-)
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index 02642f2..ae60a58 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -18,23 +18,24 @@ def runstrip(arg):
newmode = origmode | stat.S_IWRITE | stat.S_IREAD
os.chmod(file, newmode)
- extraflags = ""
+ stripcmd = [strip]
# kernel module
if elftype & 16:
- extraflags = "--strip-debug --remove-section=.comment --remove-section=.note --preserve-dates"
+ stripcmd.extend(["--strip-debug", "--remove-section=.comment",
+ "--remove-section=.note", "--preserve-dates"])
# .so and shared library
elif ".so" in file and elftype & 8:
- extraflags = "--remove-section=.comment --remove-section=.note --strip-unneeded"
+ stripcmd.extend(["--remove-section=.comment", "--remove-section=.note", "--strip-unneeded"])
# shared or executable:
elif elftype & 8 or elftype & 4:
- extraflags = "--remove-section=.comment --remove-section=.note"
+ stripcmd.extend(["--remove-section=.comment", "--remove-section=.note"])
- stripcmd = "'%s' %s '%s'" % (strip, extraflags, file)
+ stripcmd.append(file)
bb.debug(1, "runstrip: %s" % stripcmd)
try:
- output = subprocess.check_output(stripcmd, stderr=subprocess.STDOUT, shell=True)
+ output = subprocess.check_output(stripcmd, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e:
bb.error("runstrip: '%s' strip command failed with %s (%s)" % (stripcmd, e.returncode, e.output))
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 7ba2e4d..e5e3c3b 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -358,12 +358,11 @@ class RpmPkgsList(PkgsList):
RpmIndexer(d, rootfs_dir).get_ml_prefix_and_os_list(arch_var, os_var)
# Determine rpm version
- cmd = "%s --version" % self.rpm_cmd
try:
- output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).decode("utf-8")
+ output = subprocess.check_output([self.rpm_cmd, "--version"], stderr=subprocess.STDOUT).decode("utf-8")
except subprocess.CalledProcessError as e:
bb.fatal("Getting rpm version failed. Command '%s' "
- "returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8")))
+ "returned %d:\n%s" % (self.rpm_cmd, e.returncode, e.output.decode("utf-8")))
'''
Translate the RPM/Smart format names to the OE multilib format names
@@ -412,16 +411,15 @@ class RpmPkgsList(PkgsList):
return output
def list_pkgs(self):
- cmd = self.rpm_cmd + ' --root ' + self.rootfs_dir
- cmd += ' -D "_dbpath /var/lib/rpm" -qa'
- cmd += " --qf '[%{NAME} %{ARCH} %{VERSION} %{PACKAGEORIGIN}\n]'"
+ cmd = [self.rpm_cmd, '--root', self.rootfs_dir]
+ cmd.extend(['-D', '_dbpath /var/lib/rpm'])
+ cmd.extend(['-qa', '--qf', '[%{NAME} %{ARCH} %{VERSION} %{PACKAGEORIGIN}\n]'])
try:
- # bb.note(cmd)
- tmp_output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).strip().decode("utf-8")
+ tmp_output = subprocess.check_output(cmd, stderr=subprocess.STDOUT).strip().decode("utf-8")
except subprocess.CalledProcessError as e:
bb.fatal("Cannot get the installed packages list. Command '%s' "
- "returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8")))
+ "returned %d:\n%s" % (' '.join(cmd), e.returncode, e.output.decode("utf-8")))
output = dict()
deps = dict()
@@ -672,11 +670,11 @@ class RpmPM(PackageManager):
# 2 = --log-level=debug
# 3 = --log-level=debug plus dumps of scriplet content and command invocation
self.debug_level = int(d.getVar('ROOTFS_RPM_DEBUG', True) or "0")
- self.smart_opt = "--log-level=%s --data-dir=%s" % \
+ self.smart_opt = ["--log-level=%s" %
("warning" if self.debug_level == 0 else
"info" if self.debug_level == 1 else
- "debug",
- os.path.join(target_rootfs, 'var/lib/smart'))
+ "debug"), "--data-dir=%s" %
+ os.path.join(target_rootfs, 'var/lib/smart')]
self.scriptlet_wrapper = self.d.expand('${WORKDIR}/scriptlet_wrapper')
self.solution_manifest = self.d.expand('${T}/saved/%s_solution' %
self.task_name)
@@ -732,18 +730,18 @@ class RpmPM(PackageManager):
for arch in arch_list:
bb.note('Adding Smart channel url%d%s (%s)' %
(uri_iterator, arch, channel_priority))
- self._invoke_smart('channel --add url%d-%s type=rpm-md baseurl=%s/%s -y'
- % (uri_iterator, arch, uri, arch))
- self._invoke_smart('channel --set url%d-%s priority=%d' %
- (uri_iterator, arch, channel_priority))
+ self._invoke_smart(['channel', '--add', 'url%d-%s' % (uri_iterator, arch),
+ 'type=rpm-md', 'baseurl=%s/%s' % (uri, arch), '-y'])
+ self._invoke_smart(['channel', '--set', 'url%d-%s' % (uri_iterator, arch),
+ 'priority=%d' % channel_priority])
channel_priority -= 5
else:
bb.note('Adding Smart channel url%d (%s)' %
(uri_iterator, channel_priority))
- self._invoke_smart('channel --add url%d type=rpm-md baseurl=%s -y'
- % (uri_iterator, uri))
- self._invoke_smart('channel --set url%d priority=%d' %
- (uri_iterator, channel_priority))
+ self._invoke_smart(['channel', '--add', 'url%d' % uri_iterator,
+ 'type=rpm-md', 'baseurl=%s' % uri, '-y'])
+ self._invoke_smart(['channel', '--set', 'url%d' % uri_iterator,
+ 'priority=%d' % channel_priority])
channel_priority -= 5
uri_iterator += 1
@@ -774,18 +772,17 @@ class RpmPM(PackageManager):
self._create_configs(platform, platform_extra)
+ #takes array args
def _invoke_smart(self, args):
- cmd = "%s %s %s" % (self.smart_cmd, self.smart_opt, args)
+ cmd = [self.smart_cmd] + self.smart_opt + args
# bb.note(cmd)
try:
- complementary_pkgs = subprocess.check_output(cmd,
- stderr=subprocess.STDOUT,
- shell=True).decode("utf-8")
+ complementary_pkgs = subprocess.check_output(cmd,stderr=subprocess.STDOUT).decode("utf-8")
# bb.note(complementary_pkgs)
return complementary_pkgs
except subprocess.CalledProcessError as e:
bb.fatal("Could not invoke smart. Command "
- "'%s' returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8")))
+ "'%s' returned %d:\n%s" % (' '.join(cmd), e.returncode, e.output.decode("utf-8")))
def _search_pkg_name_in_feeds(self, pkg, feed_archs):
for arch in feed_archs:
@@ -800,19 +797,23 @@ class RpmPM(PackageManager):
# Search provides if not found by pkgname.
bb.note('Not found %s by name, searching provides ...' % pkg)
- cmd = "%s %s query --provides %s --show-format='$name-$version'" % \
- (self.smart_cmd, self.smart_opt, pkg)
- cmd += " | sed -ne 's/ *Provides://p'"
- bb.note('cmd: %s' % cmd)
- output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).decode("utf-8")
- # Found a provider
- if output:
- bb.note('Found providers for %s: %s' % (pkg, output))
- for p in output.split():
- for arch in feed_archs:
- arch = arch.replace('-', '_')
- if p.rstrip().endswith('@' + arch):
- return p
+ cmd = [self.smart_cmd] + self.smart_opt + ["query", "--provides", pkg,
+ "--show-format=$name-$version"]
+ bb.note('cmd: %s' % ' '.join(cmd))
+ ps = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+ try:
+ output = subprocess.check_output(["sed", "-ne", "s/ *Provides://p"],
+ stdin=ps.stdout, stderr=subprocess.STDOUT).decode("utf-8")
+ # Found a provider
+ if output:
+ bb.note('Found providers for %s: %s' % (pkg, output))
+ for p in output.split():
+ for arch in feed_archs:
+ arch = arch.replace('-', '_')
+ if p.rstrip().endswith('@' + arch):
+ return p
+ except subprocess.CalledProcessError as e:
+ bb.error("Failed running smart query on package %s." % pkg)
return ""
@@ -949,30 +950,32 @@ class RpmPM(PackageManager):
open(db_config_dir, 'w+').write(DB_CONFIG_CONTENT)
# Create database so that smart doesn't complain (lazy init)
- opt = "-qa"
- cmd = "%s --root %s --dbpath /var/lib/rpm %s > /dev/null" % (
- self.rpm_cmd, self.target_rootfs, opt)
+ cmd = [self.rpm_cmd, '--root', self.target_rootfs, '--dbpath', '/var/lib/rpm', '-qa']
try:
- subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
+ subprocess.check_output(cmd, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e:
bb.fatal("Create rpm database failed. Command '%s' "
- "returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8")))
+ "returned %d:\n%s" % (' '.join(cmd), e.returncode, e.output.decode("utf-8")))
# Import GPG key to RPM database of the target system
if self.d.getVar('RPM_SIGN_PACKAGES', True) == '1':
pubkey_path = self.d.getVar('RPM_GPG_PUBKEY', True)
- cmd = "%s --root %s --dbpath /var/lib/rpm --import %s > /dev/null" % (
- self.rpm_cmd, self.target_rootfs, pubkey_path)
- subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
+ cmd = [self.rpm_cmd, '--root', self.target_rootfs, '--dbpath', '/var/lib/rpm', '--import', pubkey_path]
+ try:
+ subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+ except subprocess.CalledProcessError as e:
+ bb.fatal("Import GPG key failed. Command '%s' "
+ "returned %d:\n%s" % (' '.join(cmd), e.returncode, e.output.decode("utf-8")))
+
# Configure smart
bb.note("configuring Smart settings")
bb.utils.remove(os.path.join(self.target_rootfs, 'var/lib/smart'),
True)
- self._invoke_smart('config --set rpm-root=%s' % self.target_rootfs)
- self._invoke_smart('config --set rpm-dbpath=/var/lib/rpm')
- self._invoke_smart('config --set rpm-extra-macros._var=%s' %
- self.d.getVar('localstatedir', True))
- cmd = "config --set rpm-extra-macros._tmppath=/%s/tmp" % (self.install_dir_name)
+ self._invoke_smart(['config', '--set', 'rpm-root=%s' % self.target_rootfs])
+ self._invoke_smart(['config', '--set', 'rpm-dbpath=/var/lib/rpm'])
+ self._invoke_smart(['config', '--set', 'rpm-extra-macros._var=%s' %
+ self.d.getVar('localstatedir', True)])
+ cmd = ["config", "--set", "rpm-extra-macros._tmppath=/%s/tmp" % self.install_dir_name]
prefer_color = self.d.getVar('RPM_PREFER_ELF_ARCH', True)
if prefer_color:
@@ -986,32 +989,32 @@ class RpmPM(PackageManager):
['mips64', 'mips64el']:
bb.fatal("RPM_PREFER_ELF_ARCH = \"4\" is for mips64 or mips64el "
"only.")
- self._invoke_smart('config --set rpm-extra-macros._prefer_color=%s'
- % prefer_color)
+ self._invoke_smart(['config', '--set', 'rpm-extra-macros._prefer_color=%s'
+ % prefer_color])
self._invoke_smart(cmd)
- self._invoke_smart('config --set rpm-ignoresize=1')
+ self._invoke_smart(['config', '--set', 'rpm-ignoresize=1'])
# Write common configuration for host and target usage
- self._invoke_smart('config --set rpm-nolinktos=1')
- self._invoke_smart('config --set rpm-noparentdirs=1')
+ self._invoke_smart(['config', '--set', 'rpm-nolinktos=1'])
+ self._invoke_smart(['config', '--set', 'rpm-noparentdirs=1'])
check_signature = self.d.getVar('RPM_CHECK_SIGNATURES', True)
if check_signature and check_signature.strip() == "0":
- self._invoke_smart('config --set rpm-check-signatures=false')
+ self._invoke_smart(['config', '--set rpm-check-signatures=false'])
for i in self.d.getVar('BAD_RECOMMENDATIONS', True).split():
- self._invoke_smart('flag --set ignore-recommends %s' % i)
+ self._invoke_smart(['flag', '--set', 'ignore-recommends', i])
# Do the following configurations here, to avoid them being
# saved for field upgrade
if self.d.getVar('NO_RECOMMENDATIONS', True).strip() == "1":
- self._invoke_smart('config --set ignore-all-recommends=1')
+ self._invoke_smart(['config', '--set', 'ignore-all-recommends=1'])
pkg_exclude = self.d.getVar('PACKAGE_EXCLUDE', True) or ""
for i in pkg_exclude.split():
- self._invoke_smart('flag --set exclude-packages %s' % i)
+ self._invoke_smart(['flag', '--set', 'exclude-packages', i])
# Optional debugging
- # self._invoke_smart('config --set rpm-log-level=debug')
- # cmd = 'config --set rpm-log-file=/tmp/smart-debug-logfile'
+ # self._invoke_smart(['config', '--set', 'rpm-log-level=debug'])
+ # cmd = ['config', '--set', 'rpm-log-file=/tmp/smart-debug-logfile']
# self._invoke_smart(cmd)
ch_already_added = []
for canonical_arch in platform_extra:
@@ -1030,16 +1033,16 @@ class RpmPM(PackageManager):
if not arch in ch_already_added:
bb.note('Adding Smart channel %s (%s)' %
(arch, channel_priority))
- self._invoke_smart('channel --add %s type=rpm-md baseurl=%s -y'
- % (arch, arch_channel))
- self._invoke_smart('channel --set %s priority=%d' %
- (arch, channel_priority))
+ self._invoke_smart(['channel', '--add', arch, 'type=rpm-md',
+ 'baseurl=%s' % arch_channel, '-y'])
+ self._invoke_smart(['channel', '--set', arch, 'priority=%d' %
+ channel_priority])
channel_priority -= 5
ch_already_added.append(arch)
bb.note('adding Smart RPM DB channel')
- self._invoke_smart('channel --add rpmsys type=rpm-sys -y')
+ self._invoke_smart(['channel', '--add', 'rpmsys', 'type=rpm-sys', '-y'])
# Construct install scriptlet wrapper.
# Scripts need to be ordered when executed, this ensures numeric order.
@@ -1102,15 +1105,15 @@ class RpmPM(PackageManager):
bb.note("configuring RPM cross-install scriptlet_wrapper")
os.chmod(self.scriptlet_wrapper, 0o755)
- cmd = 'config --set rpm-extra-macros._cross_scriptlet_wrapper=%s' % \
- self.scriptlet_wrapper
+ cmd = ['config', '--set', 'rpm-extra-macros._cross_scriptlet_wrapper=%s' %
+ self.scriptlet_wrapper]
self._invoke_smart(cmd)
# Debug to show smart config info
- # bb.note(self._invoke_smart('config --show'))
+ # bb.note(self._invoke_smart(['config', '--show']))
def update(self):
- self._invoke_smart('update rpmsys')
+ self._invoke_smart(['update', 'rpmsys'])
def get_rdepends_recursively(self, pkgs):
# pkgs will be changed during the loop, so use [:] to make a copy.
@@ -1207,20 +1210,19 @@ class RpmPM(PackageManager):
return
if not attempt_only:
bb.note('to be installed: %s' % ' '.join(pkgs))
- cmd = "%s %s install -y %s" % \
- (self.smart_cmd, self.smart_opt, ' '.join(pkgs))
- bb.note(cmd)
+ cmd = [self.smart_cmd] + self.smart_opt + ["install", "-y"] + pkgs
+ bb.note(' '.join(cmd))
else:
bb.note('installing attempt only packages...')
bb.note('Attempting %s' % ' '.join(pkgs))
- cmd = "%s %s install --attempt -y %s" % \
- (self.smart_cmd, self.smart_opt, ' '.join(pkgs))
+ cmd = [self.smart_cmd] + self.smart_opt + ["install", "--attempt",
+ "-y"] + pkgs
try:
- output = subprocess.check_output(cmd.split(), stderr=subprocess.STDOUT).decode("utf-8")
+ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8")
bb.note(output)
except subprocess.CalledProcessError as e:
bb.fatal("Unable to install packages. Command '%s' "
- "returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8")))
+ "returned %d:\n%s" % (' '.join(cmd), e.returncode, e.output.decode("utf-8")))
'''
Remove pkgs with smart, the pkg name is smart/rpm format
@@ -1229,24 +1231,19 @@ class RpmPM(PackageManager):
bb.note('to be removed: ' + ' '.join(pkgs))
if not with_dependencies:
- cmd = "%s -e --nodeps " % self.rpm_cmd
- cmd += "--root=%s " % self.target_rootfs
- cmd += "--dbpath=/var/lib/rpm "
- cmd += "--define='_cross_scriptlet_wrapper %s' " % \
- self.scriptlet_wrapper
- cmd += "--define='_tmppath /%s/tmp' %s" % (self.install_dir_name, ' '.join(pkgs))
+ cmd = [self.rpm_cmd] + ["-e", "--nodeps", "--root=%s" %
+ self.target_rootfs, "--dbpath=/var/lib/rpm",
+ "--define='_cross_scriptlet_wrapper %s'" %
+ self.scriptlet_wrapper,
+ "--define='_tmppath /%s/tmp'" % self.install_dir_name] + pkgs
else:
# for pkg in pkgs:
# bb.note('Debug: What required: %s' % pkg)
- # bb.note(self._invoke_smart('query %s --show-requiredby' % pkg))
-
- cmd = "%s %s remove -y %s" % (self.smart_cmd,
- self.smart_opt,
- ' '.join(pkgs))
-
+ # bb.note(self._invoke_smart(['query', pkg, '--show-requiredby']))
+ cmd = [self.smart_cmd] + self.smart_opt + ["remove", "-y"] + pkgs
try:
- bb.note(cmd)
- output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).decode("utf-8")
+ bb.note(' '.join(cmd))
+ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8")
bb.note(output)
except subprocess.CalledProcessError as e:
bb.note("Unable to remove packages. Command '%s' "
@@ -1254,7 +1251,7 @@ class RpmPM(PackageManager):
def upgrade(self):
bb.note('smart upgrade')
- self._invoke_smart('upgrade')
+ self._invoke_smart(['upgrade'])
def write_index(self):
result = self.indexer.write_index()
@@ -1307,25 +1304,24 @@ class RpmPM(PackageManager):
pkgs = self._pkg_translate_oe_to_smart(pkgs, False)
install_pkgs = list()
- cmd = "%s %s install -y --dump %s 2>%s" % \
- (self.smart_cmd,
- self.smart_opt,
- ' '.join(pkgs),
- self.solution_manifest)
+ cmd = [self.smart_cmd] + self.smart_opt + ['install', '-y', '--dump'] + pkgs
try:
# Disable rpmsys channel for the fake install
- self._invoke_smart('channel --disable rpmsys')
+ self._invoke_smart(['channel', '--disable', 'rpmsys'])
- subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
+ output = subprocess.check_output(cmd,stderr=subprocess.STDOUT).decode('utf-8')
+ f = open(self.solution_manifest, 'w')
+ f.write(output)
+ f.close()
with open(self.solution_manifest, 'r') as manifest:
for pkg in manifest.read().split('\n'):
if '@' in pkg:
- install_pkgs.append(pkg)
+ install_pkgs.append(pkg.strip())
except subprocess.CalledProcessError as e:
bb.note("Unable to dump install packages. Command '%s' "
"returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8")))
# Recovery rpmsys channel
- self._invoke_smart('channel --enable rpmsys')
+ self._invoke_smart(['channel', '--enable', 'rpmsys'])
return install_pkgs
'''
@@ -1355,17 +1351,16 @@ class RpmPM(PackageManager):
def dump_all_available_pkgs(self):
available_manifest = self.d.expand('${T}/saved/available_pkgs.txt')
available_pkgs = list()
- cmd = "%s %s query --output %s" % \
- (self.smart_cmd, self.smart_opt, available_manifest)
+ cmd = [self.smart_cmd] + self.smart_opt + ['query', '--output', available_manifest]
try:
- subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
+ subprocess.check_output(cmd, stderr=subprocess.STDOUT)
with open(available_manifest, 'r') as manifest:
for pkg in manifest.read().split('\n'):
if '@' in pkg:
available_pkgs.append(pkg.strip())
except subprocess.CalledProcessError as e:
bb.note("Unable to list all available packages. Command '%s' "
- "returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8")))
+ "returned %d:\n%s" % (' '.join(cmd), e.returncode, e.output.decode("utf-8")))
self.fullpkglist = available_pkgs
@@ -1404,11 +1399,11 @@ class RpmPM(PackageManager):
bb.utils.remove(os.path.join(self.target_rootfs, 'var/lib/smart'),
True)
- self._invoke_smart('config --set rpm-nolinktos=1')
- self._invoke_smart('config --set rpm-noparentdirs=1')
+ self._invoke_smart(['config', '--set', 'rpm-nolinktos=1'])
+ self._invoke_smart(['config', '--set', 'rpm-noparentdirs=1'])
for i in self.d.getVar('BAD_RECOMMENDATIONS', True).split():
- self._invoke_smart('flag --set ignore-recommends %s' % i)
- self._invoke_smart('channel --add rpmsys type=rpm-sys -y')
+ self._invoke_smart(['flag', '--set', 'ignore-recommends', i])
+ self._invoke_smart(['channel', '--add', 'rpmsys', 'type=rpm-sys', '-y'])
'''
The rpm db lock files were produced after invoking rpm to query on
@@ -1425,12 +1420,12 @@ class RpmPM(PackageManager):
Returns a dictionary with the package info.
"""
def package_info(self, pkg):
- cmd = "%s %s info --urls %s" % (self.smart_cmd, self.smart_opt, pkg)
+ cmd = [self.smart_cmd] + self.smart_opt + ['info', '--urls', pkg]
try:
- output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).decode("utf-8")
+ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8")
except subprocess.CalledProcessError as e:
bb.fatal("Unable to list available packages. Command '%s' "
- "returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8")))
+ "returned %d:\n%s" % (' '.join(cmd), e.returncode, e.output.decode("utf-8")))
# Set default values to avoid UnboundLocalError
arch = ""
@@ -1550,18 +1545,18 @@ class OpkgDpkgPM(PackageManager):
os.chdir(tmp_dir)
try:
- cmd = "%s x %s" % (ar_cmd, pkg_path)
- output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
- cmd = "%s xf data.tar.*" % tar_cmd
- output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
+ cmd = [ar_cmd, 'x', pkg_path]
+ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+ cmd = [tar_cmd, 'xf', 'data.tar.*']
+ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e:
bb.utils.remove(tmp_dir, recurse=True)
bb.fatal("Unable to extract %s package. Command '%s' "
- "returned %d:\n%s" % (pkg_path, cmd, e.returncode, e.output.decode("utf-8")))
+ "returned %d:\n%s" % (pkg_path, ' '.join(cmd), e.returncode, e.output.decode("utf-8")))
except OSError as e:
bb.utils.remove(tmp_dir, recurse=True)
bb.fatal("Unable to extract %s package. Command '%s' "
- "returned %d:\n%s at %s" % (pkg_path, cmd, e.errno, e.strerror, e.filename))
+ "returned %d:\n%s at %s" % (pkg_path, ' '.join(cmd), e.errno, e.strerror, e.filename))
bb.note("Extracted %s to %s" % (pkg_path, tmp_dir))
bb.utils.remove(os.path.join(tmp_dir, "debian-binary"))
--
2.10.2
^ permalink raw reply related
* Re: [PATCH 03/33] dpkg-native: hardcode SYSCONFDIR to /etc in update-alternatives
From: Burton, Ross @ 2016-12-06 15:39 UTC (permalink / raw)
To: Andreas Oberritter; +Cc: OE-core
In-Reply-To: <1481024991-5882-4-git-send-email-obi@opendreambox.org>
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
On 6 December 2016 at 11:49, Andreas Oberritter <obi@opendreambox.org>
wrote:
> + sed -i -e 's|SYSCONFDIR|"/etc"|' ${S}/utils/update-alternatives.c
>
Hardcoding /etc is bad, can't you just remove the native sysroot prefix
from $sysconfdir?
Ross
[-- Attachment #2: Type: text/html, Size: 695 bytes --]
^ permalink raw reply
* Re: [PATCH 3/6] keyutils: new recipe (version 1.5.9)
From: Burton, Ross @ 2016-12-06 15:49 UTC (permalink / raw)
To: Andreas Oberritter; +Cc: OE-core
In-Reply-To: <1480545786-5069-3-git-send-email-obi@opendreambox.org>
[-- Attachment #1: Type: text/plain, Size: 728 bytes --]
On 30 November 2016 at 22:43, Andreas Oberritter <obi@opendreambox.org>
wrote:
> Used by nfs-utils for nfsidmap, if available.
>
This breaks under musl:
| key.dns_resolver.c: In function 'afsdb_hosts_to_addrs':
| key.dns_resolver.c:374:21: error: 'UINT_MAX' undeclared (first use in
this function)
| unsigned int ttl = UINT_MAX, rr_ttl;
| ^~~~~~~~
| key.dns_resolver.c:374:21: note: each undeclared identifier is reported
only once for each function it appears in
| key.dns_resolver.c: In function 'dns_query_afsdb':
| key.dns_resolver.c:456:22: error: 'ULONG_MAX' undeclared (first use in
this function)
| unsigned long ttl = ULONG_MAX;
| ^~~~~~~~~
Ross
[-- Attachment #2: Type: text/html, Size: 1248 bytes --]
^ permalink raw reply
* Re: [PATCH 00/33] Accumulated patches for deb packaging
From: Andreas Oberritter @ 2016-12-06 16:00 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
In-Reply-To: <CAJTo0La31Co0vhNd6bKwubxMOO_qD=-Uh2yi_oLYCumennVXFg@mail.gmail.com>
On 06.12.2016 15:36, Burton, Ross wrote:
>
> On 6 December 2016 at 11:49, Andreas Oberritter <obi@opendreambox.org
> <mailto:obi@opendreambox.org>> wrote:
>
> These are most of my patches which accumulated since our distro
> switched from opkg to dpkg and apt two years ago. They were tested
> thoroughly on dora and krogoth and just a little bit on master.
>
>
> Is this on a branch somewhere?
I just created a new branch here:
http://git.openembedded.org/openembedded-core-contrib/log/?h=obi/deb
Regards,
Andreas
^ permalink raw reply
* Re: what is the closest alternative to red hat's ABRT in OE?
From: Maciej Borzęcki @ 2016-12-06 16:02 UTC (permalink / raw)
To: Robert P. J. Day; +Cc: OE Core mailing list
In-Reply-To: <alpine.LFD.2.20.1612060948001.9434@ca624034.mitel.com>
On Tue, Dec 6, 2016 at 3:49 PM, Robert P. J. Day <rpjday@crashcourse.ca> wrote:
>
> as in:
>
> https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Deployment_Guide/ch-abrt.html
>
> specifically, to manage core files? i would have thought judicious use
> of "ulimit" would be the solution. others?
>
If you're using systemd there is systemd-coredump(8).
--
Maciej Borzecki
RnDity
^ permalink raw reply
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