ethtool: upgrade 5.14 -> 5.15
PATCH v2 1/1 ethtool: upgrade 5.14 -> 5.15
---
.../recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch | 2 +-
.../ethtool/{ethtool_5.14.bb => ethtool_5.15.bb} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/ethtool/{ethtool_5.14.bb => ethtool_5.15.bb} (93%)meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +1 -1
@@ -19,7 +19,7 @@ index 6c9453c..7c0f829 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 5.14, [email protected]) + AC_INIT(ethtool, 5.15, [email protected]) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu subdir-objects])
meta/recipes-extended/ethtool/ethtool_5.15.bb renamed from meta/recipes-extended/ethtool/ethtool_5.14.bb +1 -1
@@ -11,7 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[sha256sum] = "9868604c913e5483000c00d5dcb2bb3169a05252de47f62174702ff19cf6de7a" +SRC_URI[sha256sum] = "a6a1638192209269ca74a29d73903f28531ebdf0794f3e0bdfdbdee2dc75d98b" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/"
Signature · 1 line
2.25.1
PATCH v2 1/1 systemd-boot: upgrade 249.5 -> 249.6
0001-meson-use-partial_dependency-to-get-include-director.patch removed since it is included in 249.6
---
...md-boot_249.5.bb => systemd-boot_249.6.bb} | 0
meta/recipes-core/systemd/systemd.inc | 2 +-
...l_dependency-to-get-include-director.patch | 46 -------------------
.../{systemd_249.5.bb => systemd_249.6.bb} | 1 -
4 files changed, 1 insertion(+), 48 deletions(-)
rename meta/recipes-core/systemd/{systemd-boot_249.5.bb => systemd-boot_249.6.bb} (100%)
delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-use-partial_dependency-to-get-include-director.patch
rename meta/recipes-core/systemd/{systemd_249.5.bb => systemd_249.6.bb} (99%)meta/recipes-core/systemd/systemd-boot_249.6.bb renamed from meta/recipes-core/systemd/systemd-boot_249.5.bb +0 -0
meta/recipes-core/systemd/systemd.inc +1 -1
@@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "00b0393e65252bf631670604f58b844780b08c50" +SRCREV = "deda69dad784f9c4367533555ff4d7bf6308c0ff" SRCBRANCH = "v249-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ "
meta/recipes-core/systemd/systemd/0001-meson-use-partial_dependency-to-get-include-director.patch deleted +0 -46
46 lines not on this page · raw message
meta/recipes-core/systemd/systemd_249.6.bb renamed from meta/recipes-core/systemd/systemd_249.5.bb +0 -1
@@ -25,7 +25,6 @@ SRC_URI += "file://touchscreen.rules \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ file://0001-test-parse-argument-Include-signal.h.patch \ - file://0001-meson-use-partial_dependency-to-get-include-director.patch \ " # patches needed by musl
Signature · 1 line
2.25.1
RE: [OE-core] [PATCH v2] systemd-boot: upgrade 249.5 -> 249.6
Quoted 7 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of wangmy
Sent: den 16 november 2021 02:29
To: [email protected]
Cc: Wang Mingyu <[email protected]>
Subject: [OE-core] [PATCH v2] systemd-boot: upgrade 249.5 -> 249.6
Please change the subject to:
systemd, systemd-boot: upgrade 249.5 -> 249.6
//Peter
Quoted 121 lines
0001-meson-use-partial_dependency-to-get-include-director.patch removed since it is included in 249.6
Signed-off-by Wang Mingyu <[email protected]>--- ...md-boot_249.5.bb => systemd-boot_249.6.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...l_dependency-to-get-include-director.patch | 46 ------------------- .../{systemd_249.5.bb => systemd_249.6.bb} | 1 - 4 files changed, 1 insertion(+), 48 deletions(-) rename meta/recipes-core/systemd/{systemd-boot_249.5.bb => systemd- boot_249.6.bb} (100%) delete mode 100644 meta/recipes-core/systemd/systemd/0001-meson-use- partial_dependency-to-get-include-director.patch rename meta/recipes-core/systemd/{systemd_249.5.bb => systemd_249.6.bb}(99%)
meta/recipes-core/systemd/systemd-boot_249.6.bb renamed from meta/recipes-core/systemd/systemd-boot_249.5.bb +0
-0meta/recipes- renamed from meta/recipes-core/systemd/systemd.inc +0
-0core/systemd/systemd.inc
index4e4cdd2e2f..f3ce32efc2100644meta/recipes-core/systemd/systemd.inc +0
-0@@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
meta/recipes-core/systemd/systemd.inc +1
-1-SRCREV = "00b0393e65252bf631670604f58b844780b08c50" +SRCREV = "deda69dad784f9c4367533555ff4d7bf6308c0ff" SRCBRANCH = "v249-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \
"(quoted diff) +0
-0partial_dependency-to-get-include-director.patch b/meta/recipes- core/systemd/systemd/0001-meson-use-partial_dependency-to-get-include- director.patch
deleted file mode 100644
index 51ee5d8623..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-meson-use-partial_dependency- to-get-include-director.patch
+++/dev/nullmeta/recipes-core/systemd/systemd.inc +0
-11@@ -1,46 +0,0 @@ -From 260e871fda979f040c94d2011545e8122bed68ca Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Mon, 18 Oct 2021 10:13:07 +0200 -Subject: [PATCH] meson: use partial_dependency() to get include directory - -Getting the variable directly from pkg-config is prone to host -contamination when building in sysroots as the -compiler starts looking for the headers on the host in addition to -the sysroot. - -Upstream-Status: Submitted[https://github.com/systemd/systemd/pull/21027]
meta/recipes-core/systemd/systemd.inc +0
-14-Signed-off-by: Alexander Kanavin <[email protected]> ---- - meson.build | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/meson.build b/meson.build -index df53c6156d..38fb37dd75 100644 ---- a/meson.build -+++ b/meson.build -@@ -2618,18 +2618,17 @@ endif - - if conf.get('ENABLE_LOCALED') == 1 - if conf.get('HAVE_XKBCOMMON') == 1 -- # logind will load libxkbcommon.so dynamically on itsown
-- deps = [libdl]
--extra_includes=
[libxkbcommon.get_pkgconfig_variable('includedir')]
-+ # logind will load libxkbcommon.so dynamically on its
own, but we still
-+ # need to specify where the headers are
-+ deps = [libdl,libxkbcommon.partial_dependency(compile_args: true)]meta/recipes-core/systemd/systemd.inc +0
-16- else - deps = [] -- extra_includes = [] - endif - - executable( - 'systemd-localed', - systemd_localed_sources, -- include_directories : includes + extra_includes, -+ include_directories : includes, - link_with : [libshared], - dependencies : deps, - install_rpath : rootlibexecdir, --- -2.20.1 -meta/recipes- renamed from meta/recipes-core/systemd/systemd_249.5.bb +0
-0core/systemd/systemd_249.6.bb
similarity index 99%
rename from meta/recipes-core/systemd/systemd_249.5.bb rename to meta/recipes-core/systemd/systemd_249.6.bb index8bdc0ca028..242a53d22a100644meta/recipes-core/systemd/systemd_249.6.bb renamed from meta/recipes-core/systemd/systemd_249.5.bb +0
-1@@ -25,7 +25,6 @@ SRC_URI += "file://touchscreen.rules \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed- slash.patch \ file://0001-test-parse-argument-Include-signal.h.patch \ - file://0001-meson-use-partial_dependency-to-get-include- director.patch \ "# patches needed by musl -- 2.25.1