kiss-utils: bump to 1.7.0

6 files changed, 41 insertions, 33 deletions

diff --git a/core/kiss-utils/build b/core/kiss-utils/build
index 705ffc2d..8f1e86b7 100755
--- a/core/kiss-utils/build
+++ b/core/kiss-utils/build
@@ -1,5 +1,5 @@
 #!/bin/sh -e
 
-patch -p1 < carbs-chbuild.patch
+mv kiss-chbuild contrib
 
 install -t "$1/usr/bin" -D contrib/*
diff --git a/core/kiss-utils/checksums b/core/kiss-utils/checksums
index cee0b315..6a7f7291 100644
--- a/core/kiss-utils/checksums
+++ b/core/kiss-utils/checksums
@@ -1,2 +1,2 @@
-9721ef3af63368500483d2762a96df4ba0e80304cf90680e20676f08a8db081c  1.5.6.tar.gz
-18ca494b678891a29cff68328a15d2cc60881945e6bf373bc3bfde274741dec1  carbs-chbuild.patch
+e51ff89ab0801e0d209f7b1df2e5ec1178d34d9234005fb3fbb049b1e510d0f0  1.7.0.tar.gz
+62912794b89fa305a1aca18e82b200300ae5b55ed67feb86466198abbb41789f  kiss-chbuild
diff --git a/core/kiss-utils/files/kiss-chbuild b/core/kiss-utils/files/kiss-chbuild
new file mode 100755
index 00000000..9df18ccb
--- /dev/null
+++ b/core/kiss-utils/files/kiss-chbuild
@@ -0,0 +1,35 @@
+#!/bin/sh -e
+#
+# Create/destroy temporary chroots.
+
+log() {
+    printf '\033[31;1m->\033[m %s.\n' "$@"
+}
+
+clean() {
+    log "Destroying chroot"
+    su -c "rm -rf chroot-$pid" || clean
+}
+
+pid=$$
+
+cd "${cac_dir:=$KISS_ROOT${XDG_CACHE_HOME:-$HOME/.cache}/kiss}"
+
+[ -f carbs-rootfs.tar.xz ] || {
+    log "Downloading chroot tarball"
+    wget https://dl.carbslinux.org/releases/carbs-rootfs.tar.xz
+}
+
+[ -d carbs-chroot ] || {
+    log "Extracting chroot"
+    mkdir -p carbs-chroot
+    tar xvf carbs-rootfs.tar.xz -C carbs-chroot
+}
+
+log "Creating temporary chroot"
+cp -a carbs-chroot "chroot-$pid"
+
+trap clean EXIT INT
+
+log "Entering chroot"
+su -c "kiss-chroot chroot-$pid"
diff --git a/core/kiss-utils/patches/carbs-chbuild.patch b/core/kiss-utils/patches/carbs-chbuild.patch
deleted file mode 100644
index 5b25233b..00000000
--- a/core/kiss-utils/patches/carbs-chbuild.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/contrib/kiss-chbuild
-+++ b/contrib/kiss-chbuild
-@@ -15,18 +15,19 @@
- 
- cd "${cac_dir:=$KISS_ROOT${XDG_CACHE_HOME:-$HOME/.cache}/kiss}"
- 
--[ -f kiss-chroot.tar.xz ] || {
-+[ -f carbs-rootfs.tar.xz ] || {
-     log "Downloading chroot tarball"
--    wget https://dl.getkiss.org/kiss-chroot.tar.xz
-+    wget https://dl.carbslinux.org/releases/carbs-rootfs.tar.xz
- }
- 
--[ -d kiss-chroot ] || {
-+[ -d carbs-chroot ] || {
-     log "Extracting chroot"
--    tar xvf kiss-chroot.tar.xz
-+    mkdir -p carbs-chroot
-+    tar xvf carbs-rootfs.tar.xz -C carbs-chroot
- }
- 
- log "Creating temporary chroot"
--cp -a kiss-chroot "chroot-$pid"
-+cp -a carbs-chroot "chroot-$pid"
- 
- trap clean EXIT INT
- 
diff --git a/core/kiss-utils/sources b/core/kiss-utils/sources
index 641a3a90..38dff35b 100644
--- a/core/kiss-utils/sources
+++ b/core/kiss-utils/sources
@@ -1,2 +1,2 @@
-https://github.com/kisslinux/kiss/archive/1.5.6.tar.gz
-patches/carbs-chbuild.patch
+https://github.com/kisslinux/kiss/archive/1.7.0.tar.gz
+files/kiss-chbuild
diff --git a/core/kiss-utils/version b/core/kiss-utils/version
index 43cc0c08..abd32472 100644
--- a/core/kiss-utils/version
+++ b/core/kiss-utils/version
@@ -1 +1 @@
-1.5.6 1
+1.7.0 1