From 4197b75c8efb390db8af1e9d90a38e17c53ca877 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Mon, 2 Dec 2019 16:34:02 +0100 Subject: [PATCH] build: include initramfs:init in the build plan Now with the dependencies in initramfs:init, we can include it in the build plan to parallalize it. But just build them there, the kernel package keeps installing them. --- packages/linux/package.mk | 2 +- scripts/genbuildplan.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index e8e9200ff0..069d757da9 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 $KERNEL_EXTRA_DEPENDS_TARGET" +PKG_DEPENDS_TARGET="toolchain linux:host cpio:host kmod:host xz:host wireless-regdb keyutils initramfs:init $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" diff --git a/scripts/genbuildplan.py b/scripts/genbuildplan.py index 15e4dca4cf..b1f894e3e2 100755 --- a/scripts/genbuildplan.py +++ b/scripts/genbuildplan.py @@ -228,7 +228,7 @@ def get_build_steps(args, nodes, trigger_pkgs, built_pkgs): for pkg in resolved: if pkg.fqname not in built_pkgs: built_pkgs.append(pkg.fqname) - task = "build" if pkg.fqname.endswith(":host") or not install else "install" + task = "build" if pkg.fqname.endswith(":host") or pkg.fqname.endswith(":init") or not install else "install" yield(task, pkg.fqname) # Reduce the complete list of packages to a map of those packages that will