chiark
/
gitweb
/
~mdw
/
termux-packages
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9ec0509
)
Add TERMUX_SUBPKG_REPLACES to make it possible to for subpackages to replace packages.
author
Henrik Grimler
<Henrik@Grimler.se>
Tue, 1 Aug 2017 16:49:46 +0000
(18:49 +0200)
committer
Fredrik Fornwall
<fredrik@fornwall.net>
Thu, 3 Aug 2017 21:59:53 +0000
(23:59 +0200)
build-package.sh
patch
|
blob
|
blame
|
history
diff --git
a/build-package.sh
b/build-package.sh
index 10fc80bd3a7a9b9c7b059c27092dc873ccb45c2c..3f779d8533a505df8d16ad22daeb1aa2dd33af29 100755
(executable)
--- a/
build-package.sh
+++ b/
build-package.sh
@@
-1043,6
+1043,7
@@
termux_step_massage() {
local SUB_PKG_DIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages/$SUB_PKG_NAME
local TERMUX_SUBPKG_DEPENDS=""
local TERMUX_SUBPKG_CONFLICTS=""
local SUB_PKG_DIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages/$SUB_PKG_NAME
local TERMUX_SUBPKG_DEPENDS=""
local TERMUX_SUBPKG_CONFLICTS=""
+ local TERMUX_SUBPKG_REPLACES=""
local TERMUX_SUBPKG_CONFFILES=""
local SUB_PKG_MASSAGE_DIR=$SUB_PKG_DIR/massage/$TERMUX_PREFIX
local SUB_PKG_PACKAGE_DIR=$SUB_PKG_DIR/package
local TERMUX_SUBPKG_CONFFILES=""
local SUB_PKG_MASSAGE_DIR=$SUB_PKG_DIR/massage/$TERMUX_PREFIX
local SUB_PKG_PACKAGE_DIR=$SUB_PKG_DIR/package
@@
-1083,6
+1084,7
@@
termux_step_massage() {
HERE
test ! -z "$TERMUX_SUBPKG_DEPENDS" && echo "Depends: $TERMUX_SUBPKG_DEPENDS" >> control
test ! -z "$TERMUX_SUBPKG_CONFLICTS" && echo "Conflicts: $TERMUX_SUBPKG_CONFLICTS" >> control
HERE
test ! -z "$TERMUX_SUBPKG_DEPENDS" && echo "Depends: $TERMUX_SUBPKG_DEPENDS" >> control
test ! -z "$TERMUX_SUBPKG_CONFLICTS" && echo "Conflicts: $TERMUX_SUBPKG_CONFLICTS" >> control
+ test ! -z "$TERMUX_SUBPKG_REPLACES" && echo "Replaces: $TERMUX_SUBPKG_REPLACES" >> control
tar -cJf "$SUB_PKG_PACKAGE_DIR/control.tar.xz" .
for f in $TERMUX_SUBPKG_CONFFILES; do echo "$TERMUX_PREFIX/$f" >> conffiles; done
tar -cJf "$SUB_PKG_PACKAGE_DIR/control.tar.xz" .
for f in $TERMUX_SUBPKG_CONFFILES; do echo "$TERMUX_PREFIX/$f" >> conffiles; done