Bump init version

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>

pkg/init-scripts/build

@@ -0,0 +1,111 @@
+VERSION="1"
+SRCDIR="init-scripts-${VERSION}"
+TARBALL="${SRCDIR}.tar.xz"
+URL="http://infraroot.at/pygos"
+SHA256SUM="2536e6520fb33058750cb741709177b166eac3025a63592cf59ea097bd42c4f7"
+DEPENDS="toolchain"
+
+prepare() {
+	return
+}
+
+build() {
+	run_configure "$1"
+}
+
+deploy() {
+	local SOURCE="$1"
+	local DEPLOY="$2"
+	local svc
+
+	make DESTDIR="$DEPLOY" install
+	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
+
+	mkdir -p "$DEPLOY/lib/libexec/dhcpcd-hooks"
+	cp "$SCRIPTDIR/pkg/$PKGNAME/40-ntpsetdate" "$DEPLOY/lib/libexec/dhcpcd-hooks"
+
+	include_merge "INIT"
+
+	if [ "x$HWCLOCK" == "xyes" ]; then
+		SERVICES="$SERVICES hwclock"
+	else
+		SERVICES="$SERVICES swclock"
+		ln -s "/share/init/swclocksave" "$DEPLOY/etc/init.d/swclocksave@shutdown"
+		ln -s "/share/init/swclocksave" "$DEPLOY/etc/init.d/swclocksave@reboot"
+		ln -s "/share/init/swclocksave.gcron" "$DEPLOY/etc/gcron.d/swclocksave"
+
+		mkdir -p "$DEPLOY/var/lib"
+		date --utc +%m%d%H%M%Y.%S > "$DEPLOY/var/lib/swclock"
+
+		echo "etc/init.d/swclocksave@shutdown m 777 0 0" >> "$DEPLOY/rootfs_files.txt"
+		echo "etc/init.d/swclocksave@reboot m 777 0 0" >> "$DEPLOY/rootfs_files.txt"
+		echo "etc/gcron.d/swclocksave m 777 0 0" >> "$DEPLOY/rootfs_files.txt"
+		echo "var/lib/swclock m 644 0 0" >> "$DEPLOY/rootfs_files.txt"
+
+		if [ -z "$DHCP_PORTS" ]; then
+			ln -s "/share/init/ntpsetdate.gcron" "$DEPLOY/etc/gcron.d/ntpsetdate"
+			echo "etc/gcron.d/ntpsetdate m 755 0 0" >> "$DEPLOY/rootfs_files.txt"
+		else
+			echo "lib/libexec/dhcpcd-hooks/40-ntpsetdate m 555 0 0" >> "$DEPLOY/rootfs_files.txt"
+		fi
+	fi
+
+	svc=$(file_path_override "ifrename")
+	if [ ! -z "$svc" ]; then
+		cp "$svc" "$DEPLOY/etc/netcfg/ifrename"
+		SERVICES="$SERVICES ifrename"
+	fi
+
+	svc=$(file_path_override "nftables.rules")
+	if [ ! -z "$svc" ]; then
+		cp "$svc" "$DEPLOY/etc/nftables.rules"
+		echo "etc/nftables.rules m 644 0 0" >> "$DEPLOY/rootfs_files.txt"
+		SERVICES="$SERVICES nft"
+	fi
+
+	svc=$(file_path_override "sysctl.conf")
+	if [ ! -z "$svc" ]; then
+		cp "$svc" "$DEPLOY/etc/sysctl.conf"
+		echo "etc/sysctl.conf m 644 0 0" >> "$DEPLOY/rootfs_files.txt"
+	fi
+
+	svc=$(file_path_override "interfaces")
+	if [ ! -z "$svc" ]; then
+		for svc in $svc/*; do
+			[ -f "$svc" ] || continue
+			cp "$svc" "$DEPLOY/etc/netcfg/"
+			svc=$(basename $svc)
+			echo "etc/netcfg/$svc m 644 0 0" >> "$DEPLOY/rootfs_files.txt"
+		done
+	fi
+
+	for svc in $GETTY_TTY; do
+		ln -s "/share/init/agetty" "$DEPLOY/etc/init.d/agetty@$svc"
+		echo "etc/init.d/agetty@$svc m 777 0 0" >> "$DEPLOY/rootfs_files.txt"
+	done
+
+	if [ ! -z "$DHCP_PORTS" ]; then
+		SERVICES="$SERVICES dhcpcdmaster"
+
+		for svc in $DHCP_PORTS; do
+			ln -s "/share/init/dhcpcd" "$DEPLOY/etc/init.d/dhcpcd@$svc"
+			echo "etc/init.d/dhcpcd@$svc m 777 0 0" >> "$DEPLOY/rootfs_files.txt"
+		done
+	fi
+
+	for svc in $SERVICES; do
+		ln -s "/share/init/$svc" "$DEPLOY/etc/init.d/$svc"
+		echo "etc/init.d/$svc m 777 0 0" >> "$DEPLOY/rootfs_files.txt"
+	done
+
+	touch "$DEPLOY/etc/modules"
+	for svc in $MODULES; do
+		echo "$svc" >> "$DEPLOY/etc/modules"
+	done
+
+	unset -v i GETTY_TTY HWCLOCK DHCP_PORTS SERVICES MODULES
+}
+
+check_update() {
+	return
+}

pkg/init-scripts/rootfs_files.txt

@@ -0,0 +1,81 @@
+etc/gcron.d m 755 0 0
+etc/init.d m 755 0 0
+etc/init.d/devfs m 777 0 0
+etc/init.d/gcrond m 777 0 0
+etc/init.d/hostname m 777 0 0
+etc/init.d/ifcfg m 777 0 0
+etc/init.d/ifdown@reboot m 777 0 0
+etc/init.d/ifdown@shutdown m 777 0 0
+etc/init.d/klogd m 777 0 0
+etc/init.d/loopback m 777 0 0
+etc/init.d/modules m 777 0 0
+etc/init.d/mountusr m 777 0 0
+etc/init.d/network m 777 0 0
+etc/init.d/procfs m 777 0 0
+etc/init.d/sigkill@reboot m 777 0 0
+etc/init.d/sigkill@shutdown m 777 0 0
+etc/init.d/sigterm@reboot m 777 0 0
+etc/init.d/sigterm@shutdown m 777 0 0
+etc/init.d/sync@reboot m 777 0 0
+etc/init.d/sync@shutdown m 777 0 0
+etc/init.d/sysctl m 777 0 0
+etc/init.d/sysfs m 777 0 0
+etc/init.d/sysinit m 777 0 0
+etc/init.d/tmpfs m 777 0 0
+etc/init.d/tmpfsrun m 777 0 0
+etc/init.d/tmpfsvar m 777 0 0
+etc/init.d/usyslogd m 777 0 0
+etc/init.d/vfs m 777 0 0
+etc/netcfg m 755 0 0
+etc/netcfg/ifrename m 644 0 0
+etc/initd.env m 644 0 0
+etc/modules m 644 0 0
+lib/libexec/init m 555 0 0
+lib/libexec/init/devfs.sh m 555 0 0
+lib/libexec/init/ifcfg.sh m 555 0 0
+lib/libexec/init/ifdown.sh m 555 0 0
+lib/libexec/init/ifrename.sh m 555 0 0
+lib/libexec/init/modules_load.sh m 555 0 0
+lib/libexec/init/overlay.sh m 555 0 0
+lib/libexec/init/setntpdate.sh m 555 0 0
+lib/libexec/init/trymount.sh m 555 0 0
+share/init m 555 0 0
+share/init/agetty m 444 0 0
+share/init/consolefont m 444 0 0
+share/init/devfs m 444 0 0
+share/init/dhcpcd m 444 0 0
+share/init/dhcpcdmaster m 444 0 0
+share/init/dnsmasq m 444 0 0
+share/init/gcrond m 444 0 0
+share/init/hostapd m 444 0 0
+share/init/hostname m 444 0 0
+share/init/hwclock m 444 0 0
+share/init/ifcfg m 444 0 0
+share/init/ifdown m 444 0 0
+share/init/ifrename m 444 0 0
+share/init/klogd m 444 0 0
+share/init/loopback m 444 0 0
+share/init/modules m 444 0 0
+share/init/mountusr m 444 0 0
+share/init/network m 444 0 0
+share/init/nft m 444 0 0
+share/init/nginx m 444 0 0
+share/init/ntpsetdate.gcron m 444 0 0
+share/init/procfs m 444 0 0
+share/init/sigkill m 444 0 0
+share/init/sigterm m 444 0 0
+share/init/sshd m 444 0 0
+share/init/sshd_keygen m 444 0 0
+share/init/swclock m 444 0 0
+share/init/swclocksave m 444 0 0
+share/init/swclocksave.gcron m 444 0 0
+share/init/sync m 444 0 0
+share/init/sysctl m 444 0 0
+share/init/sysfs m 444 0 0
+share/init/sysinit m 444 0 0
+share/init/tmpfs m 444 0 0
+share/init/tmpfsrun m 444 0 0
+share/init/tmpfsvar m 444 0 0
+share/init/unbound m 444 0 0
+share/init/usyslogd m 444 0 0
+share/init/vfs m 444 0 0

pkg/init/build

@@ -1,9 +1,9 @@
-VERSION="0.7.1"
+VERSION="0.8"
 SRCDIR="init-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="http://infraroot.at/pygos"
-SHA256SUM="c1cc0935b9beee796b1c61224cb8713ae0289186ed3510ae2cb615ad4ebc4ed3"
+SHA256SUM="1adfe2534d7657c9f7dcc12ea6acf3780b6f009bfb3f32c8c78e893431c6a2db"
-DEPENDS="toolchain"
+DEPENDS="init-scripts usyslog"
 
 prepare() {
 	return
@@ -17,100 +17,9 @@ build() {
 deploy() {
 	local SOURCE="$1"
 	local DEPLOY="$2"
-	local svc
 
 	make DESTDIR="$DEPLOY" install
-
-	cp -r ${SCRIPTDIR}/pkg/${PKGNAME}/{etc,lib,share} "$DEPLOY"
 	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
-
-	include_merge "INIT"
-
-	if [ "x$HWCLOCK" == "xyes" ]; then
-		SERVICES="$SERVICES hwclock"
-	else
-		SERVICES="$SERVICES swclock"
-
-		ln -s "/share/init/swclocksave" "$DEPLOY/etc/init.d/swclocksave@shutdown"
-		ln -s "/share/init/swclocksave" "$DEPLOY/etc/init.d/swclocksave@reboot"
-		ln -s "/share/init/swclocksave.gcron" "$DEPLOY/etc/gcron.d/swclocksave"
-		echo "etc/init.d/swclocksave@shutdown m 777 0 0" >> "$DEPLOY/rootfs_files.txt"
-		echo "etc/init.d/swclocksave@reboot m 777 0 0" >> "$DEPLOY/rootfs_files.txt"
-		echo "etc/gcron.d/swclocksave m 777 0 0" >> "$DEPLOY/rootfs_files.txt"
-
-		mkdir -p "$DEPLOY/var/lib"
-		date --utc +%m%d%H%M%Y.%S > "$DEPLOY/var/lib/swclock"
-		echo "var/lib/swclock m 644 0 0" >> "$DEPLOY/rootfs_files.txt"
-
-		if [ -z "$DHCP_PORTS" ]; then
-			ln -s "/share/init/ntpsetdate.gcron" "$DEPLOY/etc/gcron.d/ntpsetdate"
-			echo "etc/gcron.d/ntpsetdate m 777 0 0" >> "$DEPLOY/rootfs_files.txt"
-		else
-			echo "lib/libexec/dhcpcd-hooks/40-ntpsetdate m 555 0 0" >> "$DEPLOY/rootfs_files.txt"
-		fi
-	fi
-
-	svc=$(file_path_override "ifrename")
-	if [ ! -z "$svc" ]; then
-		cp "$svc" "$DEPLOY/etc/netcfg/ifrename"
-		echo "etc/netcfg/ifrename m 644 0 0" >> "$DEPLOY/rootfs_files.txt"
-		SERVICES="$SERVICES ifrename"
-	fi
-
-	svc=$(file_path_override "nftables.rules")
-	if [ ! -z "$svc" ]; then
-		cp "$svc" "$DEPLOY/etc/nftables.rules"
-		echo "etc/nftables.rules m 644 0 0" >> "$DEPLOY/rootfs_files.txt"
-		SERVICES="$SERVICES nft"
-	fi
-
-	svc=$(file_path_override "sysctl.conf")
-	if [ ! -z "$svc" ]; then
-		cp "$svc" "$DEPLOY/etc/sysctl.conf"
-		echo "etc/sysctl.conf m 644 0 0" >> "$DEPLOY/rootfs_files.txt"
-	fi
-
-	svc=$(file_path_override "interfaces")
-	if [ ! -z "$svc" ]; then
-		echo "etc/init.d/ifcfg m 777 0 0" >> "$DEPLOY/rootfs_files.txt"
-
-		for svc in $svc/*; do
-			[ -f "$svc" ] || continue
-			cp "$svc" "$DEPLOY/etc/netcfg/"
-			svc=$(basename $svc)
-			echo "etc/netcfg/$svc m 644 0 0" >> \
-			     "$DEPLOY/rootfs_files.txt"
-		done
-	fi
-
-	for svc in $GETTY_TTY; do
-		ln -s "/share/init/agetty" "$DEPLOY/etc/init.d/agetty@$svc"
-		echo "etc/init.d/agetty@$svc m 777 0 0" >> \
-		     "$DEPLOY/rootfs_files.txt"
-	done
-
-	if [ ! -z "$DHCP_PORTS" ]; then
-		SERVICES="$SERVICES dhcpcdmaster"
-	fi
-
-	for svc in $DHCP_PORTS; do
-		ln -s "/share/init/dhcpcd" "$DEPLOY/etc/init.d/dhcpcd@$svc"
-
-		echo "etc/init.d/dhcpcd@$svc m 777 0 0" >> \
-		     "$DEPLOY/rootfs_files.txt"
-	done
-
-	for svc in $SERVICES; do
-		ln -s "/share/init/$svc" "$DEPLOY/etc/init.d/$svc"
-		echo "etc/init.d/$svc m 777 0 0" >> "$DEPLOY/rootfs_files.txt"
-	done
-
-	touch "$DEPLOY/etc/modules"
-	for svc in $MODULES; do
-		echo "$svc" >> "$DEPLOY/etc/modules"
-	done
-
-	unset -v i GETTY_TTY HWCLOCK DHCP_PORTS SERVICES MODULES
 }
 
 check_update() {

pkg/init/etc/init.d/mountusr

@@ -1 +0,0 @@
-/share/init/mountusr

pkg/init/etc/init.d/tmpfsrun

@@ -1 +0,0 @@
-/share/init/tmpfsrun

pkg/init/etc/init.d/tmpfsvar

@@ -1 +0,0 @@
-/share/init/tmpfsvar

pkg/init/etc/initd.env

@@ -1 +0,0 @@
-PATH=/bin

pkg/init/lib/libexec/init/overlay.sh

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-lower=/cfg/preserve/${1}
-upper=/cfg/overlay/${1}
-work=/cfg/overlay/${1}_work
-target=${2}
-
-if [ ! -d "$target" ]; then
-	exit
-fi
-
-if [ -d "$lower" ]; then
-	if [ -d "$upper" ]; then
-		mkdir -p "$work"
-		mount -t overlay overlay \
-			-olowerdir=${lower},upperdir=${upper},workdir=${work} \
-			${target}
-	else
-		mount --bind "$lower" "$target"
-	fi
-fi

pkg/init/rootfs_files.txt

@@ -1,89 +1,8 @@
-bin/syslog m 555 0 0
 bin/service m 555 0 0
 bin/reboot m 777 0 0
 bin/shutdown m 555 0 0
 bin/init m 555 0 0
-bin/usyslogd m 555 0 0
-bin/klogd m 555 0 0
 bin/gcrond m 555 0 0
 lib/libexec/init m 555 0 0
 lib/libexec/init/killall5 m 555 0 0
 lib/libexec/init/runsvc m 555 0 0
-lib/libexec/init/devfs.sh m 555 0 0
-lib/libexec/init/trymount.sh m 555 0 0
-lib/libexec/init/ifrename.sh m 555 0 0
-lib/libexec/init/ifcfg.sh m 555 0 0
-lib/libexec/init/ifdown.sh m 555 0 0
-lib/libexec/init/modules_load.sh m 555 0 0
-lib/libexec/init/overlay.sh m 555 0 0
-lib/libexec/init/setntpdate.sh m 555 0 0
-share/init m 555 0 0
-share/init/agetty m 444 0 0
-share/init/hostname m 444 0 0
-share/init/loopback m 444 0 0
-share/init/sysctl m 444 0 0
-share/init/hwclock m 444 0 0
-share/init/sysinit m 444 0 0
-share/init/sigkill m 444 0 0
-share/init/sigterm m 444 0 0
-share/init/sync m 444 0 0
-share/init/devfs m 444 0 0
-share/init/sysfs m 444 0 0
-share/init/procfs m 444 0 0
-share/init/tmpfs m 444 0 0
-share/init/vfs m 444 0 0
-share/init/ifrename m 444 0 0
-share/init/ifcfg m 444 0 0
-share/init/dhcpcd m 444 0 0
-share/init/dhcpcdmaster m 444 0 0
-share/init/unbound m 444 0 0
-share/init/dnsmasq m 444 0 0
-share/init/usyslogd m 444 0 0
-share/init/klogd m 444 0 0
-share/init/mountusr m 444 0 0
-share/init/tmpfsrun m 444 0 0
-share/init/tmpfsvar m 444 0 0
-share/init/network m 444 0 0
-share/init/ifdown m 444 0 0
-share/init/modules m 444 0 0
-share/init/hostapd m 444 0 0
-share/init/swclock m 444 0 0
-share/init/swclocksave m 444 0 0
-share/init/nft m 444 0 0
-share/init/sshd m 444 0 0
-share/init/sshd_keygen m 444 0 0
-share/init/gcrond m 444 0 0
-share/init/consolefont m 444 0 0
-share/init/nginx m 444 0 0
-share/init/ntpsetdate.gcron m 444 0 0
-share/init/swclocksave.gcron m 444 0 0
-etc/netcfg m 755 0 0
-etc/modules m 644 0 0
-etc/initd.env m 644 0 0
-etc/init.d m 755 0 0
-etc/init.d/gcrond m 777 0 0
-etc/init.d/loopback m 777 0 0
-etc/init.d/hostname m 777 0 0
-etc/init.d/sysctl m 777 0 0
-etc/init.d/sysinit m 777 0 0
-etc/init.d/procfs m 777 0 0
-etc/init.d/sysfs m 777 0 0
-etc/init.d/devfs m 777 0 0
-etc/init.d/tmpfs m 777 0 0
-etc/init.d/vfs m 777 0 0
-etc/init.d/sync@shutdown m 777 0 0
-etc/init.d/sigkill@shutdown m 777 0 0
-etc/init.d/sigterm@shutdown m 777 0 0
-etc/init.d/sync@reboot m 777 0 0
-etc/init.d/sigkill@reboot m 777 0 0
-etc/init.d/sigterm@reboot m 777 0 0
-etc/init.d/mountusr m 777 0 0
-etc/init.d/tmpfsrun m 777 0 0
-etc/init.d/tmpfsvar m 777 0 0
-etc/init.d/usyslogd m 777 0 0
-etc/init.d/klogd m 777 0 0
-etc/init.d/modules m 777 0 0
-etc/init.d/network m 777 0 0
-etc/init.d/ifdown@shutdown m 777 0 0
-etc/init.d/ifdown@reboot m 777 0 0
-etc/gcron.d m 755 0 0

pkg/init/share/init/mountusr

@@ -1,5 +0,0 @@
-description "mount /usr"
-type wait
-target boot
-before vfs
-exec /lib/libexec/init/overlay.sh usr /usr

pkg/init/share/init/ntpsetdate.gcron

@@ -1,7 +0,0 @@
-hour */4
-minute 5
-dayofmonth *
-dayofweek *
-month *
-tty /dev/null
-exec "/lib/libexec/init/setntpdate.sh"

pkg/init/share/init/tmpfsrun

@@ -1,11 +0,0 @@
-description "mount /run"
-type wait
-target boot
-before vfs
-after tmpfsvar
-exec {
-	mount -t tmpfs none /run
-	mkdir /run/lock -m 0755
-	ln -s /run /var/run
-	ln -s /run/lock /var/lock
-}

pkg/init/share/init/tmpfsvar

@@ -1,16 +0,0 @@
-description "mount /var"
-type wait
-target boot
-before vfs
-exec {
-	mount -t tmpfs none /var
-	mkdir /var/log -m 0755
-	mkdir /var/spool -m 0755
-	mkdir /var/lib -m 0755
-	mkdir /var/tmp -m 0755
-	mkdir /var/nginx -m 0755
-	touch /var/log/lastlog
-	touch /var/log/faillog
-	touch /var/log/sulog
-	/lib/libexec/init/overlay.sh var_lib /var/lib
-}

pkg/usyslog/build

@@ -0,0 +1,27 @@
+VERSION="0.1"
+SRCDIR="usyslog-${VERSION}"
+TARBALL="${SRCDIR}.tar.xz"
+URL="http://infraroot.at/pygos"
+SHA256SUM="74451c13d62cf3a55ca2c61c9d1c0f4b3bd6c485b8012be6c3565315b887237c"
+DEPENDS="toolchain"
+
+prepare() {
+	return
+}
+
+build() {
+	run_configure "$1"
+	make -j $NUMJOBS
+}
+
+deploy() {
+	local SOURCE="$1"
+	local DEPLOY="$2"
+
+	make DESTDIR="$DEPLOY" install
+	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY"
+}
+
+check_update() {
+	return
+}

pkg/usyslog/rootfs_files.txt

@@ -0,0 +1,3 @@
+bin/syslog m 555 0 0
+bin/klogd m 555 0 0
+bin/usyslogd m 555 0 0