From: Christian Marangi Date: Sun, 10 Nov 2024 01:09:43 +0000 (+0100) Subject: apk: Bump to version 2024-11-08 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b18ed663a52fa9f870c134bb2c032768894d5987;p=openwrt%2Fstaging%2Fblocktrron.git apk: Bump to version 2024-11-08 Bump APK to version 2024-11-08, multiple fixup and pending arch patch for ARM Big Endian merged upstream. Link: https://github.com/openwrt/openwrt/pull/16759 Link: https://github.com/openwrt/openwrt/pull/16759 Signed-off-by: Christian Marangi --- diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile index 3e2066e269..cd1b56caf6 100644 --- a/package/system/apk/Makefile +++ b/package/system/apk/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_URL=https://gitlab.alpinelinux.org/alpine/apk-tools.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2024-10-28 -PKG_SOURCE_VERSION:=a1ad8568a1378d71c1f6354c428ebb1baa46fa05 -PKG_MIRROR_HASH:=68747e1253776dc00286c01e408f4c4e1eb61acf56009b7ecb3de4d49b34e567 +PKG_SOURCE_DATE:=2024-11-08 +PKG_SOURCE_VERSION:=d9c24813d983df9524fa7a2b78fc3132c159a20f +PKG_MIRROR_HASH:=3d1a79c08ef8c8b9404f9287d9acda6468b8b1c2a99dd384287f522ed3b1a047 PKG_VERSION=3.0.0_pre$(subst -,,$(PKG_SOURCE_DATE)) diff --git a/package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch b/package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch index dbc4945d9e..8500512212 100644 --- a/package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch +++ b/package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch @@ -10,7 +10,7 @@ Signed-off-by: Paul Spooren --- a/src/database.c +++ b/src/database.c -@@ -1626,7 +1626,7 @@ const char *apk_db_layer_name(int layer) +@@ -1627,7 +1627,7 @@ const char *apk_db_layer_name(int layer) { switch (layer) { case APK_DB_LAYER_ROOT: return "lib/apk/db"; diff --git a/package/system/apk/patches/0010-apk_defines-add-default-arch-for-ARM-Big-Endian.patch b/package/system/apk/patches/0010-apk_defines-add-default-arch-for-ARM-Big-Endian.patch deleted file mode 100644 index 1d031e7783..0000000000 --- a/package/system/apk/patches/0010-apk_defines-add-default-arch-for-ARM-Big-Endian.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ffcda7769279e75993110766555eea6d3c6baae7 Mon Sep 17 00:00:00 2001 -From: Christian Marangi -Date: Fri, 25 Oct 2024 01:09:41 +0200 -Subject: [PATCH] apk_defines: add default arch for ARM Big-Endian - -Add default arch for ARM Big-Endiang named armeb. One example of such -target are devices based on the Intel XScale IXP4xx SoC. - -Signed-off-by: Christian Marangi ---- - src/apk_defines.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/apk_defines.h b/src/apk_defines.h -index c92dacd..06351df 100644 ---- a/src/apk_defines.h -+++ b/src/apk_defines.h -@@ -126,6 +126,8 @@ static inline int IS_ERR(const void *ptr) { return (unsigned long)ptr >= (unsign - #define APK_DEFAULT_BASE_ARCH "armhf" - #elif defined(__arm__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - #define APK_DEFAULT_BASE_ARCH "armel" -+#elif defined(__arm__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ -+#define APK_DEFAULT_BASE_ARCH "armeb" - #elif defined(__aarch64__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - #define APK_DEFAULT_BASE_ARCH "aarch64" - #elif defined(__s390x__) --- -2.45.2 -