linux-qubasis
linux oasis port as a qubes template
git clone https://9o.is/git/linux-qubasis.git
commit dd7ea52cf5f7898a51ead3b7328aca87ef82bba6 parent fa57354bf1247b9cde132cf4d1b086e468fff747 Author: Jul <jul@9o.is> Date: Thu, 6 Nov 2025 00:33:19 -0500 remove xz-embedded Diffstat:
| M | .gitmodules | | | 4 | ---- |
| M | gen.sh | | | 1 | - |
| M | ninja/functions.sh | | | 6 | ++---- |
| D | pkg/xz-embedded/gen.sh | | | 20 | -------------------- |
| D | pkg/xz-embedded/repo | | | 1 | - |
5 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/.gitmodules b/.gitmodules @@ -70,10 +70,6 @@ path = pkg/util-linux/repo url = https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git ignore = all -[submodule "xz-embedded"] - path = pkg/xz-embedded/repo - url = https://github.com/tukaani-project/xz-embedded - ignore = all [submodule "rc"] path = pkg/rc/repo url = https://github.com/rakitzis/rc diff --git a/gen.sh b/gen.sh @@ -54,7 +54,6 @@ subgen pkg/util-linux subgen pkg/vis # subgen pkg/xen subgen pkg/xz -subgen pkg/xz-embedded # subgen pkg/yajl subgen pkg/zlib subgen pkg/zstd diff --git a/ninja/functions.sh b/ninja/functions.sh @@ -535,14 +535,12 @@ _ninja_flush_fetch() { case $_name in *.tar.gz|*.tgz) _archive=${_name%.t*gz}.tar - _tool=$hostdir/minigzip - _tool_dep=$_tool + _tool=gzip _extract_rule=extract-decompress ;; *.tar.xz) _archive=${_name%.xz} - _tool=$hostdir/xzminidec - _tool_dep=$_tool + _tool=xz _extract_rule=extract-decompress ;; *.tar.bz2) diff --git a/pkg/xz-embedded/gen.sh b/pkg/xz-embedded/gen.sh @@ -1,20 +0,0 @@ -fetch git - -host() { - cflags " - -I $srcdir/linux/include/linux - -I $srcdir/userspace - -D XZ_DEC_CONCATENATED - -D XZ_USE_CRC64 - " - - exe xzminidec " - userspace/xzminidec.c - linux/lib/xz/xz_crc32.c - linux/lib/xz/xz_crc64.c - linux/lib/xz/xz_sha256.c - linux/lib/xz/xz_dec_stream.c - linux/lib/xz/xz_dec_lzma2.c - linux/lib/xz/xz_dec_bcj.c - " -} diff --git a/pkg/xz-embedded/repo b/pkg/xz-embedded/repo @@ -1 +0,0 @@ -Subproject commit ae63ae3a36ed01724674e8f3d750dc47bf125410