From 3784af6a5fc57bff16c669251de7169427267768 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Mon, 3 Feb 2020 01:13:56 +0300 Subject: kiss-utils: patch kiss-chbuild to get carbs-rootfs --- core/kiss-utils/build | 2 ++ core/kiss-utils/checksums | 1 + core/kiss-utils/patches/carbs-chbuild.patch | 27 +++++++++++++++++++++++++++ core/kiss-utils/sources | 1 + core/kiss-utils/version | 2 +- 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 core/kiss-utils/patches/carbs-chbuild.patch (limited to 'core') diff --git a/core/kiss-utils/build b/core/kiss-utils/build index 8f41cc8f..705ffc2d 100755 --- a/core/kiss-utils/build +++ b/core/kiss-utils/build @@ -1,3 +1,5 @@ #!/bin/sh -e +patch -p1 < carbs-chbuild.patch + install -t "$1/usr/bin" -D contrib/* diff --git a/core/kiss-utils/checksums b/core/kiss-utils/checksums index da1b7e88..53a98b80 100644 --- a/core/kiss-utils/checksums +++ b/core/kiss-utils/checksums @@ -1 +1,2 @@ a0b1ffbaca55e71463028539c18d2355060f4f60e8153d8a92dbeb1ed1f4aa4a 1.1.7.tar.gz +18ca494b678891a29cff68328a15d2cc60881945e6bf373bc3bfde274741dec1 carbs-chbuild.patch diff --git a/core/kiss-utils/patches/carbs-chbuild.patch b/core/kiss-utils/patches/carbs-chbuild.patch new file mode 100644 index 00000000..5b25233b --- /dev/null +++ b/core/kiss-utils/patches/carbs-chbuild.patch @@ -0,0 +1,27 @@ +--- 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 a40f7160..b9bc4093 100644 --- a/core/kiss-utils/sources +++ b/core/kiss-utils/sources @@ -1 +1,2 @@ https://github.com/kisslinux/kiss/archive/1.1.7.tar.gz +patches/carbs-chbuild.patch diff --git a/core/kiss-utils/version b/core/kiss-utils/version index bcd3c3ec..2a060d61 100644 --- a/core/kiss-utils/version +++ b/core/kiss-utils/version @@ -1 +1 @@ -1.1.7 1 +1.1.7 2 -- cgit v1.2.3