commit 9f1784523e5716e72e2ca0b823f6ac5d6f65265f
parent 7f4c4b112f3cf3c5e8dbb45d5ec75b0358a98af0
Author: aabacchus <ben@bvnf.space>
Date: Tue, 20 Jul 2021 18:40:22 +0100
kiss: 5.5.17 with patches
Diffstat:
7 files changed, 192 insertions(+), 0 deletions(-)
diff --git a/forks/kiss/build b/forks/kiss/build
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+
+for patch in *.patch; do
+ patch -p1 < "$patch"
+done
+
+mkdir -p \
+ "$1/usr/bin" \
+ "$1/usr/share/doc/kiss"
+
+cp -f kiss contrib/* "$1/usr/bin/"
+
+for doc in docs/site/*.txt; do case ${doc%%.txt} in
+ README|news|blog|screenshots)
+ # Skip.
+ ;;
+
+ *)
+ cp -f "$doc" "$1/usr/share/doc/kiss/${doc##*/}"
+ ;;
+esac done
+
+cp -r wiki "$1/usr/share/doc/kiss/wiki"
diff --git a/forks/kiss/checksums b/forks/kiss/checksums
@@ -0,0 +1,5 @@
+0acbdfc65a9af46ce91f778142a3f3ba9e3498f8785d917da1280a5c7929c264
+57b9045da1f4c78d120bca151670c06efdd3b27ebcf84b5aa881455dee0d1bdc
+62e1a1a1d427aa5c1ac55d0a5451440fdbc03f1a995eb7cd3bf45a2d858e0d07
+bbe3999ba8056b2e6ead2876ebeb2a417025fa0d78b8c9e0e2e784a864e2967d
+f3a41e31d84faf37f86fab77231b0ba0a80a9143bdf84ae9a1297f4448a66da0
diff --git a/forks/kiss/depends b/forks/kiss/depends
@@ -0,0 +1 @@
+git
diff --git a/forks/kiss/patches/0001-kiss-allow-updating-packages-without-updating-repos.patch b/forks/kiss/patches/0001-kiss-allow-updating-packages-without-updating-repos.patch
@@ -0,0 +1,51 @@
+From ae02b68c9d9e84aee142a4c1a9fc9e290fa82561 Mon Sep 17 00:00:00 2001
+From: aabacchus <ben@bvnf.space>
+Date: Mon, 19 Jul 2021 20:41:14 +0100
+Subject: [PATCH 1/2] kiss: allow updating packages without updating repos
+
+---
+ kiss | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/kiss b/kiss
+index 0fcd43f..feb706c 100755
+--- a/kiss
++++ b/kiss
+@@ -1571,6 +1571,11 @@ pkg_update() {
+ }
+ done
+
++ pkg_upgrades
++
++}
++
++pkg_upgrades() {
+ log "Checking for new package versions"
+
+ set +f --
+@@ -1762,10 +1767,11 @@ args() {
+ r|remove) for pkg in $redro; do pkg_remove "$pkg"; done ;;
+ s|search) for pkg do pkg_find "$pkg" all; done ;;
+ u|update) pkg_update ;;
++ up|upgrade) pkg_upgrades ;;
+ v|version) printf '5.5.17\n' ;;
+
+ '')
+- log 'kiss [a|b|c|d|i|l|r|s|u|v] [pkg]...'
++ log 'kiss [a|b|c|d|i|l|r|s|u|up|v] [pkg]...'
+ log 'alternatives List and swap to alternatives'
+ log 'build Build a package'
+ log 'checksum Generate checksums'
+@@ -1774,7 +1780,8 @@ args() {
+ log 'list List installed packages'
+ log 'remove Remove a package'
+ log 'search Search for a package'
+- log 'update Update the system'
++ log 'update Update the system repos and packages'
++ log 'upgrade Update the system packages'
+ log 'version Package manager version'
+
+ printf '\nRun "kiss help-ext" to see all actions\n'
+--
+2.32.0
+
diff --git a/forks/kiss/patches/0002-kiss-continue-build.patch b/forks/kiss/patches/0002-kiss-continue-build.patch
@@ -0,0 +1,106 @@
+From 205b6c86570ee7c3c3e930c087094786b4ace239 Mon Sep 17 00:00:00 2001
+From: aabacchus <ben@bvnf.space>
+Date: Mon, 19 Jul 2021 21:16:40 +0100
+Subject: [PATCH 2/2] kiss: continue build
+
+---
+ kiss | 52 +++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 33 insertions(+), 19 deletions(-)
+
+diff --git a/kiss b/kiss
+index feb706c..6953cc0 100755
+--- a/kiss
++++ b/kiss
+@@ -895,14 +895,7 @@ pkg_build_all() {
+ ! [ -f "$repo_dir/sources" ] || pkg_extract "$pkg"
+
+ pkg_build "$pkg"
+- pkg_manifest "$pkg" "$pkg_dir"
+- pkg_strip "$pkg"
+-
+- cd "$pkg_dir/$pkg/$pkg_db/$pkg"
+-
+- pkg_fix_deps "$pkg"
+- pkg_etcsums
+- pkg_tar "$pkg"
++ pkg_finish_b "$pkg"
+
+ if ok "$pkg_update" || ! contains "$explicit" "$pkg"; then
+ log "$pkg" "Needed as a dependency or has an update, installing"
+@@ -920,6 +913,31 @@ pkg_build_all() {
+ esac
+ }
+
++pkg_finish_b() {
++ # Finish building a package and create a tarball.
++ pkg="$1"
++ pkg_find "$1"
++
++ # Copy the repository files to the package directory.
++ cp -LRf "$repo_dir" "$pkg_dir/$1/$pkg_db/"
++
++ log "$1" "Successfully built package"
++
++ # arg1: post-build
++ # arg2: package name
++ # arg3: path to DESTDIR
++ run_hook post-build "$1" "$pkg_dir/$1"
++
++ pkg_manifest "$pkg" "$pkg_dir"
++ pkg_strip "$pkg"
++
++ cd "$pkg_dir/$pkg/$pkg_db/$pkg"
++
++ pkg_fix_deps "$pkg"
++ pkg_etcsums
++ pkg_tar "$pkg"
++}
++
+ pkg_build() {
+ # Install built packages to a directory under the package name to
+ # avoid collisions with other packages.
+@@ -974,16 +992,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"
+-
+- # Copy the repository files to the package directory.
+- cp -LRf "$repo_dir" "$pkg_dir/$1/$pkg_db/"
+-
+- log "$1" "Successfully built package"
+-
+- # arg1: post-build
+- # arg2: package name
+- # arg3: path to DESTDIR
+- run_hook post-build "$1" "$pkg_dir/$1"
+ }
+
+ pkg_checksums() {
+@@ -1762,6 +1770,11 @@ args() {
+
+ i|install) for pkg do pkg_install "$pkg"; done ;;
+ b|build) pkg_build_all "${@:?No packages installed}" ;;
++ 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 ;;
+@@ -1771,10 +1784,11 @@ args() {
+ v|version) printf '5.5.15\n' ;;
+
+ '')
+- log 'kiss [a|b|c|d|i|l|r|s|u|up|v] [pkg]...'
++ log 'kiss [a|b|c|co|d|i|l|r|s|u|up|v] [pkg]...'
+ log 'alternatives List and swap to alternatives'
+ log 'build Build a package'
+ log 'checksum Generate checksums'
++ log 'continue Continue a package build in the current dir'
+ log 'download Pre-download all sources'
+ log 'install Install a package'
+ log 'list List installed packages'
+--
+2.32.0
+
diff --git a/forks/kiss/sources b/forks/kiss/sources
@@ -0,0 +1,5 @@
+https://github.com/kisslinux/kiss/archive/5.5.17.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-allow-updating-packages-without-updating-repos.patch
+patches/0002-kiss-continue-build.patch
diff --git a/forks/kiss/version b/forks/kiss/version
@@ -0,0 +1 @@
+5.5.17 1
