Browse Source

package/setserial: update to 2.17-57 for compatibility with newer toolchains

Debian has a newer setserial which compiles on newer toolchains, so
let's update to it.

Noteworthy is the change from a big diff to a tarball containing the
whole debian directory. The series file which contains all patches to
apply is named properly so no need to rename 00list anymore. The patches
file extension is now .patch instead of .dpatch.

This fixes the build with BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 external
toolchain (14.2.rel1).

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Quentin Schulz 10 months ago
parent
commit
871cdeab6a
2 changed files with 9 additions and 16 deletions
  1. 2 2
      package/setserial/setserial.hash
  2. 7 14
      package/setserial/setserial.mk

+ 2 - 2
package/setserial/setserial.hash

@@ -1,5 +1,5 @@
-# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/s/setserial/setserial_2.17-45.3.dsc
+# From https://snapshot.debian.org/file/98a1ce8758c5313a8b8a266d493605e578bcc4f6/setserial_2.17-57.dsc
 sha256  7e4487d320ac31558563424189435d396ddf77953bb23111a17a3d1487b5794a  setserial_2.17.orig.tar.gz
-sha256  33db87e8a86cf12b7c97efca9e056865e71358e8cfeb3931118b2647ce1eecc6  setserial_2.17-45.3.diff.gz
+sha256  e96ef61d3e5fc5a77d6e54c4c48a2caee31931732a18ee49e4c67d128ad181c9  setserial_2.17-57.debian.tar.xz
 # Locally computed
 sha256  1d7e810ed28daf370def626dfd4c502f2f77d2b678f1ac72e2ba675dd6f9af0d  debian/copyright

+ 7 - 14
package/setserial/setserial.mk

@@ -6,8 +6,8 @@
 
 SETSERIAL_VERSION = 2.17
 SETSERIAL_SOURCE = setserial_$(SETSERIAL_VERSION).orig.tar.gz
-SETSERIAL_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/s/setserial
-SETSERIAL_EXTRA_DOWNLOADS = setserial_2.17-45.3.diff.gz
+SETSERIAL_SITE = https://snapshot.debian.org/archive/debian/20250307T084701Z/pool/main/s/setserial
+SETSERIAL_EXTRA_DOWNLOADS = setserial_$(SETSERIAL_VERSION)-57.debian.tar.xz
 SETSERIAL_LICENSE = GPL-2.0
 SETSERIAL_LICENSE_FILES = debian/copyright
 # make all also builds setserial.cat which needs nroff
@@ -18,26 +18,19 @@ SETSERIAL_AUTORECONF = YES
 # Extract the Debian tarball inside the sources
 define SETSERIAL_DEBIAN_EXTRACT
 	$(call suitable-extractor,$(notdir $(SETSERIAL_EXTRA_DOWNLOADS))) \
-		$(SETSERIAL_DL_DIR)/$(notdir $(SETSERIAL_EXTRA_DOWNLOADS)) > $(@D)/setserial_2.17-45.3.diff
+		$(SETSERIAL_DL_DIR)/$(notdir $(SETSERIAL_EXTRA_DOWNLOADS)) | \
+		$(TAR) -C $(@D) $(TAR_OPTIONS) -
 endef
 
 SETSERIAL_POST_EXTRACT_HOOKS += SETSERIAL_DEBIAN_EXTRACT
 
 define SETSERIAL_APPLY_DEBIAN_PATCHES
-	# - Applying diff gotten from SETSERIAL_EXTRA_DOWNLOADS
 	# - Touching gorhack.h is needed for the Debian patch 18 to work
-	# - Rename 00list which contains the list of patches to "series" so
-	#   Buildroot knows in which order the patches need to be applied. This
-	#   is necessary because their file extension is dpatch, which isn't
-	#   supported by the APPLY_PATCHES script outside of the series
-	#   mechanism.
-	$(APPLY_PATCHES) $(@D) $(@D) setserial_2.17-45.3.diff
-
+	# - Apply patches in the order listed in debian/patches/series
 	if [ -d $(@D)/debian/patches ]; then \
 		touch $(@D)/gorhack.h; \
-		rm $(@D)/debian/patches/01_makefile.dpatch; \
-		mv $(@D)/debian/patches/00list $(@D)/debian/patches/series; \
-		sed -i '/01_makefile.dpatch/d' $(@D)/debian/patches/series; \
+		rm $(@D)/debian/patches/01_makefile.patch; \
+		sed -i '/01_makefile.patch/d' $(@D)/debian/patches/series; \
 		$(APPLY_PATCHES) $(@D) $(@D)/debian/patches series; \
 	fi
 endef