summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-08-03 05:31:23 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-08-03 05:31:23 +0000
commit5d1a7a1b128ebc9d2a4b5b0dc04c0c204db7f7e8 (patch)
treee3542fbe91e3b3f928f46e8a715025a78cfc3096
parentMerging upstream version 2.4+dfsg. (diff)
downloadarm-trusted-firmware-5d1a7a1b128ebc9d2a4b5b0dc04c0c204db7f7e8.tar.xz
arm-trusted-firmware-5d1a7a1b128ebc9d2a4b5b0dc04c0c204db7f7e8.zip
Merging debian version 2.4+dfsg-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/arm-trusted-firmware.docs3
-rw-r--r--debian/arm-trusted-firmware.lintian-overrides3
-rw-r--r--debian/changelog20
-rw-r--r--debian/control5
-rwxr-xr-xdebian/rules17
-rw-r--r--debian/targets2
-rw-r--r--debian/watch6
7 files changed, 40 insertions, 16 deletions
diff --git a/debian/arm-trusted-firmware.docs b/debian/arm-trusted-firmware.docs
index 9fa4649..7239029 100644
--- a/debian/arm-trusted-firmware.docs
+++ b/debian/arm-trusted-firmware.docs
@@ -1,4 +1 @@
-# docs/chang-log.rst is copied to docs/changelog in debian/rules
-# override_dh_installdocs target.
-docs/changelog
readme.rst
diff --git a/debian/arm-trusted-firmware.lintian-overrides b/debian/arm-trusted-firmware.lintian-overrides
index 31ea2d7..1eb070a 100644
--- a/debian/arm-trusted-firmware.lintian-overrides
+++ b/debian/arm-trusted-firmware.lintian-overrides
@@ -1,3 +1,2 @@
# This is boot firmware that needs to be statically linked.
-arm-trusted-firmware binary: statically-linked-binary usr/lib/arm-trusted-firmware/rk3328/bl31.elf
-arm-trusted-firmware binary: statically-linked-binary usr/lib/arm-trusted-firmware/rk3399/bl31.elf
+arm-trusted-firmware binary: statically-linked-binary usr/lib/arm-trusted-firmware/*/bl31.elf
diff --git a/debian/changelog b/debian/changelog
index 121ea24..7b75077 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+arm-trusted-firmware (2.4+dfsg-1) experimental; urgency=medium
+
+ [ Vagrant Cascadian ]
+ * debian/targets: Enable g12a target (Closes: #973255).
+ * Enable Build-Profile pkg.arm-trusted-firmware.notools to disable
+ building of arm-trusted-firmware-tools.
+ * debian/targets: Enable sun50i_h6 target (Closes: #979179).
+
+ [ Nicolas Boulenguez ]
+ * Update debian/watch (Closes: #977803).
+ * Delegate changelog renaming to debhelper (Closes: #977803).
+ * Let dh_auto_build call sub-Makes (Closes: #977803).
+
+ [ Vagrant Cascadian ]
+ * arm-trusted-firmware: Update lintian overrides to use a glob. Thanks
+ to Nicolas Boulenguez. (Closes: #977803)
+ * debian/control: Update Standards-Version to 4.5.1.
+
+ -- Vagrant Cascadian <vagrant@debian.org> Mon, 04 Jan 2021 13:40:33 -0800
+
arm-trusted-firmware (2.3+dfsg-3~progress5+u1) engywuck-backports; urgency=medium
* Initial upload to engywuck-backports.
diff --git a/debian/control b/debian/control
index 0ea114b..a0d8521 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,11 @@ Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
XSBC-Original-Maintainer: Vagrant Cascadian <vagrant@debian.org>
Bugs: mailto:maintainers@lists.progress-linux.org
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
Build-Depends: debhelper-compat (= 13),
gcc-arm-none-eabi [arm64],
binutils-arm-none-eabi [arm64],
- libssl-dev,
+ libssl-dev <!pkg.arm-trusted-firmware.notools>,
Rules-Requires-Root: no
Homepage: https://www.trustedfirmware.org/
Vcs-Browser: https://git.progress-linux.org/packages/engywuck-backports/arm-trusted-firmware
@@ -33,6 +33,7 @@ Description: "secure world" software for ARM SoCs - firmware
Package: arm-trusted-firmware-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Build-Profiles: <!pkg.arm-trusted-firmware.notools>
Description: "secure world" software for ARM SoCs - tools
The "secure world" on arm64 machines is a special level of CPU
privilege that is hidden from the normal OS, and has complete
diff --git a/debian/rules b/debian/rules
index 1844266..a8e1f93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,18 +13,19 @@ endif
dh $@
override_dh_auto_build:
- make DEBUG=1 V=$(VERBOSE) HOSTCCFLAGS="$(CFLAGS) $(CPPFLAGS)" -C tools/fiptool
- make DEBUG=1 V=$(VERBOSE) HOSTCCFLAGS="$(CFLAGS) $(CPPFLAGS) -std=c99 -DUSE_TBBR_DEFS=1" -C tools/cert_create
+# Disable building of arm-trusted-firmware-tools
+ifeq ($(filter pkg.arm-trusted-firmware.notools,$(DEB_BUILD_PROFILES)),)
+ dh_auto_build --sourcedir=tools/fiptool -- DEBUG=1 V=$(VERBOSE) HOSTCCFLAGS="$(CFLAGS) $(CPPFLAGS)"
+ dh_auto_build --sourcedir=tools/cert_create -- DEBUG=1 V=$(VERBOSE) HOSTCCFLAGS="$(CFLAGS) $(CPPFLAGS) -std=c99 -DUSE_TBBR_DEFS=1"
+endif
# Only build firmware on arm64.
ifeq ($(DEB_HOST_ARCH),arm64)
# Always set CROSS_COMPILE, which also works for native builds.
grep -v '^#' debian/targets | while read plat targets ; do \
- CROSS_COMPILE=aarch64-linux-gnu- CFLAGS= LDFLAGS= make V=$(VERBOSE) DEBUG=1 PLAT=$$plat bl31 ; \
+ CROSS_COMPILE=aarch64-linux-gnu- CFLAGS= LDFLAGS= dh_auto_build -- V=$(VERBOSE) DEBUG=1 PLAT=$$plat bl31 ; \
done
endif
-override_dh_installdocs:
- # Rename changelog to comply with debian policy.
- cp docs/change-log.rst docs/changelog
- dh_installdocs
- rm docs/changelog
+override_dh_installchangelogs:
+ dh_installchangelogs -parm-trusted-firmware docs/change-log.rst
+ dh_installchangelogs -parm-trusted-firmware-tools
diff --git a/debian/targets b/debian/targets
index 844bdc2..a6f7244 100644
--- a/debian/targets
+++ b/debian/targets
@@ -1,4 +1,6 @@
+g12a bl31.bin
gxbb bl31.bin
sun50i_a64 bl31.bin
+sun50i_h6 bl31.bin
rk3328 bl31/bl31.elf
rk3399 bl31/bl31.elf
diff --git a/debian/watch b/debian/watch
index 2889233..7296767 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,7 @@
version=4
-opts=repack,compression=xz,repacksuffix=+dfsg,filenamemangle=s/.*trusted-firmware-a-(.*)/@PACKAGE@-$1/,uversionmangle=s/-rc/~rc/g,dversionmangle=s/\+dfsg//g \
+
+opts=dversionmangle=auto,\
+ filenamemangle=s/.*trusted-firmware-a-(.*)/@PACKAGE@-$1/,\
+ repacksuffix=+dfsg,\
+ uversionmangle=s/-rc/~rc/ \
https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/ .*/trusted-firmware-a-@ANY_VERSION@.tar.gz