summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2021-02-19 19:05:44 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-21 22:01:28 +0000
commit65176caf81503c76fed461954338193868849548 (patch)
tree38d641d7e04f2b34aefd379a1eeb5ede227423c1 /meta
parent10629a04bc4cb021fded00f095e2f86605991b81 (diff)
downloadpoky-65176caf81503c76fed461954338193868849548.tar.gz
util-linux: upgrade 2.36.1 -> 2.36.2
0001-build-sys-do-not-build-plymouth-ctrl.c-w-disabled-pl.patch 0001-hwclock-do-not-assume-__NR_settimeofday_time32.patch removed since they are included in 2.36.2 (From OE-Core rev: 4db0babf6a69a90df14363103f5f6b643f208b12) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/util-linux/util-linux/0001-build-sys-do-not-build-plymouth-ctrl.c-w-disabled-pl.patch52
-rw-r--r--meta/recipes-core/util-linux/util-linux/0001-hwclock-do-not-assume-__NR_settimeofday_time32.patch30
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.36.2.bb (renamed from meta/recipes-core/util-linux/util-linux_2.36.1.bb)4
3 files changed, 1 insertions, 85 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/0001-build-sys-do-not-build-plymouth-ctrl.c-w-disabled-pl.patch b/meta/recipes-core/util-linux/util-linux/0001-build-sys-do-not-build-plymouth-ctrl.c-w-disabled-pl.patch
deleted file mode 100644
index f3ae5ef948..0000000000
--- a/meta/recipes-core/util-linux/util-linux/0001-build-sys-do-not-build-plymouth-ctrl.c-w-disabled-pl.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 5547316c85cd45c0ea29c4c7c48eecd616783cd5 Mon Sep 17 00:00:00 2001
2From: Pino Toscano <toscano.pino@tiscali.it>
3Date: Tue, 17 Nov 2020 11:27:48 +0100
4Subject: [PATCH] build-sys: do not build plymouth-ctrl.c w/ disabled plymouth
5
6Do not build plymouth-ctrl.c in agetty and sulogin in case the plymouth
7support is disabled.
8
9Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/5547316c85cd45c0ea29c4c7c48eecd616783cd5]
10Signed-off-by: Pino Toscano <toscano.pino@tiscali.it>
11---
12 login-utils/Makemodule.am | 6 ++++--
13 term-utils/Makemodule.am | 6 ++++--
14 2 files changed, 8 insertions(+), 4 deletions(-)
15
16diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am
17index 4f52cea3c..8bc3ee37e 100644
18--- a/login-utils/Makemodule.am
19+++ b/login-utils/Makemodule.am
20@@ -31,8 +31,10 @@ dist_man_MANS += login-utils/sulogin.8
21 sulogin_SOURCES = \
22 login-utils/sulogin.c \
23 login-utils/sulogin-consoles.c \
24- login-utils/sulogin-consoles.h \
25- lib/plymouth-ctrl.c
26+ login-utils/sulogin-consoles.h
27+if USE_PLYMOUTH_SUPPORT
28+sulogin_SOURCES += lib/plymouth-ctrl.c
29+endif
30 sulogin_LDADD = $(LDADD) libcommon.la
31
32 if HAVE_LIBCRYPT
33diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am
34index 92df7dbc8..c424dbdf8 100644
35--- a/term-utils/Makemodule.am
36+++ b/term-utils/Makemodule.am
37@@ -42,8 +42,10 @@ endif # BUILD_SCRIPTLIVE
38 if BUILD_AGETTY
39 sbin_PROGRAMS += agetty
40 dist_man_MANS += term-utils/agetty.8
41-agetty_SOURCES = term-utils/agetty.c \
42- lib/plymouth-ctrl.c
43+agetty_SOURCES = term-utils/agetty.c
44+if USE_PLYMOUTH_SUPPORT
45+agetty_SOURCES += lib/plymouth-ctrl.c
46+endif
47 agetty_LDADD = $(LDADD) libcommon.la
48 if BSD
49 agetty_LDADD += -lutil
50--
512.29.2
52
diff --git a/meta/recipes-core/util-linux/util-linux/0001-hwclock-do-not-assume-__NR_settimeofday_time32.patch b/meta/recipes-core/util-linux/util-linux/0001-hwclock-do-not-assume-__NR_settimeofday_time32.patch
deleted file mode 100644
index 3e818470fe..0000000000
--- a/meta/recipes-core/util-linux/util-linux/0001-hwclock-do-not-assume-__NR_settimeofday_time32.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 367972fae13d170675768d63678577cae1890143 Mon Sep 17 00:00:00 2001
2From: Pino Toscano <toscano.pino@tiscali.it>
3Date: Tue, 17 Nov 2020 11:32:45 +0100
4Subject: [PATCH] hwclock: do not assume __NR_settimeofday_time32
5
6Check that __NR_settimeofday_time32 exists before trying to use it as
7syscall number.
8
9Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/367972fae13d170675768d63678577cae1890143]
10Signed-off-by: Pino Toscano <toscano.pino@tiscali.it>
11---
12 sys-utils/hwclock.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
16index 1f7ef3317..db448687d 100644
17--- a/sys-utils/hwclock.c
18+++ b/sys-utils/hwclock.c
19@@ -678,7 +678,7 @@ display_time(struct timeval hwctime)
20 #ifndef SYS_settimeofday
21 # ifdef __NR_settimeofday
22 # define SYS_settimeofday __NR_settimeofday
23-# else
24+# elif defined(__NR_settimeofday_time32)
25 # define SYS_settimeofday __NR_settimeofday_time32
26 # endif
27 #endif
28--
292.29.2
30
diff --git a/meta/recipes-core/util-linux/util-linux_2.36.1.bb b/meta/recipes-core/util-linux/util-linux_2.36.2.bb
index bf46922271..19950a2726 100644
--- a/meta/recipes-core/util-linux/util-linux_2.36.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.36.2.bb
@@ -39,10 +39,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz
39 file://run-ptest \ 39 file://run-ptest \
40 file://display_testname_for_subtest.patch \ 40 file://display_testname_for_subtest.patch \
41 file://avoid_parallel_tests.patch \ 41 file://avoid_parallel_tests.patch \
42 file://0001-build-sys-do-not-build-plymouth-ctrl.c-w-disabled-pl.patch \
43 file://0001-hwclock-do-not-assume-__NR_settimeofday_time32.patch \
44 " 42 "
45SRC_URI[sha256sum] = "09fac242172cd8ec27f0739d8d192402c69417617091d8c6e974841568f37eed" 43SRC_URI[sha256sum] = "f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f"
46 44
47PACKAGES =+ "${PN}-swaponoff" 45PACKAGES =+ "${PN}-swaponoff"
48PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', '${PN}-pylibmount', '', d)}" 46PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', '${PN}-pylibmount', '', d)}"