From 6e0d4e4ca2f916e8448506caaca5a3aa08c3a142 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Mon, 2 Dec 2019 16:34:02 +0100 Subject: [PATCH] initramfs: move all :init dependencies to initramfs:init This allows us to automatically add them to PKG_NEED_UNPACK and add further logic based on initramfs:init. --- packages/virtual/initramfs/package.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/virtual/initramfs/package.mk b/packages/virtual/initramfs/package.mk index ac962b4899..c31c5ba4f1 100644 --- a/packages/virtual/initramfs/package.mk +++ b/packages/virtual/initramfs/package.mk @@ -7,18 +7,23 @@ PKG_VERSION="" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain libc:init busybox:init plymouth-lite:init util-linux:init e2fsprogs:init dosfstools:init fakeroot:host terminus-font:init" +PKG_DEPENDS_INIT="libc:init busybox:init plymouth-lite:init util-linux:init e2fsprogs:init dosfstools:init terminus-font:init" +PKG_DEPENDS_TARGET="toolchain fakeroot:host initramfs:init" PKG_SECTION="virtual" PKG_LONGDESC="Metapackage for installing initramfs" if [ "$ISCSI_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET open-iscsi:init" + PKG_DEPENDS_INIT+=" open-iscsi:init" fi if [ "$INITRAMFS_PARTED_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET parted:init" + PKG_DEPENDS_INIT+=" parted:init" fi +for i in $PKG_DEPENDS_INIT; do + PKG_NEED_UNPACK+=" $(get_pkg_directory $i)" +done + post_install() { ( cd $BUILD/initramfs if [ "$TARGET_ARCH" = "x86_64" ]; then