From: Christian Marangi Date: Mon, 28 Oct 2024 23:03:39 +0000 (+0100) Subject: apk: bump to latest HEAD 2024-10-28 X-Git-Tag: v24.10.0-rc1~223 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f72879dd60b908fcca2ab016e30fe22c347a279d;p=openwrt%2Fopenwrt.git apk: bump to latest HEAD 2024-10-28 Bump APK to latest HEAD 2024-10-28. - Minor fixed to index inherit - Fixup to adb_w_copy Signed-off-by: Christian Marangi --- diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile index b8fdc05104..3fc3aedc49 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-08-06 -PKG_SOURCE_VERSION:=54caa31be633efc5f655700b77af290124f71689 -PKG_MIRROR_HASH:=f3be762deac4f1469a4a2839691175e78019cb44295089befafa279a3390067c +PKG_SOURCE_DATE:=2024-10-28 +PKG_SOURCE_VERSION:=a1ad8568a1378d71c1f6354c428ebb1baa46fa05 +PKG_MIRROR_HASH:=68747e1253776dc00286c01e408f4c4e1eb61acf56009b7ecb3de4d49b34e567 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 092ab1d726..dbc4945d9e 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 -@@ -1643,7 +1643,7 @@ const char *apk_db_layer_name(int layer) +@@ -1626,7 +1626,7 @@ const char *apk_db_layer_name(int layer) { switch (layer) { case APK_DB_LAYER_ROOT: return "lib/apk/db";