From 51a7d7850d3bebdc39fcfcabc13975cdda588839 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Tue, 3 Oct 2023 20:37:33 +0200 Subject: [PATCH] mmc-utils: update to latest upstream revision This also requires updating our patch for fortify-ing. We now also pass the version as define during compilation. Signed-off-by: Michael Heimpold --- utils/mmc-utils/Makefile | 9 +++++---- .../0000-properly-set-fortify-source-in-makefile.patch | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/utils/mmc-utils/Makefile b/utils/mmc-utils/Makefile index eeb35777de..4243d08955 100644 --- a/utils/mmc-utils/Makefile +++ b/utils/mmc-utils/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git -PKG_SOURCE_DATE:=2023-01-16 -PKG_SOURCE_VERSION:=d4c2910981ff99b983734426dfa99632fb81ac6b -PKG_MIRROR_HASH:=b124409d3482db1e63822a7860b7e4a0dfe6c3545da967283979fe805a287893 +PKG_SOURCE_DATE:=2023-09-26 +PKG_SOURCE_VERSION:=80271e9a6fd0db9cb3a85d024664da886e94315c +PKG_MIRROR_HASH:=317cacbacfbc8a9d4afb978e4c5a601cf489a514604534168971dd20311d9d12 PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:= @@ -40,7 +40,8 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" \ + $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 \ + -UVERSION -DVERSION=\\\"$(shell echo $(PKG_SOURCE_VERSION) | cut -c -6)\\\"" \ mmc endef diff --git a/utils/mmc-utils/patches/0000-properly-set-fortify-source-in-makefile.patch b/utils/mmc-utils/patches/0000-properly-set-fortify-source-in-makefile.patch index 1a2081335a..de976ca12f 100644 --- a/utils/mmc-utils/patches/0000-properly-set-fortify-source-in-makefile.patch +++ b/utils/mmc-utils/patches/0000-properly-set-fortify-source-in-makefile.patch @@ -1,9 +1,10 @@ --- a/Makefile +++ b/Makefile -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ CC ?= gcc --AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -+AM_CFLAGS = -D_FILE_OFFSET_BITS=64 + GIT_VERSION := "$(shell git describe --abbrev=6 --always --tags)" +-AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 \ ++AM_CFLAGS = -D_FILE_OFFSET_BITS=64 \ + -DVERSION=\"$(GIT_VERSION)\" CFLAGS ?= -g -O2 objects = \ - mmc.o \ -- 2.30.2