Commit 7e2bf630 authored by Martin Banky's avatar Martin Banky Committed by Peter Korsgaard
Browse files

sysvint: convert to gentargets and bump to 2.88 



Also, changed the site to Debian, to get the latest patches

[ Thomas: add inittab compatible with sysvinit. Minor fixes. ]

Signed-off-by: default avatarMartin Banky <Martin.Banky@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent dfd068cd

CHANGES

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 
	direcfb-examples, dmalloc, cloop, cups, ffmpeg, gdk-pixbuf,

	hostapd, i2c-tools, input-tools, libconfig, ltp-testsuite, m4,

	mii-diag, mrouted, openssh, openssl, openvpn, pango, qt,

	rsync, sdl_gfx, sdl_sound, sysklogd, udev, usbutils, xz, zlib

	rsync, sdl_gfx, sdl_sound, sysklogd, sysvinit, udev, usbutils,

	xz, zlib



	New packages: dhrystone, fbgrab, lsuio, rsh-redone, whetstone

package/sysvinit/inittab

0 → 100644
+31 −0
Original line number Diff line number Diff line 
# /etc/inittab

#

# This inittab is a basic inittab sample for sysvinit, which mimics

# Buildroot's default inittab for Busybox.

id:1:initdefault:



proc::sysinit:/bin/mount -t proc proc /proc

rwmo::sysinit:/bin/mount -o remount,rw /

dpts::sysinit:/bin/mkdir -p /dev/pts

moun::sysinit:/bin/mount -a

host::sysinit:/bin/hostname -F /etc/hostname

init::sysinit:/etc/init.d/rcS



1:1:respawn:/sbin/getty 38400 tty1

2:1:respawn:/sbin/getty 38400 tty2



# S0:1:respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL



# Logging junk

mess::sysinit:/bin/touch /var/log/messages

sysl:1:respawn:/sbin/syslogd -n -m 0

klog:1:respawn:/sbin/klogd -n



# Stuff to do for the 3-finger salute

rebo::ctrlaltdel:/sbin/reboot



# Stuff to do before rebooting

sklo:6:wait:/usr/bin/killall klogd

ssys:6:wait:/usr/bin/killall syslogd

umou:6:wait:/bin/umount -a -r

swap:6:wait:/sbin/swapoff -a

package/sysvinit/sysvinit-2.86-gentoo.patch

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
--- sysvinit/src/Makefile

+++ sysvinit/src/Makefile

@@ -10,5 +10,3 @@

 

-CC	= gcc

-CFLAGS	= -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE

-LDFLAGS	= -s

+CFLAGS	+= -Wall -D_GNU_SOURCE

 STATIC	=

package/sysvinit/sysvinit.mk

+34 −37
Original line number Diff line number Diff line
@@ -3,50 +3,47 @@ 
# sysvinit

#

#############################################################

SYSVINIT_VERSION:=2.86

SYSVINIT_SOURCE:=sysvinit-$(SYSVINIT_VERSION).tar.gz

SYSVINIT_SITE:=ftp://ftp.cistron.nl/pub/people/miquels/software

SYSVINIT_DIR:=$(BUILD_DIR)/sysvinit-$(SYSVINIT_VERSION)

SYSVINIT_CAT:=$(ZCAT)

SYSVINIT_BINARY:=src/init

SYSVINIT_TARGET_BINARY:=sbin/init



$(DL_DIR)/$(SYSVINIT_SOURCE):

	$(call DOWNLOAD,$(SYSVINIT_SITE),$(SYSVINIT_SOURCE))



sysvinit-unpacked: $(SYSVINIT_DIR)/.unpacked

$(SYSVINIT_DIR)/.unpacked: $(DL_DIR)/$(SYSVINIT_SOURCE)

	$(SYSVINIT_CAT) $(DL_DIR)/$(SYSVINIT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

	toolchain/patch-kernel.sh $(SYSVINIT_DIR) package/sysvinit/ sysvinit-\*.patch

	touch $@



$(SYSVINIT_DIR)/$(SYSVINIT_BINARY): $(SYSVINIT_DIR)/.unpacked

SYSVINIT_VERSION = 2.88

SYSVINIT_SOURCE  = sysvinit_$(SYSVINIT_VERSION)dsf.orig.tar.gz

SYSVINIT_PATCH   = sysvinit_$(SYSVINIT_VERSION)dsf-13.diff.gz

SYSVINIT_SITE    = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sysvinit



# Override Busybox implementations if Busybox is enabled.

ifeq ($(BR2_PACKAGE_BUSYBOX),y)

SYSKLOGD_DEPENDENCIES = busybox

endif



define SYSVINIT_DEBIAN_PATCHES

	if [ -d $(@D)/debian/patches ]; then \

		toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \

	fi

endef



SYSVINIT_POST_PATCH_HOOKS = SYSVINIT_DEBIAN_PATCHES



define SYSVINIT_BUILD_CMDS

	# Force sysvinit to link against libcrypt as it otherwise

	# use an incorrect test to see if it's available

	CFLAGS="$(TARGET_CFLAGS)" $(MAKE) CC="$(TARGET_CC)" LCRYPT="-lcrypt" -C $(SYSVINIT_DIR)/src

	$(MAKE) $(TARGET_CONFIGURE_OPTS) LCRYPT="-lcrypt" -C $(@D)/src

endef



$(TARGET_DIR)/$(SYSVINIT_TARGET_BINARY): $(SYSVINIT_DIR)/$(SYSVINIT_BINARY)

define SYSVINIT_INSTALL_TARGET_CMDS

	for x in halt init shutdown; do \

		install -D $(SYSVINIT_DIR)/src/$$x $(TARGET_DIR)/sbin/$$x || exit 1; \

		install -D -m 0755 $(@D)/src/$$x $(TARGET_DIR)/sbin/$$x || exit 1; \

	done

	# Override Busybox's inittab with an inittab compatible with

	# sysvinit

	install -D -m 0644 package/sysvinit/inittab $(TARGET_DIR)/etc/inittab

endef



sysvinit: $(TARGET_DIR)/$(SYSVINIT_TARGET_BINARY)



sysvinit-source: $(DL_DIR)/$(SYSVINIT_SOURCE)



sysvinit-clean:

define SYSVINIT_UNINSTALL_TARGET_CMDS

	for x in halt init shutdown; do \

		rm -f $(TARGET_DIR)/sbin/$$x || exit 1; \

	done

	-$(MAKE) -C $(SYSVINIT_DIR) clean

endef



sysvinit-dirclean:

	rm -rf $(SYSVINIT_DIR)

#############################################################

#

# Toplevel Makefile options

#

#############################################################

ifeq ($(BR2_PACKAGE_SYSVINIT),y)

TARGETS+=sysvinit

endif
 
define SYSVINIT_CLEAN_CMDS

	$(MAKE) -C $(@D) clean

endef



$(eval $(call GENTARGETS,package,sysvinit))