Skip to content

Commit b2685ce

Browse files
hnymanrobimarko
authored andcommitted
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: openwrt#22426 (cherry picked from commit 598c4b7) Link: openwrt#22631 Signed-off-by: Robert Marko <robimarko@gmail.com>
1 parent 396fe23 commit b2685ce

3 files changed

Lines changed: 15 additions & 4 deletions

File tree

package/system/apk/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include $(TOPDIR)/rules.mk
22

33
PKG_NAME:=apk
4-
PKG_RELEASE:=2
4+
PKG_RELEASE:=3
55

66
PKG_SOURCE_URL=https://gitlab.alpinelinux.org/alpine/apk-tools.git
77
PKG_SOURCE_PROTO:=git

package/system/apk/patches/0002-openwrt-wiki-help-link.patch

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
diff --git a/src/genhelp_apk.lua b/src/genhelp_apk.lua
2-
index a62e84d22ed5..a97264f6ab3c 100644
31
--- a/src/genhelp_apk.lua
42
+++ b/src/genhelp_apk.lua
5-
@@ -65,7 +65,7 @@ local function render_options(doc, out, options)
3+
@@ -65,7 +65,7 @@ local function render_options(doc, out,
64
end
75

86
local function render_footer(doc, out)

package/system/apk/patches/0100-add-add-force-reinstall-option.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,16 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
4646
}
4747

4848
r = apk_solver_commit(db, 0, world);
49+
--- a/doc/apk-add.8.scd
50+
+++ b/doc/apk-add.8.scd
51+
@@ -30,6 +30,10 @@ To later upgrade or downgrade back to a
52+
*apk add* supports the commit options described in *apk*(8), as well as the
53+
following options:
54+
55+
+*--force-reinstall*
56+
+ Allow reinstalling already-installed packages without a version
57+
+ change. Only the named packages are reinstalled, not dependencies.
58+
+
59+
*--initdb*
60+
Initialize a new package database.
61+

0 commit comments

Comments
 (0)