summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-08-01 23:23:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-02 14:42:08 +0100
commit0c0a03eb4ad713b992b9dfc8711904fb307d82f0 (patch)
tree320f9e37a31ca00b0b19c027aa5fa901e5c40a67 /meta
parent1790fd9b564607c65707c5eb4bfb9583ab7d228e (diff)
downloadpoky-0c0a03eb4ad713b992b9dfc8711904fb307d82f0.tar.gz
sysvinit: update 2.96 -> 2.97
(From OE-Core rev: 84f56d6beffe830866d56be94149b747b04ea54d) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch16
-rw-r--r--meta/recipes-core/sysvinit/sysvinit/install.patch7
-rw-r--r--meta/recipes-core/sysvinit/sysvinit_2.97.bb (renamed from meta/recipes-core/sysvinit/sysvinit_2.96.bb)3
3 files changed, 14 insertions, 12 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch b/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch
index bd4444b81b..5c39fb001b 100644
--- a/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch
+++ b/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch
@@ -1,4 +1,4 @@
1From 7276275d9a08d5ae268fb263027bbc60bc0ab2e8 Mon Sep 17 00:00:00 2001 1From c3a068cf24a22bea7349849ec111ae8d91a54db4 Mon Sep 17 00:00:00 2001
2From: Jeff Dike <jdike@x86_64.user-mode-linux.org> 2From: Jeff Dike <jdike@x86_64.user-mode-linux.org>
3Date: Wed, 14 Jul 2010 14:35:52 -0400 3Date: Wed, 14 Jul 2010 14:35:52 -0400
4Subject: [PATCH] sysvinit - Remove sulogin dependency on /usr/lib*/libcrypt.a 4Subject: [PATCH] sysvinit - Remove sulogin dependency on /usr/lib*/libcrypt.a
@@ -11,24 +11,26 @@ Upstream-Status: Inappropriate [configuration]
11# - jdike@linux.intel.com 11# - jdike@linux.intel.com
12 12
13--- 13---
14 src/Makefile | 9 ++------- 14 src/Makefile | 11 ++---------
15 1 file changed, 2 insertions(+), 7 deletions(-) 15 1 file changed, 2 insertions(+), 9 deletions(-)
16 16
17diff --git a/src/Makefile b/src/Makefile 17diff --git a/src/Makefile b/src/Makefile
18index 1380d7f..628e77f 100644 18index 5b1a5a2..b686394 100644
19--- a/src/Makefile 19--- a/src/Makefile
20+++ b/src/Makefile 20+++ b/src/Makefile
21@@ -97,13 +97,8 @@ else 21@@ -97,15 +97,8 @@ else
22 endif 22 endif
23 23
24 # Additional libs for GNU libc. 24 # Additional libs for GNU libc.
25-ifneq ($(wildcard /usr/lib*/libcrypt.*),) 25-ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),)
26- SULOGINLIBS += -lcrypt 26- SULOGINLIBS += -lcrypt
27-endif 27-endif
28- 28-
29-# Additional libs for GNU libc / multiarch on Debian based systems. 29-# Additional libs for GNU libc / multiarch on Debian based systems.
30-ifneq ($(wildcard /usr/lib/*/libcrypt.*),) 30-ifneq ($(wildcard $(ROOT)/usr/lib/*/libcrypt.*),)
31-ifneq ($(findstring -lcrypt, $(SULOGINLIBS)), -lcrypt)
31- SULOGINLIBS += -lcrypt 32- SULOGINLIBS += -lcrypt
33-endif
32+ifneq ($(LCRYPT),) 34+ifneq ($(LCRYPT),)
33+ SULOGINLIBS += $(LCRYPT) 35+ SULOGINLIBS += $(LCRYPT)
34 endif 36 endif
diff --git a/meta/recipes-core/sysvinit/sysvinit/install.patch b/meta/recipes-core/sysvinit/sysvinit/install.patch
index 2930fb0195..90563a6294 100644
--- a/meta/recipes-core/sysvinit/sysvinit/install.patch
+++ b/meta/recipes-core/sysvinit/sysvinit/install.patch
@@ -1,4 +1,4 @@
1From b6cc66ab245ceb6bca0116dff7a41f6d7677b96a Mon Sep 17 00:00:00 2001 1From 5e35aa105e7a2e85db2a89fee4114090b1ac55be Mon Sep 17 00:00:00 2001
2From: Qing He <qing.he@intel.com> 2From: Qing He <qing.he@intel.com>
3Date: Fri, 18 Jun 2010 09:40:30 +0800 3Date: Fri, 18 Jun 2010 09:40:30 +0800
4Subject: [PATCH] sysvinit: upgrade to version 2.88dsf 4Subject: [PATCH] sysvinit: upgrade to version 2.88dsf
@@ -10,7 +10,7 @@ Upstream-Status: Pending
10 1 file changed, 30 insertions(+), 23 deletions(-) 10 1 file changed, 30 insertions(+), 23 deletions(-)
11 11
12diff --git a/src/Makefile b/src/Makefile 12diff --git a/src/Makefile b/src/Makefile
13index 9f9f09e..1380d7f 100644 13index 1b368dc..5b1a5a2 100644
14--- a/src/Makefile 14--- a/src/Makefile
15+++ b/src/Makefile 15+++ b/src/Makefile
16@@ -77,7 +77,14 @@ else 16@@ -77,7 +77,14 @@ else
@@ -29,7 +29,7 @@ index 9f9f09e..1380d7f 100644
29 29
30 ifeq ($(WITH_SELINUX),yes) 30 ifeq ($(WITH_SELINUX),yes)
31 SELINUX_DEF = -DWITH_SELINUX 31 SELINUX_DEF = -DWITH_SELINUX
32@@ -189,42 +196,42 @@ clobber: cleanobjs 32@@ -191,43 +198,43 @@ clobber: cleanobjs
33 distclean: clobber 33 distclean: clobber
34 34
35 install: all 35 install: all
@@ -50,6 +50,7 @@ index 9f9f09e..1380d7f 100644
50+ $(INSTALL_EXEC) $$i $(ROOT)$(bindir)/ ; \ 50+ $(INSTALL_EXEC) $$i $(ROOT)$(bindir)/ ; \
51 done 51 done
52 # $(INSTALL_DIR) $(ROOT)/etc/ 52 # $(INSTALL_DIR) $(ROOT)/etc/
53 $(INSTALL_DIR) $(ROOT)/etc/inittab.d
53 # $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/ 54 # $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/
54- ln -sf halt $(ROOT)/sbin/reboot 55- ln -sf halt $(ROOT)/sbin/reboot
55- ln -sf halt $(ROOT)/sbin/poweroff 56- ln -sf halt $(ROOT)/sbin/poweroff
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.97.bb
index d2b85ed9c0..80ab9d70e7 100644
--- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb
+++ b/meta/recipes-core/sysvinit/sysvinit_2.97.bb
@@ -21,8 +21,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \
21 file://bootlogd.init \ 21 file://bootlogd.init \
22 file://01_bootlogd \ 22 file://01_bootlogd \
23 " 23 "
24SRC_URI[md5sum] = "48cebffebf2a96ab09bec14bf9976016" 24SRC_URI[sha256sum] = "2d5996857519bfd8634d2e1debabb3238fb38440f65fbfdc46420ee8bdf25110"
25SRC_URI[sha256sum] = "2a2e26b72aa235a23ab1c8471005f890309ce1196c83fbc9413c57b9ab62b587"
26 25
27S = "${WORKDIR}/sysvinit-${PV}" 26S = "${WORKDIR}/sysvinit-${PV}"
28B = "${S}/src" 27B = "${S}/src"