mirror of
https://git.yoctoproject.org/poky
synced 2026-04-27 12:32:13 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
1790fd9b56
commit
0c0a03eb4a
@@ -1,4 +1,4 @@
|
||||
From 7276275d9a08d5ae268fb263027bbc60bc0ab2e8 Mon Sep 17 00:00:00 2001
|
||||
From c3a068cf24a22bea7349849ec111ae8d91a54db4 Mon Sep 17 00:00:00 2001
|
||||
From: Jeff Dike <jdike@x86_64.user-mode-linux.org>
|
||||
Date: Wed, 14 Jul 2010 14:35:52 -0400
|
||||
Subject: [PATCH] sysvinit - Remove sulogin dependency on /usr/lib*/libcrypt.a
|
||||
@@ -11,24 +11,26 @@ Upstream-Status: Inappropriate [configuration]
|
||||
# - jdike@linux.intel.com
|
||||
|
||||
---
|
||||
src/Makefile | 9 ++-------
|
||||
1 file changed, 2 insertions(+), 7 deletions(-)
|
||||
src/Makefile | 11 ++---------
|
||||
1 file changed, 2 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index 1380d7f..628e77f 100644
|
||||
index 5b1a5a2..b686394 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -97,13 +97,8 @@ else
|
||||
@@ -97,15 +97,8 @@ else
|
||||
endif
|
||||
|
||||
# Additional libs for GNU libc.
|
||||
-ifneq ($(wildcard /usr/lib*/libcrypt.*),)
|
||||
-ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),)
|
||||
- SULOGINLIBS += -lcrypt
|
||||
-endif
|
||||
-
|
||||
-# Additional libs for GNU libc / multiarch on Debian based systems.
|
||||
-ifneq ($(wildcard /usr/lib/*/libcrypt.*),)
|
||||
-ifneq ($(wildcard $(ROOT)/usr/lib/*/libcrypt.*),)
|
||||
-ifneq ($(findstring -lcrypt, $(SULOGINLIBS)), -lcrypt)
|
||||
- SULOGINLIBS += -lcrypt
|
||||
-endif
|
||||
+ifneq ($(LCRYPT),)
|
||||
+ SULOGINLIBS += $(LCRYPT)
|
||||
endif
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From b6cc66ab245ceb6bca0116dff7a41f6d7677b96a Mon Sep 17 00:00:00 2001
|
||||
From 5e35aa105e7a2e85db2a89fee4114090b1ac55be Mon Sep 17 00:00:00 2001
|
||||
From: Qing He <qing.he@intel.com>
|
||||
Date: Fri, 18 Jun 2010 09:40:30 +0800
|
||||
Subject: [PATCH] sysvinit: upgrade to version 2.88dsf
|
||||
@@ -10,7 +10,7 @@ Upstream-Status: Pending
|
||||
1 file changed, 30 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index 9f9f09e..1380d7f 100644
|
||||
index 1b368dc..5b1a5a2 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -77,7 +77,14 @@ else
|
||||
@@ -29,7 +29,7 @@ index 9f9f09e..1380d7f 100644
|
||||
|
||||
ifeq ($(WITH_SELINUX),yes)
|
||||
SELINUX_DEF = -DWITH_SELINUX
|
||||
@@ -189,42 +196,42 @@ clobber: cleanobjs
|
||||
@@ -191,43 +198,43 @@ clobber: cleanobjs
|
||||
distclean: clobber
|
||||
|
||||
install: all
|
||||
@@ -50,6 +50,7 @@ index 9f9f09e..1380d7f 100644
|
||||
+ $(INSTALL_EXEC) $$i $(ROOT)$(bindir)/ ; \
|
||||
done
|
||||
# $(INSTALL_DIR) $(ROOT)/etc/
|
||||
$(INSTALL_DIR) $(ROOT)/etc/inittab.d
|
||||
# $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/
|
||||
- ln -sf halt $(ROOT)/sbin/reboot
|
||||
- ln -sf halt $(ROOT)/sbin/poweroff
|
||||
|
||||
@@ -21,8 +21,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \
|
||||
file://bootlogd.init \
|
||||
file://01_bootlogd \
|
||||
"
|
||||
SRC_URI[md5sum] = "48cebffebf2a96ab09bec14bf9976016"
|
||||
SRC_URI[sha256sum] = "2a2e26b72aa235a23ab1c8471005f890309ce1196c83fbc9413c57b9ab62b587"
|
||||
SRC_URI[sha256sum] = "2d5996857519bfd8634d2e1debabb3238fb38440f65fbfdc46420ee8bdf25110"
|
||||
|
||||
S = "${WORKDIR}/sysvinit-${PV}"
|
||||
B = "${S}/src"
|
||||
Reference in New Issue
Block a user