Merge ~nemos-team/nemos/+git/u-boot-s32:remove-u-boot-s32-source into ~nemos-team/nemos/+git/u-boot-s32:ubuntu/devel

[Isaac True]

[Laider Lai (laiderlai)]

LGTM

review: Approve

diff --git a/debian/changelog b/debian/changelog
index b45d428..2d1db46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+u-boot-s32 (2022.04-bsp37.0-14) noble; urgency=medium
+
+  * Remove u-boot-s32-source package as it's no longer needed for building
+    arm-trusted-firmware-s32.
+
+ -- Isaac True <[e-mail]>  Wed, 22 Nov 2023 10:23:21 +0100
+
 u-boot-s32 (2022.04-bsp37.0-13) noble; urgency=medium
 
   * Update nemos-s32g274ardb2.patch:
diff --git a/debian/control b/debian/control
index c225554..3e690b7 100644
--- a/debian/control
+++ b/debian/control
@@ -65,15 +65,3 @@ Description: companion tools for Das U-Boot S32 bootloader
   - mkimage-s32
   - dumpimage-s32
   - mkenvimage-s32
-
-Package: u-boot-s32-source
-Architecture: all
-Depends: ${misc:Depends}
-Description: A boot loader for NXP S32 systems - sources
- Das U-Boot is a cross-platform bootloader for embedded systems,
- used as the default boot loader by several board vendors.  It is
- intended to be easy to port and to debug, and runs on many
- supported architectures, including PPC, ARM, MIPS, x86, m68k,
- NIOS, and Microblaze.
- .
- This package includes the U-Boot sources for various NXP S32 platforms.
diff --git a/debian/rules b/debian/rules
index 3079a23..5dcf861 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ LDFLAGS := $(patsubst -Wl$(comma)%,%,$(LDFLAGS))
 
 notools := $(filter pkg.uboot.notools,$(DEB_BUILD_PROFILES))
 
-subarchs := $(shell dh_listpackages --arch --no-package=u-boot-s32-tools --no-package=u-boot-s32-source)
+subarchs := $(shell dh_listpackages --arch --no-package=u-boot-s32-tools)
 
 # Each .deb P in subarch contains $(P_platforms).
 # These profiles remove values from $(P_platforms) for debugging.
@@ -61,20 +61,12 @@ endif
 %:
 	dh $@
 
-SRC_DIR := $(CURDIR)/debian/u-boot-s32-source/usr/src/u-boot-s32
-SRC_TAR := $(CURDIR)/debian/u-boot-s32-source.tar
-
-override_dh_auto_build-indep: $(SRC_TAR)
-override_dh_auto_build-arch: $(subarchs) $(SRC_TAR)
+override_dh_auto_build-indep:
+override_dh_auto_build-arch: $(subarchs)
 ifeq ($(notools),)
   override_dh_auto_build-arch: build-tools
 endif
 
-$(SRC_TAR):
-	# Create source package
-	tar -cpf $(SRC_TAR) -C $(CURDIR) --exclude ./debian \
-		--exclude ./.git ./*
-
 # These intermediate per-package targets are convenient to add
 # prerequisites to a subarch, but they are empty by default so we need
 # to prevent Make applying the default %: recipe above.
@@ -145,11 +137,7 @@ build-tools:
 override_dh_auto_test-indep:
 
 # Do not spend time searching for an install target in Makefile.
-override_dh_auto_install: $(SRC_DIR)
-
-$(SRC_DIR):
-	mkdir -p $(SRC_DIR)
-	tar -xpf $(SRC_TAR) -C $(SRC_DIR)
+override_dh_auto_install:
 
 # override_ would require to test notools, which is unrelated.
 execute_after_dh_install-arch: $(addprefix install-,$(foreach package,$(subarchs),$($(package)_platforms))) $(addprefix installdocs-,$(subarchs))
@@ -164,7 +152,6 @@ installdocs-%:
 override_dh_clean:
 	rm -rf debian/build/
 	rm -f linux.itb linux.its
-	rm -rf $(CURDIR)/debian/u-boot-s32-source $(SRC_TAR)
 	rm -rf $(CURDIR)/debian/u-boot-s32
 	dh_clean $(dh_clean_args)
 	find . -type d -name __pycache__ -delete
diff --git a/debian/u-boot-s32.lintian-overrides b/debian/u-boot-s32.lintian-overrides
index f86a4f0..3fe0602 100644
--- a/debian/u-boot-s32.lintian-overrides
+++ b/debian/u-boot-s32.lintian-overrides
@@ -12,5 +12,3 @@ u-boot-s32 binary: statically-linked-binary usr/lib/u-boot/*/uboot.elf
 u-boot-s32 binary: shared-library-lacks-prerequisites usr/lib/u-boot/*/uboot.elf
 
 u-boot-s32: description-synopsis-starts-with-article
-
-u-boot-s32-source: description-synopsis-starts-with-article