build: introduce support to declare skip package

It seems some target started declaring package in DEVICE_PACKAGES just to call InstallDev and generate binary for the image firmware. This is very much used by layerscape target where trusted-firmware-a and dependency are called for final image generation. This is problematic for APK since it's more sensible to non exisiting package. To handle this, introduce a prefix '~' for a package that will signal to build the package but not install it in the final image. Signed-off-by: Christian Marangi <[email protected]>
liulang25 · Oct 28, 2024 · 377b669 · 377b669
1 parent fb56a46
commit 377b669
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/image.mk b/include/image.mk
@@ -326,7 +326,7 @@ ifdef CONFIG_TARGET_ROOTFS_CPIOGZ
 endif
 
 mkfs_packages = $(filter-out @%,$(PACKAGES_$(call param_get,pkg,pkg=$(target_params))))
-mkfs_packages_add = $(foreach pkg,$(filter-out -%,$(mkfs_packages)),$(pkg)$(call GetABISuffix,$(pkg)))
+mkfs_packages_add = $(foreach pkg,$(filter-out -% ~%,$(mkfs_packages)),$(pkg)$(call GetABISuffix,$(pkg)))
 mkfs_packages_remove = $(foreach pkg,$(patsubst -%,%,$(filter -%,$(mkfs_packages))),$(pkg)$(call GetABISuffix,$(pkg)))
 mkfs_cur_target_dir = $(call mkfs_target_dir,pkg=$(target_params))
 

diff --git a/scripts/target-metadata.pl b/scripts/target-metadata.pl
@@ -146,7 +146,7 @@ ($$)
 	my %pkgs;
 
 	foreach my $pkg (@$list1, @$list2) {
-		$pkgs{$pkg} = 1;
+		$pkgs{$pkg =~ s/^~//r} = 1;
 	}
 	foreach my $pkg (keys %pkgs) {
 		push @l, $pkg unless ($pkg =~ /^-/ or $pkgs{"-$pkg"});