diff --git a/packages/linux/package.mk b/packages/linux/package.mk index cfa3b10d06..196dd57c32 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -6,7 +6,7 @@ PKG_NAME="linux" PKG_LICENSE="GPL" PKG_SITE="http://www.kernel.org" PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host" -PKG_DEPENDS_TARGET="toolchain linux:host cpio:host kmod:host xz:host wireless-regdb keyutils initramfs:init $KERNEL_EXTRA_DEPENDS_TARGET" +PKG_DEPENDS_TARGET="toolchain linux:host cpio:host kmod:host xz:host wireless-regdb keyutils $KERNEL_EXTRA_DEPENDS_TARGET" PKG_NEED_UNPACK="$LINUX_DEPENDS $(get_pkg_directory initramfs) $(get_pkg_variable initramfs PKG_NEED_UNPACK)" PKG_LONGDESC="This package contains a precompiled kernel image and the modules." PKG_IS_KERNEL_PKG="yes" @@ -57,6 +57,13 @@ if [[ "$KERNEL_TARGET" = uImage* ]]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET u-boot-tools:host" fi +# Ensure that the dependencies of initramfs:target are built correctly, but +# we don't want to add initramfs:target as a direct dependency as we install +# this "manually" from within linux:target +for pkg in $(get_pkg_variable initramfs PKG_DEPENDS_TARGET); do + ! listcontains "${PKG_DEPENDS_TARGET}" "${pkg}" && PKG_DEPENDS_TARGET+=" ${pkg}" || true +done + post_patch() { cp $PKG_KERNEL_CFG_FILE $PKG_BUILD/.config