Browse Source

remove non-functional init systems

Waldemar Brodkorb 3 years ago
parent
commit
15b8c2e42b

+ 0 - 3
package/base-files/Makefile

@@ -91,9 +91,6 @@ endif
 	$(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab
 	$(SED) 's#@AUTOLOGIN@#$(ADK_RUNTIME_GETTY_SERIAL_AUTOLOGIN_STANZA)#' $(IDIR_BASE_FILES)/etc/inittab
 endif
-ifeq ($(ADK_RUNTIME_INIT_SYSVINIT),y)
-	cp ./files/inittab.sysvinit $(IDIR_BASE_FILES)/etc/inittab
-endif
 ifeq ($(ADK_RUNTIME_MOUNT_DEBUGFS),y)
 	echo debugfs    /sys/kernel/debug      debugfs  defaults  0 0 >> $(IDIR_BASE_FILES)/etc/fstab
 	echo null::sysinit:/bin/mount -a -t debugfs >> $(IDIR_BASE_FILES)/etc/inittab

+ 0 - 34
package/s6-linux-utils/Makefile

@@ -1,34 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		s6-linux-utils
-PKG_VERSION:=		2.1.0.0
-PKG_RELEASE:=		1
-PKG_HASH:=		3523ba84ba524198711b2de3edaaf620381a4e95d78ec6d13dcb7aba42397ead
-PKG_DESCR:=		set of minimalistic Linux-specific system utilities
-PKG_SECTION:=		sys/misc
-PKG_DEPENDS:=		skalibs
-PKG_BUILDDEP:=		skalibs
-PKG_URL:=		http://skarnet.org/software/s6-linux-utils/
-PKG_SITES:=		http://skarnet.org/software/s6-linux-utils/
-
-DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,S6_LINUX_UTILS,s6-linux-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-
-TARGET_LDFLAGS+=	-lrt
-CONFIGURE_ARGS+=	--with-sysdeps=$(STAGING_TARGET_DIR)/usr/lib/skalibs/sysdeps \
-			--with-include=$(STAGING_TARGET_DIR)/usr/include \
-			--with-dynlib=$(STAGING_TARGET_DIR)/usr/lib \
-			--disable-allstatic 
-
-s6-linux-utils-install:
-	$(INSTALL_DIR) $(IDIR_S6_LINUX_UTILS)/usr/bin
-	$(CP) $(WRKINST)/usr/bin/* \
-		$(IDIR_S6_LINUX_UTILS)/usr/bin
-
-include $(ADK_TOPDIR)/mk/pkg-bottom.mk

+ 0 - 33
package/s6-portable-utils/Makefile

@@ -1,33 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		s6-portable-utils
-PKG_VERSION:=		2.0.6.0
-PKG_RELEASE:=		1
-PKG_HASH:=		233b7d13766a23661cc7ed5c052f29b9c558c1d516a538a281a17da22a909d4b
-PKG_DESCR:=		set of tiny general Unix utilities
-PKG_SECTION:=		sys/misc
-PKG_DEPENDS:=		skalibs
-PKG_BUILDDEP:=		skalibs
-PKG_URL:=		http://skarnet.org/software/s6-portable-utils/
-PKG_SITES:=		http://skarnet.org/software/s6-portable-utils/
-
-DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,S6_PORTABLE_UTILS,s6-portable-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-
-CONFIGURE_ARGS+=	--with-sysdeps=$(STAGING_TARGET_DIR)/usr/lib/skalibs/sysdeps \
-			--with-include=$(STAGING_TARGET_DIR)/usr/include \
-			--with-dynlib=$(STAGING_TARGET_DIR)/usr/lib \
-			--disable-allstatic 
-
-s6-portable-utils-install:
-	$(INSTALL_DIR) $(IDIR_S6_PORTABLE_UTILS)/usr/bin
-	$(CP) $(WRKINST)/usr/bin/* \
-		$(IDIR_S6_PORTABLE_UTILS)/usr/bin
-
-include $(ADK_TOPDIR)/mk/pkg-bottom.mk

+ 0 - 39
package/s6/Makefile

@@ -1,39 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		s6
-PKG_VERSION:=		2.3.0.0
-PKG_RELEASE:=		1
-PKG_HASH:=		49c9a0476d93c6279c776ca5ae9c49b3fd39c356eda674828aebf78f8488e8e6
-PKG_DESCR:=		small suite of programs for UNIX, designed to allow process supervision
-PKG_SECTION:=		base/init
-PKG_DEPENDS:=		skalibs execline
-PKG_BUILDDEP:=		skalibs execline
-PKG_URL:=		http://www.skarnet.org/software/s6/
-PKG_SITES:=		http://www.skarnet.org/software/s6/
-
-DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,S6,s6,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-
-CONFIGURE_ARGS+=	--with-sysdeps=$(STAGING_TARGET_DIR)/usr/lib/skalibs/sysdeps \
-			--with-include=$(STAGING_TARGET_DIR)/usr/include \
-			--with-dynlib=$(STAGING_TARGET_DIR)/usr/lib \
-			--disable-allstatic 
-
-s6-install:
-	$(INSTALL_DIR) $(IDIR_S6)/usr/bin
-	$(INSTALL_DIR) $(IDIR_S6)/usr/sbin
-	$(INSTALL_DIR) $(IDIR_S6)/usr/libexec
-	$(CP) $(WRKINST)/usr/bin/* \
-		$(IDIR_S6)/usr/bin
-	$(CP) $(WRKINST)/usr/sbin/* \
-		$(IDIR_S6)/usr/sbin
-	$(CP) $(WRKINST)/usr/libexec/* \
-		$(IDIR_S6)/usr/libexec
-
-include $(ADK_TOPDIR)/mk/pkg-bottom.mk

+ 0 - 27
package/sysvinit/Makefile

@@ -1,27 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		sysvinit
-PKG_VERSION:=		2.97
-PKG_RELEASE:=		1
-PKG_HASH:=		2d5996857519bfd8634d2e1debabb3238fb38440f65fbfdc46420ee8bdf25110
-PKG_DESCR:=		systemV init
-PKG_SECTION:=		base/init
-PKG_URL:=		http://savannah.nongnu.org/projects/sysvinit
-PKG_SITES:=		http://download.savannah.gnu.org/releases/sysvinit/
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,SYSVINIT,sysvinit,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-
-CONFIG_STYLE:=		manual
-FAKE_FLAGS+=		ROOT='$(WRKINST)'
-
-sysvinit-install:
-	$(INSTALL_DIR) $(IDIR_SYSVINIT)/sbin
-	$(INSTALL_BIN) $(WRKINST)/sbin/init \
-		$(IDIR_SYSVINIT)/sbin
-
-include $(ADK_TOPDIR)/mk/pkg-bottom.mk

+ 0 - 14
target/config/Config.in.runtime

@@ -24,20 +24,6 @@ config ADK_RUNTIME_INIT_SIMPLEINIT
 	bool "Use a very simple init"
 	select ADK_PACKAGE_SIMPLEINIT
 
-config ADK_RUNTIME_INIT_SYSVINIT
-	bool "Use system V init"
-	select ADK_PACKAGE_SYSVINIT
-	select ADK_PACKAGE_AGETTY
-	select ADK_PACKAGE_GAWK
-	select ADK_PACKAGE_IP
-	select ADK_PACKAGE_MOUNT
-
-config ADK_RUNTIME_INIT_S6
-	bool "Use s6 init and supervision"
-	select ADK_PACKAGE_S6
-	select ADK_PACKAGE_S6_PORTABLE_UTILS
-	select ADK_PACKAGE_S6_LINUX_UTILS
-
 config ADK_RUNTIME_INIT_SYSTEMD
 	bool "Use systemd init and supervision"
 	select ADK_PACKAGE_SYSTEMD