goodbye systemd, never worked fully on a openadk emulator or device. Use simple static device nodes with devtmpfs as default. mdev is to bloated for some devices

9 files changed, 5 insertions, 230 deletions

diff --git a/package/Config.in.options b/package/Config.in.options
index 39e6a0b96..a806da895 100644
--- a/package/Config.in.options
+++ b/package/Config.in.options
@@ -47,7 +47,7 @@ config ADK_LEAVE_ETC_ALONE
 
 config ADK_INSTALL_PACKAGE_INIT_SCRIPTS
 	bool "ship custom init-scripts along with packages"
-	default y if !ADK_RUNTIME_INIT_SYSTEMD
+	default y
 	depends on !ADK_LEAVE_ETC_ALONE
 	help
 	  Turning this option to false will prevent the ADK from
@@ -59,7 +59,7 @@ config ADK_INSTALL_PACKAGE_INIT_SCRIPTS
 
 config ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS
 	bool "ship custom network-scripts along with packages"
-	default y if !ADK_RUNTIME_INIT_SYSTEMD
+	default y
 	depends on !ADK_LEAVE_ETC_ALONE
 	help
 	  Turning this option to false will prevent the ADK from
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 24e4e2432..c3f77fe7c 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -40,7 +40,6 @@ do-install:
 	ln -sf ../run $(IDIR_BASE_FILES)/var/run
 	chmod 600 $(IDIR_BASE_FILES)/etc/shadow
 	chmod 1777 ${IDIR_BASE_FILES}/tmp
-ifeq ($(ADK_RUNTIME_INIT_SYSTEMD),)
 	echo $(ADK_RUNTIME_TMPFS_SIZE) > $(IDIR_BASE_FILES)/etc/tmpfs
 	mkdir -p $(IDIR_BASE_FILES)/etc/init.d
 	cp ./files/init.d/* $(IDIR_BASE_FILES)/etc/init.d
@@ -64,7 +63,6 @@ ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y)
 else
 	(cd $(IDIR_BASE_FILES)/etc; ln -sf ../tmp/resolv.conf .)
 endif
-endif
 ifeq ($(ADK_RUNTIME_DEV_MDEV),y)
 	$(CP) ./files/rcdev.mdev $(IDIR_BASE_FILES)/etc/init.d/rcdev
 	$(SED) "s#@ADK_RUNTIME_DEV_MDEV_LOGGING@#"$(ADK_RUNTIME_DEV_MDEV_LOGGING_LINE)"#g" $(IDIR_BASE_FILES)/etc/init.d/rcdev
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 23c378199..c1e6bb617 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -69,7 +69,6 @@ do-build:
 do-install:
 	PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} install $(MAKE_TRACE)
 	$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
-ifeq ($(ADK_RUNTIME_INIT_SYSTEMD),)
 ifeq ($(BUSYBOX_IFUP),y)
 	$(INSTALL_DIR) $(IDIR_BUSYBOX)/etc/init.d
 ifeq ($(ADK_RUNTIME_WAIT_FOR_ETHERNET),y)
@@ -78,7 +77,6 @@ else
 	$(INSTALL_BIN) ./files/network $(IDIR_BUSYBOX)/etc/init.d/network
 endif
 endif
-endif
 ifeq ($(ADK_DEBUG),y)
 	${INSTALL_BIN} $(WRKBUILD)/busybox_unstripped \
 		$(IDIR_BUSYBOX)/bin/busybox
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index c32a5fdcd..ba47bc369 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		dbus
 PKG_VERSION:=		1.10.20
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		e574b9780b5425fde4d973bb596e7ea0f09e00fe2edd662da9016e976c460b48
 PKG_DESCR:=		desktop bus daemon
 PKG_SECTION:=		sys/misc
@@ -24,10 +24,6 @@ PKGSD_LIBDBUS:=		DBUS library
 PKGSC_LIBDBUS:=		libs/misc
 PKGSS_LIBDBUS:=		libexpat libuuid
 
-PKG_FLAVOURS_DBUS:=	WITH_SYSTEMD
-PKGFD_WITH_SYSTEMD:=	enable systemd support
-PKGFB_WITH_SYSTEMD:=	systemd
-
 include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -36,14 +32,8 @@ $(eval $(call PKG_template,LIBDBUS,libdbus,${PKG_VERSION}-${PKG_RELEASE},${PKGSS
 TARGET_LDFLAGS+=	-luuid
 
 AUTOTOOL_STYLE:=	autoreconf
-ifeq ($(ADK_PACKAGE_DBUS_WITH_SYSTEMD),y)
-CONFIGURE_ARGS+=	--enable-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system
-TARGET_LDFLAGS+=	-lsystemd
-else
-CONFIGURE_ARGS+=	--disable-systemd
-endif
-
-CONFIGURE_ARGS+=	--disable-tests \
+CONFIGURE_ARGS+=	--disable-systemd \
+			--disable-tests \
 			--disable-asserts \
 			--enable-abstract-sockets \
 			--with-dbus-user=dbus \
@@ -76,10 +66,6 @@ dbus-install:
 	${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc
 	${CP} ${WRKINST}/usr/share/dbus-1 ${IDIR_DBUS}/usr/share
 	${CP} ${WRKINST}/usr/bin/dbus-* ${IDIR_DBUS}/usr/bin
-ifeq ($(ADK_PACKAGE_DBUS_WITH_SYSTEMD),y)
-	${INSTALL_DIR} ${IDIR_DBUS}/usr/lib/systemd
-	${CP} ${WRKINST}/usr/lib/systemd/* ${IDIR_DBUS}/usr/lib/systemd
-endif
 	# workaround for dev subpackage
 	${INSTALL_DIR} $(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus
 	$(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \
diff --git a/package/dropbear/files/dropbear.service b/package/dropbear/files/dropbear.service
deleted file mode 100644
index eeb86cfa7..000000000
--- a/package/dropbear/files/dropbear.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Dropbear SSH daemon
-After=syslog.target network.target
-
-[Service]
-EnvironmentFile=-/etc/default/dropbear
-ExecStart=/usr/sbin/dropbear -F -R $DROPBEAR_ARGS
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/package/fwupdate/files/fwupdate.service b/package/fwupdate/files/fwupdate.service
deleted file mode 100644
index f54519547..000000000
--- a/package/fwupdate/files/fwupdate.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Firmware Update Validation
-After=dropbear.service
-
-[Service]
-ExecStart=/usr/sbin/fwvalidate
-
-[Install]
-WantedBy=multi-user.target
diff --git a/package/systemd/Makefile b/package/systemd/Makefile
deleted file mode 100644
index 24d13bb84..000000000
--- a/package/systemd/Makefile
+++ /dev/null
@@ -1,155 +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:=		systemd
-PKG_VERSION:=		250
-PKG_RELEASE:=		1
-PKG_HASH:=		389935dea020caf6e2e81a4e90e556bd5599a2086861045efdc06197776e94e1
-PKG_DESCR:=		system and service manager
-PKG_SECTION:=		base/init
-PKG_DEPENDS:=		libcap libmount libuuid libblkid libncurses libkmod
-PKG_BUILDDEP:=		intltool-host gperf-host libcap util-linux
-PKG_BUILDDEP+=		python3-host gettext-host kmod meson-host ninja-host
-PKG_BUILDDEP+=		python3-jinja2-host
-PKG_KDEPENDS:=		inotify-user cgroups namespaces fhandle tmpfs-posix-acl tmpfs-xattr
-PKG_KDEPENDS+=		uts-ns autofs4-fs fanotify
-PKG_LIBC_DEPENDS:=	glibc
-PKG_NEEDS:=		locale intl
-PKG_URL:=		https://wiki.freedesktop.org/www/Software/systemd/
-PKG_SITES:=		https://github.com/systemd/systemd/archive/
-
-PKG_CFLINE_SYSTEMD:=	select BUSYBOX_SULOGIN if ADK_RUNTIME_BASE_BUSYBOX
-
-PKG_FLAVOURS_SYSTEMD:=	WITH_PAM WITH_XZ WITH_ZLIB
-PKGFD_WITH_PAM:=	enable pam support
-PKGFS_WITH_PAM:=	pam
-PKGFB_WITH_PAM:=	pam
-PKGFD_WITH_XZ:=		enable xz support
-PKGFS_WITH_XZ:=		xz
-PKGFB_WITH_XZ:=		xz
-PKGFD_WITH_ZLIB:=	enable zlib support
-PKGFS_WITH_ZLIB:=	zlib
-PKGFB_WITH_ZLIB:=	zlib
-
-DISTFILES:=             v$(PKG_VERSION).tar.gz
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,SYSTEMD,systemd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-
-WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
-
-CONFIG_STYLE:=		meson
-BUILD_STYLE:=		meson
-INSTALL_STYLE:=		meson
-
-MESON_FLAGS+=		-Drootlibdir='/usr/lib' \
-			-Dsysvinit-path='' \
-			-Dsplit-bin=true \
-			-Dsplit-usr=true \
-			-Dman=false \
-			-Dima=false \
-			-Dlibcryptsetup=false \
-			-Defi=false \
-			-Dgnu-efi=false \
-			-Dldconfig=false \
-			-Ddefault-dnssec=no \
-			-Dtests=false \
-			-Dkmod-path=/usr/bin/kmod \
-			-Dkexec-path=/usr/sbin/kexec \
-			-Dsulogin-path=/sbin/sulogin \
-			-Dmount-path=/bin/mount \
-			-Dumount-path=/bin/umount \
-			-Dacl=false \
-			-Daudit=false \
-			-Didn=false \
-			-Dmode=release \
-			-Dnss-systemd=true \
-			-Dresolve=false \
-			-Dseccomp=false \
-			-Dxkbcommon=false \
-			-Dbzip2=false \
-			-Dlz4=false \
-			-Dlibcurl=false \
-			-Dgcrypt=false \
-			-Dqrencode=false \
-			-Dmicrohttpd=false \
-			-Dselinux=false \
-			-Dhwdb=false \
-			-Dportabled=false \
-			-Dbinfmt=false \
-			-Dvconsole=false \
-			-Dquotacheck=false \
-			-Dbacklight=false \
-			-Drfkill=false \
-			-Dmachined=false \
-			-Dimportd=false \
-			-Dhostnamed=false \
-			-Dlocaled=false \
-			-Dcoredump=false \
-			-Dsmack=false \
-			-Dsysusers=false \
-			-Dhibernate=false \
-			-Dpolkit=true \
-			-Dnetworkd=true \
-			-Dtimesyncd=true \
-			-Dtmpfiles=true \
-			-Dnss-systemd=true \
-			-Dfirstboot=true \
-			-Drandomseed=true \
-			-Dlogind=true \
-			-Dtimedated=true
-
-
-ifeq ($(ADK_PACKAGE_SYSTEMD_WITH_PAM),y)
-MESON_FLAGS+=		-Dpam=true
-else
-MESON_FLAGS+=		-Dpam=false
-endif
-
-ifeq ($(ADK_PACKAGE_SYSTEMD_WITH_XZ),y)
-MESON_FLAGS+=		-Dxz=true
-else
-MESON_FLAGS+=		-Dxz=false
-endif
-
-ifeq ($(ADK_PACKAGE_SYSTEMD_WITH_ZLIB),y)
-MESON_FLAGS+=		-Dzlib=true
-else
-MESON_FLAGS+=		-Dzlib=false
-endif
-
-systemd-install:
-	$(INSTALL_DIR) $(IDIR_SYSTEMD)/etc
-	touch $(IDIR_SYSTEMD)/etc/machine-id
-	$(CP) $(WRKINST)/etc/* \
-		$(IDIR_SYSTEMD)/etc
-	$(INSTALL_DIR) $(IDIR_SYSTEMD)/lib/systemd
-	$(CP) $(WRKINST)/lib/systemd/* \
-		$(IDIR_SYSTEMD)/lib/systemd
-	$(INSTALL_DIR) $(IDIR_SYSTEMD)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/*.so* \
-		$(IDIR_SYSTEMD)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/{systemd,kernel,sysctl.d,tmpfiles.d} \
-		$(IDIR_SYSTEMD)/usr/lib
-	$(INSTALL_DIR) $(IDIR_SYSTEMD)/sbin
-	$(CP) $(WRKINST)/sbin/* \
-		$(IDIR_SYSTEMD)/sbin
-	$(INSTALL_DIR) $(IDIR_SYSTEMD)/bin
-	$(CP) $(WRKINST)/bin/* \
-		$(IDIR_SYSTEMD)/bin
-	$(INSTALL_DIR) $(IDIR_SYSTEMD)/usr/bin
-	$(CP) $(WRKINST)/usr/bin/* \
-		$(IDIR_SYSTEMD)/usr/bin
-	$(INSTALL_DIR) $(IDIR_SYSTEMD)/usr/share
-	$(CP) $(WRKINST)/usr/share/* \
-		$(IDIR_SYSTEMD)/usr/share
-	$(CP) ./files/*.network \
-		$(IDIR_SYSTEMD)/etc/systemd/network
-	(cd $(IDIR_SYSTEMD)/lib/systemd/system && ln -sf multi-user.target default.target)
-	$(CP) $(WRKBUILD)/systemd $(IDIR_SYSTEMD)/usr/lib/systemd/
-	mv $(IDIR_SYSTEMD)/lib/systemd/libsystemd-shared-250.so $(IDIR_SYSTEMD)/lib
-
-include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/systemd/files/systemd.postinst b/package/systemd/files/systemd.postinst
deleted file mode 100644
index 76e213117..000000000
--- a/package/systemd/files/systemd.postinst
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-gid=$(get_next_gid)
-add_group utmp $gid
-gid=$(get_next_gid)
-add_group systemd-journal $gid
-gid=$(get_next_gid)
-add_group systemd-bus-proxy $gid
-add_user systemd-bus-proxy $(get_next_uid) $gid /
-gid=$(get_next_gid)
-add_group systemd-journal-gateway $gid
-add_user systemd-journal-gateway $(get_next_uid) $gid /
-gid=$(get_next_gid)
-add_group systemd-journal-remote $gid
-add_user systemd-journal-remote $(get_next_uid) $gid /
-gid=$(get_next_gid)
-add_group systemd-journal-upload $gid
-add_user systemd-journal-upload $(get_next_uid) $gid /
-gid=$(get_next_gid)
-add_group systemd-network $gid
-add_user systemd-network $(get_next_uid) $gid /
-gid=$(get_next_gid)
-add_group systemd-resolve $gid
-add_user systemd-resolve $(get_next_uid) $gid /
-gid=$(get_next_gid)
-add_group systemd-timesync $gid
-add_user systemd-timesync $(get_next_uid) $gid /
diff --git a/package/systemd/files/wired.network b/package/systemd/files/wired.network
deleted file mode 100644
index 9613cc040..000000000
--- a/package/systemd/files/wired.network
+++ /dev/null
@@ -1,5 +0,0 @@
-[Match]
-Name=en*
-
-[Network]
-DHCP=ipv4