From fff0adff7259406ffd1cfc1a1bb94df57bf0135c Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Sat, 4 Apr 2020 01:30:23 +0300 Subject: kiss: bump to 1.11.2 --- core/kiss/build | 10 +--------- core/kiss/checksums | 3 +-- core/kiss/files/kiss-chbuild | 35 ----------------------------------- core/kiss/sources | 3 +-- core/kiss/version | 2 +- 5 files changed, 4 insertions(+), 49 deletions(-) delete mode 100755 core/kiss/files/kiss-chbuild (limited to 'core/kiss') diff --git a/core/kiss/build b/core/kiss/build index 5ae6ae73..9838fd03 100755 --- a/core/kiss/build +++ b/core/kiss/build @@ -1,12 +1,4 @@ #!/bin/sh -e -# Add symbolic link support to kiss -sed -i 's/\[ -d "$path2" ]/[ -d "$path2" ] || [ -L "$path2 ]//' - -mv kiss-chbuild contrib - -install -Dm755 kiss "$1/usr/bin/kiss" install -Dm755 kiss_path.sh "$1/etc/profile.d/kiss_path.sh" -install -Dm644 kiss.1 "$1/usr/share/man/man1/kiss.1" - -install -Dm755 -t "$1/usr/bin" contrib/* +make PREFIX=/usr DESTDIR="$1" install diff --git a/core/kiss/checksums b/core/kiss/checksums index 1b97f2d9..d0f735ec 100644 --- a/core/kiss/checksums +++ b/core/kiss/checksums @@ -1,3 +1,2 @@ -ed187c465d4ef4320b9f2b0d4b4af4a53d50eb857a12366dc69c8068498c8b8c 1.10.2.tar.gz +d120d9c407e979882a057da367181c1e2af32ad9cb8dd1aa426a68a266e01411 1.11.2.tar.gz d56d159fd9f0c39a2692b4b00b1543b2eb476a0659aa6899efa0ff460863dc70 kiss_path.sh -62912794b89fa305a1aca18e82b200300ae5b55ed67feb86466198abbb41789f kiss-chbuild diff --git a/core/kiss/files/kiss-chbuild b/core/kiss/files/kiss-chbuild deleted file mode 100755 index 9df18ccb..00000000 --- a/core/kiss/files/kiss-chbuild +++ /dev/null @@ -1,35 +0,0 @@ -#!/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/sources b/core/kiss/sources index b24df129..8956209b 100644 --- a/core/kiss/sources +++ b/core/kiss/sources @@ -1,3 +1,2 @@ -https://github.com/kisslinux/kiss/archive/1.10.2.tar.gz +https://github.com/carbslinux/kiss/archive/1.11.2.tar.gz files/kiss_path.sh -files/kiss-chbuild diff --git a/core/kiss/version b/core/kiss/version index a3cafa9a..8d330c1d 100644 --- a/core/kiss/version +++ b/core/kiss/version @@ -1 +1 @@ -1.10.2 2 +1.11.2 1 -- cgit v1.2.3