diff options
| author | Hannu Nyman | 2026-03-27 14:47:39 +0000 |
|---|---|---|
| committer | Robert Marko | 2026-03-27 19:50:50 +0000 |
| commit | b2685cef6a33baf933b0936c586cbf04c3d60ca4 (patch) | |
| tree | 8dfad5d0a8f5c8435c1e8da110f86d0dd28ed702 | |
| parent | 396fe239a8f8f7bfafdc18eda3bf8a3582d53165 (diff) | |
| download | openwrt-b2685cef6a33baf933b0936c586cbf04c3d60ca4.tar.gz | |
apk: add help text for 'apk add --force-reinstall'
Add a help text for the new --force-reinstall option, so that users
will actually find the new option.
(Also refresh patches)
Improves: 91cff1a "apk: add --force-reinstall option"
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Link: https://github.com/openwrt/openwrt/pull/22426
(cherry picked from commit 598c4b7fde1240d8d64386e4162a41270f865c30)
Link: https://github.com/openwrt/openwrt/pull/22631
Signed-off-by: Robert Marko <robimarko@gmail.com>
| -rw-r--r-- | package/system/apk/Makefile | 2 | ||||
| -rw-r--r-- | package/system/apk/patches/0002-openwrt-wiki-help-link.patch | 4 | ||||
| -rw-r--r-- | package/system/apk/patches/0100-add-add-force-reinstall-option.patch | 13 |
3 files changed, 15 insertions, 4 deletions
diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile index 2cea412dd5..df65bc082e 100644 --- a/package/system/apk/Makefile +++ b/package/system/apk/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apk -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_URL=https://gitlab.alpinelinux.org/alpine/apk-tools.git PKG_SOURCE_PROTO:=git diff --git a/package/system/apk/patches/0002-openwrt-wiki-help-link.patch b/package/system/apk/patches/0002-openwrt-wiki-help-link.patch index 587d3c79ff..dd6466709e 100644 --- a/package/system/apk/patches/0002-openwrt-wiki-help-link.patch +++ b/package/system/apk/patches/0002-openwrt-wiki-help-link.patch @@ -1,8 +1,6 @@ -diff --git a/src/genhelp_apk.lua b/src/genhelp_apk.lua -index a62e84d22ed5..a97264f6ab3c 100644 --- a/src/genhelp_apk.lua +++ b/src/genhelp_apk.lua -@@ -65,7 +65,7 @@ local function render_options(doc, out, options) +@@ -65,7 +65,7 @@ local function render_options(doc, out, end local function render_footer(doc, out) diff --git a/package/system/apk/patches/0100-add-add-force-reinstall-option.patch b/package/system/apk/patches/0100-add-add-force-reinstall-option.patch index 9d8c4c6c67..829184bea5 100644 --- a/package/system/apk/patches/0100-add-add-force-reinstall-option.patch +++ b/package/system/apk/patches/0100-add-add-force-reinstall-option.patch @@ -46,3 +46,16 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } r = apk_solver_commit(db, 0, world); +--- a/doc/apk-add.8.scd ++++ b/doc/apk-add.8.scd +@@ -30,6 +30,10 @@ To later upgrade or downgrade back to a + *apk add* supports the commit options described in *apk*(8), as well as the + following options: + ++*--force-reinstall* ++ Allow reinstalling already-installed packages without a version ++ change. Only the named packages are reinstalled, not dependencies. ++ + *--initdb* + Initialize a new package database. + |