sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

sysvinit: upgrade to version 2.88dsf 

from 2.86
update to new homepage and download site

changes:
  - rebase install.patch
  - remove dated 2.86 patch

Signed-off-by: Qing He <qing.he@intel.com>
This commit is contained in:
Qing He 2010-06-18 09:40:30 +08:00 committed by Richard Purdie
parent 60255c8d28
commit 10cce8e1f7
4 changed files with 93 additions and 4967 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
meta/packages/sysvinit/sysvinit-2.86/install.patch vendored
View File

@ -1,77 +0,0 @@
#
# Patch managed by http://www.holgerschurig.de/patcher.html
#
--- sysvinit-2.85/src/Makefile~install
+++ sysvinit-2.85/src/Makefile
@@ -47,7 +47,15 @@
BIN_GROUP = root
BIN_COMBO = $(BIN_OWNER):$(BIN_GROUP)
INSTALL = install -o $(BIN_OWNER) -g $(BIN_GROUP)
-MANDIR = /usr/share/man
+
+ROOT =
+bindir = /bin
+sbindir = /sbin
+usrbindir = /usr/bin
+usrbindir = /usr/bin
+includedir = /usr/include
+mandir = /usr/share/man
+
# Additional libs for GNU libc.
ifneq ($(wildcard /usr/lib/libcrypt.a),)
@@ -110,32 +118,39 @@
distclean: clobber
install:
+ install -d $(ROOT)$(bindir)
for i in $(BIN); do \
- $(INSTALL) -m 755 $$i $(ROOT)/bin/; \
+ $(INSTALL) -m 755 $$i $(ROOT)$(bindir)/; \
done
+ install -d $(ROOT)$(sbindir)
for i in $(SBIN); do \
- $(INSTALL) -m 755 $$i $(ROOT)/sbin/; \
+ $(INSTALL) -m 755 $$i $(ROOT)$(sbindir)/; \
done
+ install -d $(ROOT)$(usrbindir)
for i in $(USRBIN); do \
- $(INSTALL) -m 755 $$i $(ROOT)/usr/bin/; \
+ $(INSTALL) -m 755 $$i $(ROOT)$(usrbindir)/; \
done
# $(INSTALL) -m 755 etc/initscript.sample $(ROOT)/etc/
- ln -sf halt $(ROOT)/sbin/reboot
- ln -sf halt $(ROOT)/sbin/poweroff
- ln -sf init $(ROOT)/sbin/telinit
- ln -sf ../sbin/killall5 $(ROOT)/bin/pidof
- if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
- ln -sf last $(ROOT)/usr/bin/lastb; \
+ ln -sf halt $(ROOT)$(sbindir)/reboot
+ ln -sf halt $(ROOT)$(sbindir)/poweroff
+ ln -sf init $(ROOT)$(sbindir)/telinit
+ ln -sf ../sbin/killall5 $(ROOT)$(bindir)/pidof
+ if [ ! -f $(ROOT)$(usrbindir)/lastb ]; then \
+ ln -sf last $(ROOT)$(usrbindir)/lastb; \
fi
- $(INSTALL) -m 644 initreq.h $(ROOT)/usr/include/
+ install -d $(ROOT)$(includedir)
+ $(INSTALL) -m 644 initreq.h $(ROOT)$(includedir)/
+ install -d $(ROOT)$(mandir)/man1 \
+ $(ROOT)$(mandir)/man5 \
+ $(ROOT)$(mandir)/man8
for i in $(MAN1); do \
- $(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man1/; \
+ $(INSTALL) -m 644 ../man/$$i $(ROOT)$(mandir)/man1/; \
done
for i in $(MAN5); do \
- $(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man5/; \
+ $(INSTALL) -m 644 ../man/$$i $(ROOT)$(mandir)/man5/; \
done
for i in $(MAN8); do \
- $(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man8/; \
+ $(INSTALL) -m 644 ../man/$$i $(ROOT)$(mandir)/man8/; \
done
ifeq ($(ROOT),)
#

4880
meta/packages/sysvinit/sysvinit-2.86/sysvinit-2.86.patch vendored
View File

File diff suppressed because it is too large Load Diff

81
meta/packages/sysvinit/sysvinit-2.88dsf/install.patch Normal file
View File

@ -0,0 +1,81 @@
diff --git a/src/Makefile b/src/Makefile
index e2b8028..3e11e92 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -65,7 +65,14 @@ else
INSTALL_DATA = install -m 644
endif
INSTALL_DIR = install -m 755 -d
-MANDIR = /usr/share/man
+
+ROOT ?=
+base_bindir ?= /bin
+base_sbindir ?= /sbin
+bindir ?= /usr/bin
+sysconfdir ?= /etc
+includedir ?= /usr/include
+mandir ?= /usr/share/man
ifeq ($(WITH_SELINUX),yes)
SELINUX_DEF = -DWITH_SELINUX
@@ -138,39 +145,39 @@ clobber: cleanobjs
distclean: clobber
install:
- $(INSTALL_DIR) $(ROOT)/bin/ $(ROOT)/sbin/
- $(INSTALL_DIR) $(ROOT)/usr/bin/
+ $(INSTALL_DIR) $(ROOT)$(base_bindir)/ $(ROOT)$(base_sbindir)/
+ $(INSTALL_DIR) $(ROOT)$(bindir)/
for i in $(BIN); do \
- $(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \
+ $(INSTALL_EXEC) $$i $(ROOT)$(base_bindir)/ ; \
done
for i in $(SBIN); do \
- $(INSTALL_EXEC) $$i $(ROOT)/sbin/ ; \
+ $(INSTALL_EXEC) $$i $(ROOT)$(base_sbindir)/ ; \
done
for i in $(USRBIN); do \
- $(INSTALL_EXEC) $$i $(ROOT)/usr/bin/ ; \
+ $(INSTALL_EXEC) $$i $(ROOT)$(bindir)/ ; \
done
- # $(INSTALL_DIR) $(ROOT)/etc/
- # $(INSTALL_EXEC) initscript.sample $(ROOT)/etc/
- ln -sf halt $(ROOT)/sbin/reboot
- ln -sf halt $(ROOT)/sbin/poweroff
- ln -sf init $(ROOT)/sbin/telinit
- ln -sf /sbin/killall5 $(ROOT)/bin/pidof
- if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
- ln -sf last $(ROOT)/usr/bin/lastb; \
+ # $(INSTALL_DIR) $(ROOT)$(sysconfdir)/
+ # $(INSTALL_EXEC) initscript.sample $(ROOT)$(sysconfdir)/
+ ln -sf halt $(ROOT)$(base_sbindir)/reboot
+ ln -sf halt $(ROOT)$(base_sbindir)/poweroff
+ ln -sf init $(ROOT)$(base_sbindir)/telinit
+ ln -sf $(base_sbindir)/killall5 $(ROOT)$(base_bindir)/pidof
+ if [ ! -f $(ROOT)$(bindir)/lastb ]; then \
+ ln -sf last $(ROOT)$(bindir)/lastb; \
fi
- $(INSTALL_DIR) $(ROOT)/usr/include/
- $(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
- $(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/
- $(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/
- $(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/
+ $(INSTALL_DIR) $(ROOT)$(includedir)/
+ $(INSTALL_DATA) initreq.h $(ROOT)$(includedir)/
+ $(INSTALL_DIR) $(ROOT)$(mandir)/man1/
+ $(INSTALL_DIR) $(ROOT)$(mandir)/man5/
+ $(INSTALL_DIR) $(ROOT)$(mandir)/man8/
for i in $(MAN1); do \
- $(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man1/; \
+ $(INSTALL_DATA) ../man/$$i $(ROOT)$(mandir)/man1/; \
done
for i in $(MAN5); do \
- $(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man5/; \
+ $(INSTALL_DATA) ../man/$$i $(ROOT)$(mandir)/man5/; \
done
for i in $(MAN8); do \
- $(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man8/; \
+ $(INSTALL_DATA) ../man/$$i $(ROOT)$(mandir)/man8/; \
done
ifeq ($(ROOT),)
#

22
meta/packages/sysvinit/sysvinit_2.86.bb → meta/packages/sysvinit/sysvinit_2.88dsf.bb
View File

@ -1,8 +1,10 @@
DESCRIPTION = "System-V like init."
HOMEPAGE = "http://savannah.nongnu.org/projects/sysvinit/"
SECTION = "base"
LICENSE = "GPL"
HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
PR = "r32"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4"
PR = "r0"
# USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
# Set PACKAGE_ARCH appropriately.
@ -18,8 +20,8 @@ CONFFILES_${PN}-inittab = "${sysconfdir}/inittab"
USE_VT ?= "1"
SYSVINIT_ENABLED_GETTYS ?= "1"
SRC_URI = "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-${PV}.tar.gz \
file://install.patch;patch=1 \
SRC_URI = "http://download.savannah.gnu.org/releases-noredirect/sysvinit/sysvinit-${PV}.tar.bz2 \
file://install.patch \
file://need \
file://provide \
file://inittab \
@ -45,11 +47,11 @@ FILES_sysvinit-sulogin = "${base_sbindir}/sulogin"
CFLAGS_prepend = "-D_GNU_SOURCE "
export LCRYPT = "-lcrypt"
EXTRA_OEMAKE += "'INSTALL=install' \
'bindir=${base_bindir}' \
'sbindir=${base_sbindir}' \
'usrbindir=${bindir}' \
'usrsbindir=${sbindir}' \
EXTRA_OEMAKE += "'base_bindir=${base_bindir}' \
'base_sbindir=${base_sbindir}' \
'bindir=${bindir}' \
'sbindir=${sbindir}' \
'sysconfdir=${sysconfdir}' \
'includedir=${includedir}' \
'mandir=${mandir}'"