commit 5e41b9add0f23cbf9be663205fced835aafb0296
parent 2342c6cd551637310a2eb0371e8397eca6de4148
Author: aabacchus <ben@bvnf.space>
Date: Sun, 1 Aug 2021 21:27:14 +0100
kiss: 5.5.25 with patch
Diffstat:
5 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/forks/kiss/build b/forks/kiss/build
@@ -1,8 +1,6 @@
#!/bin/sh -e
-for patch in *.patch; do
- patch -p1 < "$patch"
-done
+patch -p1 < 0001-kiss-continue-build.patch
mkdir -p \
"$1/usr/bin" \
@@ -10,7 +8,7 @@ mkdir -p \
cp -f kiss contrib/* "$1/usr/bin/"
-for doc in docs/site/*.txt; do case ${doc%%.txt} in
+for doc in docs/site/*.txt doc/*.txt; do case ${doc%%.txt} in
README|news|blog|screenshots)
# Skip.
;;
diff --git a/forks/kiss/checksums b/forks/kiss/checksums
@@ -1,4 +1,4 @@
-86d875aa8484f4d46688d79166bf3a3e46ecd6ce6f71d468401de81e9b6e2a9d
+a00a0fc300f1034fab407c52864fd4f329d3198a3113f90d321beee31d5432e6
57b9045da1f4c78d120bca151670c06efdd3b27ebcf84b5aa881455dee0d1bdc
62e1a1a1d427aa5c1ac55d0a5451440fdbc03f1a995eb7cd3bf45a2d858e0d07
-ed5e44b2bf543b8d0624bf732e2a9d66c61591f62fdb32a20ca8209023f672ba
+27b608d25fb8b19d4c657b0889a093b9ca1963be398ec57aec791e8bb1ab9edb
diff --git a/forks/kiss/patches/0001-kiss-continue-build.patch b/forks/kiss/patches/0001-kiss-continue-build.patch
@@ -1,4 +1,4 @@
-From 77ead6c0ccfce0ea07024705ddfd9993c6fbca98 Mon Sep 17 00:00:00 2001
+From cc55c04053945bc99309af85b8d81097f1fea927 Mon Sep 17 00:00:00 2001
From: aabacchus <ben@bvnf.space>
Date: Mon, 19 Jul 2021 21:16:40 +0100
Subject: [PATCH] kiss: continue build
@@ -8,10 +8,10 @@ Subject: [PATCH] kiss: continue build
1 file changed, 33 insertions(+), 19 deletions(-)
diff --git a/kiss b/kiss
-index 1e8c56a..5182476 100755
+index 9274ff6..d71de40 100755
--- a/kiss
+++ b/kiss
-@@ -917,14 +917,7 @@ pkg_build_all() {
+@@ -936,14 +936,7 @@ pkg_build_all() {
! [ -f "$repo_dir/sources" ] || pkg_extract "$pkg"
pkg_build "$pkg"
@@ -27,7 +27,7 @@ index 1e8c56a..5182476 100755
if ok "$pkg_update" || ! contains "$explicit" "$pkg"; then
log "$pkg" "Needed as a dependency or has an update, installing"
-@@ -942,6 +935,31 @@ pkg_build_all() {
+@@ -961,6 +954,31 @@ pkg_build_all() {
esac
}
@@ -59,7 +59,7 @@ index 1e8c56a..5182476 100755
pkg_build() {
# Install built packages to a directory under the package name to
# avoid collisions with other packages.
-@@ -996,16 +1014,6 @@ pkg_build() {
+@@ -1015,16 +1033,6 @@ pkg_build() {
# Delete the log file if the build succeeded to prevent the directory
# from filling very quickly with useless logs.
equ "$KISS_KEEPLOG" 1 || rm -f "$log_dir/$1-$time-$KISS_PID"
@@ -75,25 +75,25 @@ index 1e8c56a..5182476 100755
- run_hook post-build "$1" "$pkg_dir/$1"
}
- pkg_checksums() {
-@@ -1788,6 +1796,11 @@ args() {
-
- i|install) for pkg do pkg_install "$pkg"; done ;;
- b|build) pkg_build_all "${@:?No packages installed}" ;;
+ pkg_checksum() {
+@@ -1842,6 +1850,11 @@ args() {
+ a|alternatives) pkg_alternatives "$@" ;;
+ b|build) pkg_build_all "${@:?No packages installed}" ;;
+ c|checksum) for pkg do pkg_checksum "$pkg"; done ;;
+ co|continue)
+ export pkg_dir=${PWD%/*}
+ [ "$1" ] || set -- "${PWD##*/}"
+ pkg_finish_b "$1"
+ ;;
- d|download) for pkg do pkg_source "$pkg"; done ;;
- l|list) pkg_list_version "$@" ;;
- r|remove) for pkg in $redro; do pkg_remove "$pkg"; done ;;
-@@ -1797,10 +1810,11 @@ args() {
- v|version) printf '5.5.21\n' ;;
+ d|download) for pkg do pkg_source "$pkg"; done ;;
+ H|help-ext) pkg_help_ext "$@" ;;
+ i|install) for pkg do pkg_install "$pkg"; done ;;
+@@ -1853,10 +1866,11 @@ args() {
+ v|version) printf '5.5.25\n' ;;
'')
-- log 'kiss [a|b|c|d|i|l|r|s|u|v] [pkg]...'
-+ log 'kiss [a|b|c|co|d|i|l|r|s|u|v] [pkg]...'
+- log 'kiss [a|b|c|d|i|l|r|s|u|U|v] [pkg]...'
++ log 'kiss [a|b|c|co|d|i|l|r|s|u|U|v] [pkg]...'
log 'alternatives List and swap alternatives'
log 'build Build packages'
log 'checksum Generate checksums'
diff --git a/forks/kiss/sources b/forks/kiss/sources
@@ -1,4 +1,4 @@
-https://github.com/kisslinux/kiss/archive/5.5.21.tar.gz
+https://github.com/kisslinux/kiss/archive/5.5.25.tar.gz
https://github.com/kisslinux/website/archive/e5f0396efbb86b050fbee881483258d0d20a2d4f.tar.gz docs
https://github.com/kisslinux/wiki/archive/89d4946d128dff35df87d3210fe10a591559296a.tar.gz wiki
patches/0001-kiss-continue-build.patch
diff --git a/forks/kiss/version b/forks/kiss/version
@@ -1 +1 @@
-5.5.21 1
+5.5.25 1
