From 7af60cc3e295f7b1bbb58324c6f8679748fd0347 Mon Sep 17 00:00:00 2001 From: Giovanni Giacobbi Date: Thu, 25 Mar 2021 14:59:51 +0000 Subject: [PATCH] libftdi1: Improve build binary reproducibility The library embeds the result of "git describe" inside the source code, making the binary result dependent of the particular commit being used in the build root when building inside a git working copy. As this is unnecessary information, remove this option and fallback to the default "unknown", which is also the value compiled by tools that do not clone but export the openwrt base tree. Signed-off-by: Giovanni Giacobbi --- libs/libftdi1/Makefile | 2 +- libs/libftdi1/patches/102-remove-snapshot-git.patch | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 libs/libftdi1/patches/102-remove-snapshot-git.patch diff --git a/libs/libftdi1/Makefile b/libs/libftdi1/Makefile index 4087d6b1c6..651f7462bd 100644 --- a/libs/libftdi1/Makefile +++ b/libs/libftdi1/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libftdi1 PKG_VERSION:=1.4 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.intra2net.com/en/developer/libftdi/download/ diff --git a/libs/libftdi1/patches/102-remove-snapshot-git.patch b/libs/libftdi1/patches/102-remove-snapshot-git.patch new file mode 100644 index 0000000000..8e1e683d9a --- /dev/null +++ b/libs/libftdi1/patches/102-remove-snapshot-git.patch @@ -0,0 +1,10 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -11,7 +11,6 @@ execute_process(COMMAND git describe + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if(${GIT_DESCRIBE_RESULT} STREQUAL 0) +- set(SNAPSHOT_VERSION ${GIT_DESCRIBE_OUTPUT}) + endif () + message(STATUS "Detected git snapshot version: ${SNAPSHOT_VERSION}") + -- 2.30.2