nemos-team team mailing list archive

[Isaac True <mp+456057@xxxxxxxxxxxxxxxxxx>]

Isaac True has proposed merging ~nemos-team/nemos/+git/optee-os-s32:fix-lintian into ~nemos-team/nemos/+git/optee-os-s32:ubuntu/devel.

Requested reviews:
  Laider Lai (laiderlai)

For more details, see:
https://code.launchpad.net/~nemos-team/nemos/+git/optee-os-s32/+merge/456057
-- 
Your team NemOS Team is subscribed to branch ~nemos-team/nemos/+git/optee-os-s32:ubuntu/devel.

diff --git a/debian/.gitignore b/debian/.gitignore
index a46aead..c8be993 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -7,3 +7,4 @@
 /optee-os-s32
 /optee-os-s32-hse-dev
 /optee-os-s32-hse
+/control
diff --git a/debian/changelog b/debian/changelog
index 8f5d2c4..5d118a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+optee-os-s32 (3.18-bsp37.0-9) noble; urgency=medium
+
+  * Correct lintian-override syntax.
+  * Remove optee-os-s32-source package, as this is no longer needed for
+    compiling arm-trusted-firmware-s32.
+  * Remove unnecessary build dependency gcc.
+
+ -- Isaac True <isaac.true@xxxxxxxxxxxxx>  Wed, 22 Nov 2023 09:43:03 +0100
+
 optee-os-s32 (3.18-bsp37.0-8) mantic; urgency=medium
 
   * Change -dev package install path to /usr/share/optee-os-s32, as it was
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 62c1889..0000000
--- a/debian/control
+++ /dev/null
@@ -1,58 +0,0 @@
-Source: optee-os-s32
-Section: admin
-Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@xxxxxxxxxxxxxxxx>
-XSBC-Original-Maintainer: Isaac True <isaac.true@xxxxxxxxxxxxx>
-Uploaders: Isaac True <isaac.true@xxxxxxxxxxxxx>
-Build-Depends:
- binutils,
- debhelper-compat (= 13),
- python3-pycryptodome,
- python3-pyelftools,
- python3-cryptography,
- device-tree-compiler,
- gcc (>> 9.0),
- nemos-dev-cert,
- nemos-dev-key,
-Rules-Requires-Root: no
-Standards-Version: 4.6.2
-Homepage: https://www.op-tee.org/
-Vcs-Browser: https://github.com/nxp-auto-linux/optee_os
-Vcs-Git: https://github.com/nxp-auto-linux/optee_os
-
-Package: optee-os-s32
-Architecture: arm64
-Depends: ${misc:Depends}
-Provides: ${provides:optee-os-s32}
-Conflicts: ${conflicts:optee-os-s32}
-Description: OP-TEE Trusted Execution Environment (TEE) for NXP S32
- OP-TEE is a Trusted Execution Environment (TEE) designed as companion to a
- non-secure Linux kernel running on Arm; Cortex-A cores using the TrustZone
- technology.
- .
- This package includes support for NXP S32 platforms.
- ${hse:desc}
-
-Package: optee-os-s32-dev
-Architecture: arm64
-Depends: ${misc:Depends}
-Recommends: python3
-Provides: ${provides:optee-os-s32-dev}
-Conflicts: ${conflicts:optee-os-s32-dev}
-Description: OP-TEE Trusted Execution Environment (TEE) for NXP S32 - headers
- OP-TEE is a Trusted Execution Environment (TEE) designed as companion to a
- non-secure Linux kernel running on Arm; Cortex-A cores using the TrustZone
- technology.
- .
- This package includes the generated headers for NXP S32 platforms.
- ${hse:desc}
-
-Package: optee-os-s32-source
-Architecture: all
-Depends: ${misc:Depends}
-Description: OP-TEE Trusted Execution Environment (TEE) for NXP S32 - source
- OP-TEE is a Trusted Execution Environment (TEE) designed as companion to a
- non-secure Linux kernel running on Arm; Cortex-A cores using the TrustZone
- technology.
- .
- This package includes the source code for NXP S32 platforms.
diff --git a/debian/control.stub b/debian/control.stub
index b52cf40..a445019 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -47,13 +47,3 @@ Description: OP-TEE Trusted Execution Environment (TEE) for NXP S32 - headers
  .
  This package includes the generated headers for NXP S32 platforms.
  ${hse:desc}
-
-Package: optee-os-s32-source
-Architecture: all
-Depends: ${misc:Depends}
-Description: OP-TEE Trusted Execution Environment (TEE) for NXP S32 - source
- OP-TEE is a Trusted Execution Environment (TEE) designed as companion to a
- non-secure Linux kernel running on Arm; Cortex-A cores using the TrustZone
- technology.
- .
- This package includes the source code for NXP S32 platforms.
diff --git a/debian/optee-os-s32-dev.lintian-overrides b/debian/optee-os-s32-dev.lintian-overrides
index f5686a6..a812656 100644
--- a/debian/optee-os-s32-dev.lintian-overrides
+++ b/debian/optee-os-s32-dev.lintian-overrides
@@ -1 +1 @@
-optee-os-s32-dev binary: arch-dependent-file-in-usr-share usr/share/optee-os-s32/export-ta_arm64/lib/lib*.a
+optee-os-s32-dev binary: arch-dependent-file-in-usr-share [usr/share/optee-os-s32/export-ta_arm64/lib/lib*.a]
diff --git a/debian/rules b/debian/rules
index b241c22..e01e760 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,15 +48,7 @@ clean:: pre-clean
 FLAVOURS := s32g2
 BUILD_FLAVOURS := $(addprefix build_,$(FLAVOURS))
 
-SRC_DIR := $(CURDIR)/debian/optee-os-s32-source/usr/src/optee-os-s32
-SRC_TAR := $(CURDIR)/debian/optee-os-s32-source.tar
-
-override_dh_auto_build: $(SRC_TAR) $(BUILD_FLAVOURS)
-
-$(SRC_TAR):
-	tar -cpf $(SRC_TAR) -C $(CURDIR) --exclude ./debian \
-		--exclude ./.git --exclude ./keys ./*
-
+override_dh_auto_build: $(BUILD_FLAVOURS)
 
 .PHONY: $(BUILD_FLAVOURS)
 $(BUILD_FLAVOURS):
@@ -82,7 +74,7 @@ $(BUILD_FLAVOURS):
 	# Use the NemOS dev key, not the one in OP-TEE
 	rm -rf out/arm-plat-s32/export-ta_arm64/keys
 
-override_dh_auto_install: $(SRC_DIR)
+override_dh_auto_install:
 	mkdir -p $(CURDIR)/debian/$(OPTEE_OS_PKG)/usr/lib/optee-os-s32
 	cp -r $(CURDIR)/out/arm-plat-s32/flavours/* \
 		$(CURDIR)/debian/$(OPTEE_OS_PKG)/usr/lib/optee-os-s32/
@@ -91,10 +83,6 @@ override_dh_auto_install: $(SRC_DIR)
 	cp -r $(CURDIR)/out/arm-plat-s32/export-ta_arm64 \
 		$(CURDIR)/debian/$(OPTEE_OS_DEV_PKG)/usr/share/optee-os-s32/
 
-$(SRC_DIR):
-	mkdir -p $(SRC_DIR)
-	tar -xpf $(SRC_TAR) -C $(SRC_DIR) --exclude debian
-
 override_dh_installchangelogs:
 	dh_installchangelogs
 	dh_installchangelogs -p$(OPTEE_OS_PKG) CHANGELOG.md
@@ -106,9 +94,7 @@ override_dh_clean:
 		$(CURDIR)/debian/optee-os-s32 \
 		$(CURDIR)/debian/optee-os-s32-hse \
 		$(CURDIR)/debian/optee-os-s32-dev \
-		$(CURDIR)/debian/optee-os-s32-hse-dev \
-		$(CURDIR)/debian/optee-os-s32-source \
-		$(SRC_TAR)
+		$(CURDIR)/debian/optee-os-s32-hse-dev
 
 ifeq ($(HSE_SUPPORT),y)
 override_dh_gencontrol: