diff options
Diffstat (limited to 'repo')
100 files changed, 688 insertions, 398 deletions
diff --git a/repo/apps/vim.xibuild b/repo/apps/vim.xibuild index 7720081..3079058 100644 --- a/repo/apps/vim.xibuild +++ b/repo/apps/vim.xibuild @@ -18,9 +18,8 @@ build () { package () { -make DESTDIR=$PKG_DEST install - - mkdir -pv $PKG_DEST/etc + make DESTDIR=$PKG_DEST install + mkdir -p $PKG_DEST/etc cat > $PKG_DEST/etc/vimrc << "EOF" " Begin /etc/vimrc " Ensure defaults are set before customizing settings, not after diff --git a/repo/apps/xterm.xibuild b/repo/apps/xterm.xibuild index 27a5cc2..09b5b6b 100644 --- a/repo/apps/xterm.xibuild +++ b/repo/apps/xterm.xibuild @@ -24,11 +24,11 @@ package () { make DESTDIR=$PKG_DEST install make DESTDIR=$PKG_DEST install-ti - mkdir -pv $PKG_DEST/usr/share/applications && - cp -v *.desktop $PKG_DEST/usr/share/applications/ + mkdir -p $PKG_DEST/usr/share/applications && + cp *.desktop $PKG_DEST/usr/share/applications/ - mkdir -pv $PKG_DEST/etc/X11/app-defaults + mkdir -p $PKG_DEST/etc/X11/app-defaults cat >> $PKG_DEST/etc/X11/app-defaults/XTerm << "EOF" *VT100*locale: true *VT100*faceName: Monospace diff --git a/repo/devel/asciidoc.xibuild b/repo/devel/asciidoc.xibuild index 5ffb83c..34202d0 100644 --- a/repo/devel/asciidoc.xibuild +++ b/repo/devel/asciidoc.xibuild @@ -10,6 +10,6 @@ DESC="Text document format for short documents, articles, books and UNIX man pag package () { pip install -t $PKG_DEST/usr/lib/python3.10/site-packages/ asciidoc mkdir -p $PKG_DEST/usr/bin - #ln -s /usr/lib/python3.10/site-packages/bin/asciidoc $PKG_DEST/usr/bin/asciidoc - #ln -s /usr/lib/python3.10/site-packages/bin/a2x $PKG_DEST/usr/bin/a2x + ln -s /usr/lib/python3.10/site-packages/bin/asciidoc $PKG_DEST/usr/bin/asciidoc + ln -s /usr/lib/python3.10/site-packages/bin/a2x $PKG_DEST/usr/bin/a2x } diff --git a/repo/devel/clang.xibuild b/repo/devel/clang.xibuild index 8b9c9b0..f917868 100644 --- a/repo/devel/clang.xibuild +++ b/repo/devel/clang.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="cmake llvm libxml2 ninja python3 python-markupsafe" +MAKEDEPS="cmake llvm libxml2 ninja python3 python-markupsafe python-pygments" DEPS="curl gcc libssh2 openssl" PKG_VER=13.0.1 @@ -8,8 +8,8 @@ SOURCE=https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKG_VER/c DESC="Systems programming language focused on safety, speed and concurrency" ADDITIONAL=" - patches/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch - patches/clang/10-add-musl-triples.patch + patches/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch + patches/10-add-musl-triples.patch " prepare () { diff --git a/repo/devel/cmake-extra.xibuild b/repo/devel/cmake-extra.xibuild new file mode 100644 index 0000000..a81994f --- /dev/null +++ b/repo/devel/cmake-extra.xibuild @@ -0,0 +1,20 @@ +#!/bin/sh + +MAKEDEPS="cmake" +DEPS="cmake" + +PKG_VER=1.6 +SOURCE=https://gitlab.com/ubports/core/cmake-extras/-/archive/$PKG_VER/cmake-extras-$PKG_VER.tar.gz +DESC="A collection of add-ons for the CMake build tool" + +build () { + cmake -B build \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_INSTALL_PREFIX=/usr + cmake --build build + +} + +package () { + DESTDIR="$PKG_DEST" cmake --build build --target install +} diff --git a/repo/devel/cmake-modules.xibuild b/repo/devel/cmake-modules.xibuild new file mode 100644 index 0000000..b23083d --- /dev/null +++ b/repo/devel/cmake-modules.xibuild @@ -0,0 +1,21 @@ +#!/bin/sh + +MAKEDEPS="cmake python-sphinx" +DEPS="cmake" + +PKG_VER=5.91.0 +SOURCE=https://download.kde.org/stable/frameworks/${PKG_VER%.*}/extra-cmake-modules-$PKG_VER.tar.xz +DESC="Extra CMake modules" + +build () { + cmake -B build \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSphinx_BUILD_EXECUTABLE=/usr/bin/sphinx-build + cmake --build build + +} + +package () { + DESTDIR="$PKG_DEST" cmake --build build --target install +} diff --git a/repo/devel/distcc.xibuild b/repo/devel/distcc.xibuild index a5c390f..d7ceaf2 100644 --- a/repo/devel/distcc.xibuild +++ b/repo/devel/distcc.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="python make " -DEPS="gcc python popt" +DEPS="gcc python popt musl-obstack" PKG_VER=3.4 SOURCE=https://github.com/distcc/distcc/releases/download/v$PKG_VER/distcc-$PKG_VER.tar.gz diff --git a/repo/devel/docbook4-xml.xibuild b/repo/devel/docbook4-xml.xibuild index b29b7ef..ba31b18 100644 --- a/repo/devel/docbook4-xml.xibuild +++ b/repo/devel/docbook4-xml.xibuild @@ -7,81 +7,97 @@ PKG_VER=4.5 SOURCE=https://www.docbook.org/xml/$PKG_VER/docbook-xml-$PKG_VER.zip DESC="A widely used XML scheme for writing documentation and help" +VERSIONS="4.5 4.4 4.3 4.2" + +ADDITIONAL=" + https://www.docbook.org/xml/4.4/docbook-xml-4.4.zip + https://www.docbook.org/xml/4.3/docbook-xml-4.3.zip + https://www.docbook.org/xml/4.2/docbook-xml-4.2.zip +" + package () { - install -m755 -d $PKG_DEST/usr/share/xml/docbook/xml-dtd-4.5 && - install -m755 -d $PKG_DEST/etc/xml && - chown -R root:root . && - cp -af docbook.cat *.dtd ent/ *.mod \ - $PKG_DEST/usr/share/xml/docbook/xml-dtd-4.5 + for v in $VERSIONS; do + mkdir docbook-xml-$v + cd docbook-xml-$v + unzip -o ../docbook-xml-$v.zip + install -m755 -d $PKG_DEST/usr/share/xml/docbook/xml-dtd-$v && + install -m755 -d $PKG_DEST/etc/xml && + chown -R root:root . && + cp -af docbook.cat *.dtd ent/ *.mod \ + $PKG_DEST/usr/share/xml/docbook/xml-dtd-$v + cd .. + done } postinstall () { - if [ ! -e /etc/xml/docbook ]; then - xmlcatalog --noout --create /etc/xml/docbook - fi && - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V4.5//EN" \ - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "rewriteSystem" \ - "http://www.oasis-open.org/docbook/xml/4.5" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - /etc/xml/docbook && - xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/4.5" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - /etc/xml/docbook - if [ ! -e /etc/xml/catalog ]; then - xmlcatalog --noout --create /etc/xml/catalog - fi && - xmlcatalog --noout --add "delegatePublic" \ - "-//OASIS//ENTITIES DocBook XML" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog && - xmlcatalog --noout --add "delegatePublic" \ - "-//OASIS//DTD DocBook XML" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog && - xmlcatalog --noout --add "delegateSystem" \ - "http://www.oasis-open.org/docbook/" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog && - xmlcatalog --noout --add "delegateURI" \ - "http://www.oasis-open.org/docbook/" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog + for v in $VERSIONS; do + if [ ! -e /etc/xml/docbook ]; then + xmlcatalog --noout --create /etc/xml/docbook + fi && + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML V$v//EN" \ + "http://www.oasis-open.org/docbook/xml/$v/docbookx.dtd" \ + /etc/xml/docbook && + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V$v//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-$v/calstblx.dtd" \ + /etc/xml/docbook && + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-$v/soextblx.dtd" \ + /etc/xml/docbook && + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Information Pool V$v//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-$v/dbpoolx.mod" \ + /etc/xml/docbook && + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V$v//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-$v/dbhierx.mod" \ + /etc/xml/docbook && + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML HTML Tables V$v//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-$v/htmltblx.mod" \ + /etc/xml/docbook && + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Notations V$v//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-$v/dbnotnx.mod" \ + /etc/xml/docbook && + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Character Entities V$v//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-$v/dbcentx.mod" \ + /etc/xml/docbook && + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Additional General Entities V$v//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-$v/dbgenent.mod" \ + /etc/xml/docbook && + xmlcatalog --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/$v" \ + "file:///usr/share/xml/docbook/xml-dtd-$v" \ + /etc/xml/docbook && + xmlcatalog --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/$v" \ + "file:///usr/share/xml/docbook/xml-dtd-$v" \ + /etc/xml/docbook + if [ ! -e /etc/xml/catalog ]; then + xmlcatalog --noout --create /etc/xml/catalog + fi && + xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//ENTITIES DocBook XML" \ + "file:///etc/xml/docbook" \ + /etc/xml/catalog && + xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//DTD DocBook XML" \ + "file:///etc/xml/docbook" \ + /etc/xml/catalog && + xmlcatalog --noout --add "delegateSystem" \ + "http://www.oasis-open.org/docbook/" \ + "file:///etc/xml/docbook" \ + /etc/xml/catalog && + xmlcatalog --noout --add "delegateURI" \ + "http://www.oasis-open.org/docbook/" \ + "file:///etc/xml/docbook" \ + /etc/xml/catalog + done } diff --git a/repo/devel/gcc.xibuild b/repo/devel/gcc.xibuild index 18b6e2e..25e2ad5 100644 --- a/repo/devel/gcc.xibuild +++ b/repo/devel/gcc.xibuild @@ -1,7 +1,8 @@ #!/bin/sh MAKEDEPS="grep make dejagnu inetutils flex" -DEPS="musl binutils mpc mpfr gmp" +DEPS="zstd musl binutils mpc mpfr gmp" + PKG_VER=11.2.0 SOURCE=https://ftp.gnu.org/gnu/gcc/gcc-$PKG_VER/gcc-$PKG_VER.tar.xz @@ -56,6 +57,8 @@ ADDITIONAL=" DESC="The GNU Compiler Collection - C and C++ frontends" prepare () { + export languages="c,c++,lto" + case $(uname -m) in x86_64) export TRUPLE="x86_64-linux-musl" export EXTRA_CONFIG=" --with-arch=x86-64" @@ -85,18 +88,17 @@ build () { mkdir build cd build - export NOFF="--disable-libstdcxx-pch " - export NOFF+="--disable-nls " - export NOFF+="--disable-multilib " - export NOFF+="--disable-bootstrap " - export NOFF+="--disable-symvers " - export NOFF+="--disable-libsanitizer " - export NOFF+="--disable-libssp " - export NOFF+="--disable-libmpx " - export NOFF+="--disable-libmudflap " - export NOFF+="--disable-fixed-point " - export NOFF+="--disable-sjlj-exceptions " - export NOFF+="--disable-werror " + export NOFF="--disable-libstdcxx-pch + --disable-nls + --disable-multilib + --disable-bootstrap + --disable-symvers + --disable-libsanitizer + --disable-libmpx + --disable-libmudflap + --disable-fixed-point + --disable-sjlj-exceptions + --disable-werror " # Enable graphite export XCONFIG="--with-ppl=yes --with-cloog=yes " @@ -105,28 +107,40 @@ build () { export XTRA86="--with-arch=x86-64 " # Enable features - export FON="--enable-threads=posix " - export FON+="--enable-clocale=generic " - export FON+="--enable-tls " - export FON+="--enable-libstdcxx-time " - export FON+="--enable-fully-dynamic-string " - export FON+="--enable-default-ssp " - export FON+="--enable-linker-build-id " - export FON+="--enable-checking=release " - export FON+="--enable-cloog-backend " - export FON+="--enable-__cxa_atexit " - export FON+="--enable-lto " - export FON+="--enable-plugins " - export FON+="--with-system-zlib " - export FON+="--with-linker-hash-style=gnu " + export FON="--enable-threads=posix + --enable-clocale=generic + --enable-tls + --enable-libstdcxx-time + --enable-fully-dynamic-string + --enable-linker-build-id + --enable-checking=release + --enable-cloog-backend + --enable-__cxa_atexit + --enable-lto + --enable-plugins + --with-system-zlib + --with-linker-hash-style=gnu " #export FON+="--with-isl " # Configure source SED=sed libat_cv_have_ifunc=no \ - ../configure --prefix=/usr \ - --target=${TRUPLE} \ - --enable-languages=c,c++,lto \ - $NOFF $XTRA86 $XCONFIG $FON && + ../configure --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --with-pkgversion="XiLinux $PKG_VER" \ + --enable-checking=release \ + --disable-fixed-point \ + --disable-libstdcxx-pch \ + --disable-multilib \ + --disable-nls \ + --disable-werror \ + --enable-__cxa_atexit \ + --enable-default-pie \ + --enable-cloog-backend \ + --enable-languages=$languages \ + --with-system-zlib \ + --target=${TRUPLE} \ + $NOFF $XTRA86 $XCONFIG $FON && make && diff --git a/repo/devel/git.xibuild b/repo/devel/git.xibuild index f7bcd27..ab8e273 100644 --- a/repo/devel/git.xibuild +++ b/repo/devel/git.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="grep python make xmlto" +MAKEDEPS="grep python make xmlto cmake" DEPS="curl perl openssl pcre2 grep shadow zlib openssh" PKG_VER=2.34.1 diff --git a/repo/devel/go.xibuild b/repo/devel/go.xibuild index 9673f12..9a5f1b7 100644 --- a/repo/devel/go.xibuild +++ b/repo/devel/go.xibuild @@ -1,26 +1,53 @@ #!/bin/sh -MAKEDEPS="make" +# Ensure we have gcc-go +MAKEDEPS="make gcc" DEPS="" PKG_VER=1.17.7 SOURCE=https://go.dev/dl/go$PKG_VER.src.tar.gz + +BOOTSTRAP="go1.4-bootstrap-20171003" +ADDITIONAL=" + https://dl.google.com/go/$BOOTSTRAP.tar.gz +" + DESC="Core compiler tools for the Go programming language" +prepare () { + export TMPDIR=/tmp + tar -xvf $BOOTSTRAP.tar.gz + mv go $BOOTSTRAP +} + build () { - export GOARCH=amd64 - export GOAMD64=v1 # make sure we're building for the right x86-64 version - export GOROOT_FINAL=/usr/lib/go - export GOROOT_BOOTSTRAP=/usr/lib/go - - cd src - ./make.bash -v - cd .. + export sourceroot=$(pwd) + export GOARCH=amd64 + export GOAMD64=v1 # make sure we're building for the right x86-64 version + export GOOS="linux" + + cd $BOOTSTRAP + cd src + echo "~~~~BUILDING BOOTSTRAP" + CGO_ENABLED=0 ./make.bash -v + + cd $sourceroot + export GOROOT_FINAL=/usr/lib/go + export GOROOT_BOOTSTRAP="$(pwd)/$BOOTSTRAP" + + echo "~~~~BUILDING GOLANG" + cd src + if [ ! -z "${GOROOT_BOOTSTRAP}" ]; then + ./bootstrap.bash -v + fi + ./make.bash -v + cd .. } package () { install -d "$PKG_DEST/usr/bin" "$PKG_DEST/usr/lib/go" "$PKG_DEST/usr/share/doc/go" \ - "$PKG_DEST/usr/lib/go/pkg/linux_amd64_"{dynlink,race} + "$PKG_DEST/usr/lib/go/pkg/linux_amd64_"dynlink \ + "$PKG_DEST/usr/lib/go/pkg/linux_amd64_"race cp -a bin pkg src lib misc api test "$PKG_DEST/usr/lib/go" cp -r doc/* "$PKG_DEST/usr/share/doc/go" diff --git a/repo/devel/gtk-doc.xibuild b/repo/devel/gtk-doc.xibuild new file mode 100644 index 0000000..074eca0 --- /dev/null +++ b/repo/devel/gtk-doc.xibuild @@ -0,0 +1,22 @@ +#!/bin/sh + +MAKEDEPS="make " +DEPS="docbook4-xml docbook-dtd docbook-xsl itstool libxslt" + +PKG_VER=1.33.2 +SOURCE=https://download.gnome.org/sources/gtk-doc/${PKG_VER%.*}/gtk-doc-$PKG_VER.tar.xz +DESC="Documentation tool for public library API" + +prepare () { + autoreconf -fiv +} +build () { + ./configure --prefix=/usr && + make +} + +package () { + make DESTDIR=$PKG_DEST install +} + + diff --git a/repo/devel/itstool.xibuild b/repo/devel/itstool.xibuild new file mode 100644 index 0000000..721c5a7 --- /dev/null +++ b/repo/devel/itstool.xibuild @@ -0,0 +1,19 @@ +#!/bin/sh + +MAKEDEPS="make " +DEPS="docbook-xml" + +PKG_VER=2.0.7 +SOURCE=http://files.itstool.org/itstool/itstool-2.0.7.tar.bz2 +DESC="Extract messages from XML files and output PO template files" + +build () { + PYTHON=/usr/bin/python3 ./configure --prefix=/usr && + make +} + +package () { + make DESTDIR=$PKG_DEST install +} + + diff --git a/repo/devel/m4.xibuild b/repo/devel/m4.xibuild index f459376..e6ccf14 100644 --- a/repo/devel/m4.xibuild +++ b/repo/devel/m4.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make help2man" -DEPS="musl bash" +DEPS="musl sh" PKG_VER=1.4.19 SOURCE=https://ftp.gnu.org/gnu/m4/m4-$PKG_VER.tar.xz diff --git a/repo/devel/rustc.xibuild b/repo/devel/rustc.xibuild index bab5553..049ecae 100644 --- a/repo/devel/rustc.xibuild +++ b/repo/devel/rustc.xibuild @@ -8,29 +8,26 @@ SOURCE=https://static.rust-lang.org/dist/rustc-$PKG_VER-src.tar.gz DESC="Systems programming language focused on safety, speed and concurrency" ADDITIONAL=" - patches/rustc/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch - patches/rustc/0007-do-not-install-libunwind-source.patch - patches/rustc/install-template-shebang.patch - patches/rustc/link-musl-dynamically.patch - patches/rustc/musl-fix-linux_musl_base.patch - patches/rustc/need-rpath.patch - patches/rustc/need-ssp_nonshared.patch - patches/rustc/need-ssp_nonshared.patch + patches/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch + patches/0007-do-not-install-libunwind-source.patch + patches/install-template-shebang.patch + patches/link-musl-dynamically.patch + patches/musl-fix-linux_musl_base.patch + patches/need-rpath.patch + patches/need-ssp_nonshared.patch " prepare () { - apply_patches + sed -i /LD_LIBRARY_PATH/d src/bootstrap/bootstrap.py + sed -i 's/\("files":{\)[^}]*/\1/' vendor/libc/.cargo-checksum.json - mkdir -p $PKG_DEST/opt/rustc-$PKG_VER && - ln -sf rustc-$PKG_VER $PKG_DEST/opt/rustc } build () { - export RUSTFLAGS="$RUSTFLAGS -C link-arg=-lffi" && target=x86_64-unknown-linux-musl build=x86_64-unknown-linux-musl - CFLAGS="-fPIE" CXXFLAGS="-fPIE" ./configure \ + ./configure \ --build="$build" \ --host="$target" \ --target="$target" \ @@ -51,18 +48,21 @@ build () { --set="target.$target.llvm-config=/usr/bin/llvm-config" \ --set="target.$target.musl-root=/usr" \ --set="target.$target.crt-static=false" \ - --set="target.$target.cc=clang" \ - --set="target.$target.cxx=clang++" \ - --set="target.$target.ar=llvm-ar" \ - --set="target.$target.linker=clang" \ + --set="target.$target.cc=gcc" \ + --set="target.$target.cxx=c++" \ + --set="target.$target.ar=ar" \ + --set="target.$target.linker=gcc" \ --set="target.$build.musl-root=/usr" \ --set="target.$build.crt-static=false" \ - --set="target.$build.cc=clang" \ - --set="target.$build.cxx=clang++" \ - --set="target.$build.ar=llvm-ar" \ - --set="target.$build.linker=clang" + --set="target.$build.cc=gcc" \ + --set="target.$build.cxx=c++" \ + --set="target.$build.ar=ar" \ + --set="target.$build.linker=gcc" - python ./x.py dist --jobs $JOBS + sed 's/#deny-warnings = .*/deny-warnings = false/' -i config.toml + sed 's|deny(warnings,|deny(|' -i src/bootstrap/lib.rs + + python ./x.py dist -v --jobs $JOBS } diff --git a/repo/font/encodings.xibuild b/repo/font/encodings.xibuild index f5d7630..6252d8a 100644 --- a/repo/font/encodings.xibuild +++ b/repo/font/encodings.xibuild @@ -14,7 +14,7 @@ build () { package () { make DESTDIR=$PKG_DEST install -install -v -d -m755 $PKG_DEST/usr/share/fonts && -ln -svfn $XORG_PREFIX/share/fonts/X11/OTF $PKG_DEST/usr/share/fonts/X11-OTF && -ln -svfn $XORG_PREFIX/share/fonts/X11/TTF $PKG_DEST/usr/share/fonts/X11-TTF +install -d -m755 $PKG_DEST/usr/share/fonts && +ln -sf $XORG_PREFIX/share/fonts/X11/OTF $PKG_DEST/usr/share/fonts/X11-OTF && +ln -sf $XORG_PREFIX/share/fonts/X11/TTF $PKG_DEST/usr/share/fonts/X11-TTF }
\ No newline at end of file diff --git a/repo/font/font-adobe-utopia-type1.xibuild b/repo/font/font-adobe-utopia-type1.xibuild index 38ba21b..7dc766d 100644 --- a/repo/font/font-adobe-utopia-type1.xibuild +++ b/repo/font/font-adobe-utopia-type1.xibuild @@ -14,7 +14,7 @@ build () { package () { make DESTDIR=$PKG_DEST install -install -v -d -m755 $PKG_DEST/usr/share/fonts && -ln -svfn $XORG_PREFIX/share/fonts/X11/OTF $PKG_DEST/usr/share/fonts/X11-OTF && -ln -svfn $XORG_PREFIX/share/fonts/X11/TTF $PKG_DEST/usr/share/fonts/X11-TTF +install -d -m755 $PKG_DEST/usr/share/fonts && +ln -sf $XORG_PREFIX/share/fonts/X11/OTF $PKG_DEST/usr/share/fonts/X11-OTF && +ln -sf $XORG_PREFIX/share/fonts/X11/TTF $PKG_DEST/usr/share/fonts/X11-TTF }
\ No newline at end of file diff --git a/repo/font/font-alias.xibuild b/repo/font/font-alias.xibuild index 295ff48..2d54f3a 100644 --- a/repo/font/font-alias.xibuild +++ b/repo/font/font-alias.xibuild @@ -14,7 +14,7 @@ build () { package () { make DESTDIR=$PKG_DEST install -install -v -d -m755 $PKG_DEST/usr/share/fonts && -ln -svfn $XORG_PREFIX/share/fonts/X11/OTF $PKG_DEST/usr/share/fonts/X11-OTF && -ln -svfn $XORG_PREFIX/share/fonts/X11/TTF $PKG_DEST/usr/share/fonts/X11-TTF +install -d -m755 $PKG_DEST/usr/share/fonts && +ln -sf $XORG_PREFIX/share/fonts/X11/OTF $PKG_DEST/usr/share/fonts/X11-OTF && +ln -sf $XORG_PREFIX/share/fonts/X11/TTF $PKG_DEST/usr/share/fonts/X11-TTF }
\ No newline at end of file diff --git a/repo/font/font-bh-ttf.xibuild b/repo/font/font-bh-ttf.xibuild index 6f0c2b9..7d9d58c 100644 --- a/repo/font/font-bh-ttf.xibuild +++ b/repo/font/font-bh-ttf.xibuild @@ -14,7 +14,7 @@ build () { package () { make DESTDIR=$PKG_DEST install -install -v -d -m755 $PKG_DEST/usr/share/fonts && -ln -svfn $XORG_PREFIX/share/fonts/X11/OTF $PKG_DEST/usr/share/fonts/X11-OTF && -ln -svfn $XORG_PREFIX/share/fonts/X11/TTF $PKG_DEST/usr/share/fonts/X11-TTF +install -d -m755 $PKG_DEST/usr/share/fonts && +ln -sf $XORG_PREFIX/share/fonts/X11/OTF $PKG_DEST/usr/share/fonts/X11-OTF && +ln -sf $XORG_PREFIX/share/fonts/X11/TTF $PKG_DEST/usr/share/fonts/X11-TTF }
\ No newline at end of file diff --git a/repo/font/font-bh-type1.xibuild b/repo/font/font-bh-type1.xibuild index c0be52b..5224ed4 100644 --- a/repo/font/font-bh-type1.xibuild +++ b/repo/font/font-bh-type1.xibuild @@ -14,7 +14,7 @@ build () { package () { make DESTDIR=$PKG_DEST install -install -v -d -m755 $PKG_DEST/usr/share/fonts && -ln -svfn $XORG_PREFIX/share/fonts/X11/OTF $PKG_DEST/usr/share/fonts/X11-OTF && -ln -svfn $XORG_PREFIX/share/fonts/X11/TTF $PKG_DEST/usr/share/fonts/X11-TTF +install -d -m755 $PKG_DEST/usr/share/fonts && +ln -sf $XORG_PREFIX/share/fonts/X11/OTF $PKG_DEST/usr/share/fonts/X11-OTF && +ln -sf $XORG_PREFIX/share/fonts/X11/TTF $PKG_DEST/usr/share/fonts/X11-TTF }
\ No newline at end of file diff --git a/repo/font/font-ibm-type1.xibuild b/repo/font/font-ibm-type1.xibuild index ac8e191..fbf0fdf 100644 --- a/repo/font/font-ibm-type1.xibuild +++ b/repo/font/font-ibm-type1.xibuild @@ -14,7 +14,7 @@ build () { package () { make DESTDIR=$PKG_DEST install -install -v -d -m755 $PKG_DEST/usr/share/fonts && -ln -svfn $XORG_PREFIX/share/fonts/X11/OTF $PKG_DEST/usr/share/fonts/X11-OTF && -ln -svfn $XORG_PREFIX/share/fonts/X11/TTF $PKG_DEST/usr/share/fonts/X11-TTF +install -d -m755 $PKG_DEST/usr/share/fonts && +ln -sf $XORG_PREFIX/share/fonts/X11/OTF $PKG_DEST/usr/share/fonts/X11-OTF && +ln -sf $XORG_PREFIX/share/fonts/X11/TTF $PKG_DEST/usr/share/fonts/X11-TTF }
\ No newline at end of file diff --git a/repo/font/font-misc-ethiopic.xibuild b/repo/font/font-misc-ethiopic.xibuild index 895aebf..872fa2c 100644 --- a/repo/font/font-misc-ethiopic.xibuild +++ b/repo/font/font-misc-ethiopic.xibuild @@ -14,7 +14,7 @@ build () { package () { make DESTDIR=$PKG_DEST install -install -v -d -m755 $PKG_DEST/usr/share/fonts && -ln -svfn $XORG_PREFIX/share/fonts/X11/OTF $PKG_DEST/usr/share/fonts/X11-OTF && -ln -svfn $XORG_PREFIX/share/fonts/X11/TTF $PKG_DEST/usr/share/fonts/X11-TTF +install -d -m755 $PKG_DEST/usr/share/fonts && +ln -sf $XORG_PREFIX/share/fonts/X11/OTF $PKG_DEST/usr/share/fonts/X11-OTF && +ln -sf $XORG_PREFIX/share/fonts/X11/TTF $PKG_DEST/usr/share/fonts/X11-TTF }
\ No newline at end of file diff --git a/repo/font/font-xfree86-type1.xibuild b/repo/font/font-xfree86-type1.xibuild index f266253..aba89b8 100644 --- a/repo/font/font-xfree86-type1.xibuild +++ b/repo/font/font-xfree86-type1.xibuild @@ -14,7 +14,7 @@ build () { package () { make DESTDIR=$PKG_DEST install -install -v -d -m755 $PKG_DEST/usr/share/fonts && -ln -svfn $XORG_PREFIX/share/fonts/X11/OTF $PKG_DEST/usr/share/fonts/X11-OTF && -ln -svfn $XORG_PREFIX/share/fonts/X11/TTF $PKG_DEST/usr/share/fonts/X11-TTF -}
\ No newline at end of file + install -d -m755 $PKG_DEST/usr/share/fonts && + ln -sf $XORG_PREFIX/share/fonts/X11/OTF $PKG_DEST/usr/share/fonts/X11-OTF && + ln -sf $XORG_PREFIX/share/fonts/X11/TTF $PKG_DEST/usr/share/fonts/X11-TTF +} diff --git a/repo/linux/linux-firmware.xibuild b/repo/linux/linux-firmware.xibuild index 16746b7..67f5f14 100644 --- a/repo/linux/linux-firmware.xibuild +++ b/repo/linux/linux-firmware.xibuild @@ -10,6 +10,6 @@ BRANCH=0c6a7b3bf728b95c8b7b95328f94335e2bb2c967 DESC="All firmware files for linux" package () { - mkdir -pv $PKG_DEST/usr/lib/firmware - cp -rv * $PKG_DEST/usr/lib/firmware + mkdir -p $PKG_DEST/usr/lib/firmware + cp -r * $PKG_DEST/usr/lib/firmware } diff --git a/repo/linux/linux-headers.xibuild b/repo/linux/linux-headers.xibuild index c7d4d5f..c4a3a7e 100644 --- a/repo/linux/linux-headers.xibuild +++ b/repo/linux/linux-headers.xibuild @@ -16,6 +16,6 @@ build () { } package () { - mkdir -pv $PKG_DEST/usr/include - cp -rv usr/include/* $PKG_DEST/usr/include/ + mkdir -p $PKG_DEST/usr/include + cp -r usr/include/* $PKG_DEST/usr/include/ } diff --git a/repo/linux/linux.xibuild b/repo/linux/linux.xibuild index caf0918..ff11076 100644 --- a/repo/linux/linux.xibuild +++ b/repo/linux/linux.xibuild @@ -3,39 +3,43 @@ MAKEDEPS="make bc" DEPS="sbase kmod" -PKG_VER=5.16.11 -SOURCE=https://cdn.kernel.org/pub/linux/kernel/v$(echo $PKG_VER | cut -d. -f1).x/linux-$PKG_VER.tar.xz +PKG_VER=5.16.12 +SOURCE=https://cdn.kernel.org/pub/linux/kernel/v${PKG_VER%%.*}.x/linux-$PKG_VER.tar.xz ADDITIONAL=" - https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/linux/trunk/config + config + fix-sbase-coreutils.patch " prepare () { + apply_patches mv config .config + export GREP="ggrep" + make olddefconfig make -s kernelrelease > version - echo "Prepared linux version $(<version)" + echo "Prepared linux version $(cat version)" } build () { - make all + make all } package () { - local kernver="$(<version)" + local kernver="$(cat version)" local modulesdir="$PKG_DEST/usr/lib/modules/$PKG_VER" echo "Installing boot image..." - mkdir -pv $PKG_DEST/boot - cp -iv arch/x86/boot/bzImage $PKG_DEST/boot/vmlinuz-$PKG_VER - cp -iv System.map $PKG_DEST/boot/System.map-$PKG_VER - cp -iv .config $PKG_DEST/boot/config-$PKG_VER + mkdir -p $PKG_DEST/boot + cp arch/x86/boot/bzImage $PKG_DEST/boot/vmlinuz-$PKG_VER + cp System.map $PKG_DEST/boot/System.map-$PKG_VER + cp .config $PKG_DEST/boot/config-$PKG_VER install -d $PKG_DEST/usr/share/doc/linux-$PKG_VER cp -r Documentation/* $PKG_DEST/usr/share/doc/linux-$PKG_VER - install -v -m755 -d $PKG_DEST/etc/modprobe.d + install -m755 -d $PKG_DEST/etc/modprobe.d cat > $PKG_DEST/etc/modprobe.d/usb.conf << "EOF" # Begin /etc/modprobe.d/usb.conf @@ -48,6 +52,7 @@ EOF echo "Installing modules..." make INSTALL_MOD_PATH="$PKG_DEST/usr" INSTALL_MOD_STRIP=1 modules_install - rm "$modulesdir"/{source,build} + rm "$modulesdir"/source + rm "$modulesdir"/build } diff --git a/repo/media/alsa-firmware.xibuild b/repo/media/alsa-firmware.xibuild index b7c6973..d6311a9 100644 --- a/repo/media/alsa-firmware.xibuild +++ b/repo/media/alsa-firmware.xibuild @@ -7,6 +7,13 @@ DESC="Firmware binaries for loader programs in alsa-tools and hotplug firmware l PKG_VER=1.2.4 SOURCE=https://www.alsa-project.org/files/pub/firmware/alsa-firmware-$PKG_VER.tar.bz2 +ADDITIONAL=" + use-uint32_t-instead-u_int32_t.patch +" + +prepare () { + apply_patches +} build () { ./configure --prefix=/usr && diff --git a/repo/media/alsa-tools.xibuild b/repo/media/alsa-tools.xibuild index a31327f..5901538 100644 --- a/repo/media/alsa-tools.xibuild +++ b/repo/media/alsa-tools.xibuild @@ -13,6 +13,7 @@ prepare () { } build () { + buildroot=$(pwd) for tool in *; do case $tool in seq ) @@ -23,13 +24,13 @@ build () { ;; esac - pushd $tool_dir - ./configure --prefix=/usr - make - make DESTDIR=$PKG_DEST install - popd + cd $tool_dir + ./configure --prefix=/usr + make + make DESTDIR=$PKG_DEST install + cd $buildroot -done + done unset tool tool_dir } diff --git a/repo/media/pulseaudio.xibuild b/repo/media/pulseaudio.xibuild index 572205d..9554c72 100644 --- a/repo/media/pulseaudio.xibuild +++ b/repo/media/pulseaudio.xibuild @@ -22,5 +22,5 @@ build () { package () { DESTDIR=$PKG_DEST ninja install - rm -fv $PKG_DEST/etc/dbus-1/system.d/pulseaudio-system.conf + rm -f $PKG_DEST/etc/dbus-1/system.d/pulseaudio-system.conf } diff --git a/repo/meta/all.xibuild b/repo/meta/all.xibuild index e3ec869..deb8f04 100644 --- a/repo/meta/all.xibuild +++ b/repo/meta/all.xibuild @@ -2,4 +2,4 @@ # This file was automatically generated, do not edit! DESC="AlL tHe pacKageS!!" -DEPS=" feh rxvt-unicode xterm asciidoc autoconf2-13 autoconf automake bc bison check cmake dejagnu distcc docbook4-xml docbook-dtd docbook-xml docbook-xsl expect flex gcc gdb git go help2man icecream-sundae icecream llvm m4 make meson mpc ninja patch pkg-config rustc sgml-common texinfo xmlto encodings font-adobe-utopia-type1 font-alias font-bh-ttf font-bh-type1 fontconfig font-ibm-type1 font-misc-ethiopic font-util font-xfree86-type1 linux-firmware linux-headers linux cacert-utils fakechroot fakeroot acl acpid attr binutils bootscripts brotli bzip2 cacerts sbase dbus dhcp efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext musl glib gmp gnutls gobject-introspection gperf grub guile gzip iana-etc icu imlib2 intltool js78 kbd kmod krb5 ldns libarchive libcap-ng libcap libffi libgudev libidn libldap liblinear libndp libnghttp libnl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libxcrypt libxml2 libxslt lua lz4 lzo mkinitramfs mpfr mtdev ncurses nettle networkmanager newt nspr nss openssl pahole pam pcre2 perl perl-xml-parser polkit popt psmisc python-mako python-markupsafe python-requests python-six python readline rtmpdump sed shadow slang sysklogd sysvinit tar tcl tomlc99 xxhash xz zip zlib zstd acpi bash cpio curl dash diffutils dosfstools dracut e2fsprogs elfutils file fzf gawk genfstab grep groff htop inetutils iproute2 iw keyutils less lm-sensors lynx make-ca man-db neofetch nmap openssh pciutils pm-utils procps-ng rsync sudo unzip usbutils util-linux vim webfs wget which wireless-tools wpa_supplicant bspwm iceauth intel-vaapi-driver libdmx libdrm libepoxy libevdev libfontenc libfs libice libinput libpciaccess libsm libva libvdpau-va-gl libvdpau libwacom libx11 libxau libxaw libxcb libxcomposite libxcursor libxcvt libxdamage libxdmcp libxext libxfixes libxfont2 libxft libxinerama libxi libxkbfile libxmu libxpm libxrandr libxrender libxres libxscrnsaver libxshmfence libxtst libxt libxvmc libxv libxxf86dga libxxf86vm luit mesa mkfontscale pixman sessreg setxkbmap smproxy sxhkd wayland-protocols wayland x11perf xauth xbacklight xbitmaps xcb-proto xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xcb-util xclock xcmsdb xcursorgen xcursor-themes xdpyinfo xdriinfo xev xeyes xf86-input-evdev xf86-input-libinput xf86-input-synaptics xf86-input-wacom xf86-video-amdgpu xf86-video-ati xf86-video-fbdev xf86-video-intel xf86-video-nouveau xf86-video-vmware xgamma xhost xinput xkbcomp xkbevd xkbutils xkeyboardconfig xkill xlsatoms xlsclients xmessage xmodmap xorg-libs xorgproto xorg-server xorg-util-macros xorg-xinit xprop xpr xrandr xrdb xrefresh xsetroot xset xtrans xvinfo xwd xwininfo xwud sysconfigs xibuild xib xipkg xiutils" +DEPS=" feh lynx rxvt-unicode vim xterm asciidoc autoconf2-13 autoconf-archive autoconf automake bc bison check clang cmake-extra cmake-modules cmake dejagnu distcc docbook4-xml docbook-dtd docbook-xml docbook-xsl expect flex gcc gdb git go gtk-doc help2man icecream itstool llvm m4 make meson mpc nasm ninja patch pkg-config rustc sgml-common texinfo xmlto encodings font-adobe-utopia-type1 font-alias font-bh-ttf font-bh-type1 fontconfig font-ibm-type1 font-misc-ethiopic font-util font-xfree86-type1 linux-firmware linux-headers linux alsa-firmware alsa-lib alsa-plugins alsa-tools alsa-utils audiofile faac faad2 fdk-aac flac libogg libsamplerate libsndfile libtheora libvorbis libvpx opus pipewire pulseaudio python-alabaster python-appdirs python-babel python-certifi python-chardet python-docutils python-html5lib python-idna python-imagesize python-Jinja2 python-jinja python-lxml python-mach python-mako python-markupsafe python-packaging python-pip python-pygments python-pyparsing python-pytz python-requests python-six python-snowballstemmer python-sphinx-alabaster-theme python-sphinxcontrib-applehelp python-sphinxcontrib-devhelp python-sphinxcontrib-htmlhelp python-sphinxcontrib-jsmath python-sphinxcontrib-qthelp python-sphinxcontrib-serializinghtml python-sphinx python-urllib3 python-webencodings python alsa-oss cacert-utils fakechroot fakeroot icecream-sundae polybar xf86-video-qxl xf86-video-vga acl acpid argp-standalone attr binutils bootscripts brotli bzip2 cacerts dbus dhcp efibootmgr efivar elfutils elogind eudev execline expat findutils freetype2 gc gdbm gettext glib gmp gnutls gobject-introspection gperf grub guile gzip iana-etc icu imlib2 intltool js78 kbd kmod krb5 ldns libarchive libcap-ng libcap libdwarf libelf libffi libgudev libidn libldap liblinear libndp libnghttp libnl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libxcrypt libxml2 libxslt lua lz4 lzo mkinitramfs mpfr mtdev musl-fts musl-legacy-compat musl-obstack musl ncurses nettle networkmanager newt nspr nsss nss openssl pahole pam pcre2 pcre perl perl-xml-parser polkit popt psmisc queue-standalone readline rtmpdump s6-linux-init s6-linux-utils s6-portable-utils s6-rc s6 sbase sed shadow skalibs slang sqlite3 sysklogd tar tcl tomlc99 ubase utmps xxhash xz zip zlib zstd acpi bash cpio curl dash diffutils dosfstools dracut e2fsprogs file fzf gawk genfstab grep groff htop inetutils iproute2 iw keyutils less lm-sensors man-db neofetch nmap openssh pciutils pm-utils procps-ng rsync sudo unzip usbutils util-linux webfs wget which wireless-tools wpa_supplicant bspwm iceauth intel-vaapi-driver libdmx libdrm libepoxy libevdev libfontenc libfs libice libinput libpciaccess libsm libva libvdpau-va-gl libvdpau libwacom libx11 libxau libxaw libxcb libxcomposite libxcursor libxcvt libxdamage libxdmcp libxext libxfixes libxfont2 libxft libxinerama libxi libxkbfile libxmu libxpm libxrandr libxrender libxres libxscrnsaver libxshmfence libxtst libxt libxvmc libxv libxxf86dga libxxf86vm luit mesa mkfontscale pixman sessreg setxkbmap smproxy sxhkd wayland-protocols wayland x11perf xauth xbacklight xbitmaps xcb-proto xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xcb-util xclock xcmsdb xcursorgen xcursor-themes xdpyinfo xdriinfo xev xeyes xf86-input-evdev xf86-input-libinput xf86-input-synaptics xf86-input-wacom xf86-video-amdgpu xf86-video-ati xf86-video-fbdev xf86-video-intel xf86-video-nouveau xf86-video-vmware xgamma xhost xinput xkbcomp xkbevd xkbutils xkeyboardconfig xkill xlsatoms xlsclients xmessage xmodmap xorg-libs xorgproto xorg-server xorg-util-macros xorg-xinit xprop xpr xrandr xrdb xrefresh xsetroot xset xtrans xvinfo xwd xwininfo xwud sysconfigs xib xichroot xipkg xiutils" diff --git a/repo/meta/base-build.xibuild b/repo/meta/base-build.xibuild new file mode 100644 index 0000000..1daf0a8 --- /dev/null +++ b/repo/meta/base-build.xibuild @@ -0,0 +1,4 @@ +#!/bin/sh +DEPS="musl binutils gcc linux-headers tcl expect dejagnu m4 ncurses dash bison bzip2 sbase ubase diffutils file findutils gawk grep sed gzip make patch perl tar texinfo xz flex" + +DESC="Base toolchain used to build other packages" diff --git a/repo/meta/devel.xibuild b/repo/meta/devel.xibuild deleted file mode 100644 index 4581962..0000000 --- a/repo/meta/devel.xibuild +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# This file was automatically generated, do not edit! - -DESC="All the the packages available in devel" -DEPS=" asciidoc autoconf2-13 autoconf automake bc bison check cmake dejagnu distcc docbook4-xml docbook-dtd docbook-xml docbook-xsl expect flex gcc gdb git go help2man icecream-sundae icecream llvm m4 make meson mpc ninja patch pkg-config rustc sgml-common texinfo xmlto" diff --git a/repo/meta/meta.xibuild b/repo/meta/meta.xibuild deleted file mode 100644 index 356d723..0000000 --- a/repo/meta/meta.xibuild +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# This file was automatically generated, do not edit! - -DESC="All the the packages available in meta" -DEPS="" diff --git a/repo/meta/apps.xibuild b/repo/meta/repo-apps.xibuild index 7debc3c..08bd151 100644 --- a/repo/meta/apps.xibuild +++ b/repo/meta/repo-apps.xibuild @@ -2,4 +2,4 @@ # This file was automatically generated, do not edit! DESC="All the the packages available in apps" -DEPS=" feh rxvt-unicode xterm" +DEPS=" feh lynx rxvt-unicode vim xterm" diff --git a/repo/meta/repo-devel.xibuild b/repo/meta/repo-devel.xibuild new file mode 100644 index 0000000..639c4ad --- /dev/null +++ b/repo/meta/repo-devel.xibuild @@ -0,0 +1,5 @@ +#!/bin/sh +# This file was automatically generated, do not edit! + +DESC="All the the packages available in devel" +DEPS=" asciidoc autoconf2-13 autoconf-archive autoconf automake bc bison check clang cmake-extra cmake-modules cmake dejagnu distcc docbook4-xml docbook-dtd docbook-xml docbook-xsl expect flex gcc gdb git go gtk-doc help2man icecream itstool llvm m4 make meson mpc nasm ninja patch pkg-config rustc sgml-common texinfo xmlto" diff --git a/repo/meta/font.xibuild b/repo/meta/repo-font.xibuild index 89a90f1..89a90f1 100644 --- a/repo/meta/font.xibuild +++ b/repo/meta/repo-font.xibuild diff --git a/repo/meta/linux.xibuild b/repo/meta/repo-linux.xibuild index d4ab3e0..d4ab3e0 100644 --- a/repo/meta/linux.xibuild +++ b/repo/meta/repo-linux.xibuild diff --git a/repo/meta/repo-media.xibuild b/repo/meta/repo-media.xibuild new file mode 100644 index 0000000..a2aec98 --- /dev/null +++ b/repo/meta/repo-media.xibuild @@ -0,0 +1,5 @@ +#!/bin/sh +# This file was automatically generated, do not edit! + +DESC="All the the packages available in media" +DEPS=" alsa-firmware alsa-lib alsa-plugins alsa-tools alsa-utils audiofile faac faad2 fdk-aac flac libogg libsamplerate libsndfile libtheora libvorbis libvpx opus pipewire pulseaudio" diff --git a/repo/meta/repo-python.xibuild b/repo/meta/repo-python.xibuild new file mode 100644 index 0000000..a06b208 --- /dev/null +++ b/repo/meta/repo-python.xibuild @@ -0,0 +1,5 @@ +#!/bin/sh +# This file was automatically generated, do not edit! + +DESC="All the the packages available in python" +DEPS=" python-alabaster python-appdirs python-babel python-certifi python-chardet python-docutils python-html5lib python-idna python-imagesize python-Jinja2 python-jinja python-lxml python-mach python-mako python-markupsafe python-packaging python-pip python-pygments python-pyparsing python-pytz python-requests python-six python-snowballstemmer python-sphinx-alabaster-theme python-sphinxcontrib-applehelp python-sphinxcontrib-devhelp python-sphinxcontrib-htmlhelp python-sphinxcontrib-jsmath python-sphinxcontrib-qthelp python-sphinxcontrib-serializinghtml python-sphinx python-urllib3 python-webencodings python" diff --git a/repo/meta/repo-system.xibuild b/repo/meta/repo-system.xibuild new file mode 100644 index 0000000..c1326e9 --- /dev/null +++ b/repo/meta/repo-system.xibuild @@ -0,0 +1,5 @@ +#!/bin/sh +# This file was automatically generated, do not edit! + +DESC="All the the packages available in system" +DEPS=" acl acpid argp-standalone attr binutils bootscripts brotli bzip2 cacerts dbus dhcp efibootmgr efivar elfutils elogind eudev execline expat findutils freetype2 gc gdbm gettext glib gmp gnutls gobject-introspection gperf grub guile gzip iana-etc icu imlib2 intltool js78 kbd kmod krb5 ldns libarchive libcap-ng libcap libdwarf libelf libffi libgudev libidn libldap liblinear libndp libnghttp libnl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libxcrypt libxml2 libxslt lua lz4 lzo mkinitramfs mpfr mtdev musl-fts musl-legacy-compat musl-obstack musl ncurses nettle networkmanager newt nspr nsss nss openssl pahole pam pcre2 pcre perl perl-xml-parser polkit popt psmisc queue-standalone readline rtmpdump s6-linux-init s6-linux-utils s6-portable-utils s6-rc s6 sbase sed shadow skalibs slang sqlite3 sysklogd tar tcl tomlc99 ubase utmps xxhash xz zip zlib zstd" diff --git a/repo/meta/repo-util.xibuild b/repo/meta/repo-util.xibuild new file mode 100644 index 0000000..7d425b5 --- /dev/null +++ b/repo/meta/repo-util.xibuild @@ -0,0 +1,5 @@ +#!/bin/sh +# This file was automatically generated, do not edit! + +DESC="All the the packages available in util" +DEPS=" acpi bash cpio curl dash diffutils dosfstools dracut e2fsprogs file fzf gawk genfstab grep groff htop inetutils iproute2 iw keyutils less lm-sensors man-db neofetch nmap openssh pciutils pm-utils procps-ng rsync sudo unzip usbutils util-linux webfs wget which wireless-tools wpa_supplicant" diff --git a/repo/meta/x11.xibuild b/repo/meta/repo-x11.xibuild index 1191f8f..1191f8f 100644 --- a/repo/meta/x11.xibuild +++ b/repo/meta/repo-x11.xibuild diff --git a/repo/meta/xi.xibuild b/repo/meta/repo-xi.xibuild index c609816..4d74fc9 100644 --- a/repo/meta/xi.xibuild +++ b/repo/meta/repo-xi.xibuild @@ -2,4 +2,4 @@ # This file was automatically generated, do not edit! DESC="All the the packages available in xi" -DEPS=" sysconfigs xibuild xib xipkg xiutils" +DEPS=" sysconfigs xib xichroot xipkg xiutils" diff --git a/repo/meta/system.xibuild b/repo/meta/system.xibuild deleted file mode 100644 index de9f389..0000000 --- a/repo/meta/system.xibuild +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# This file was automatically generated, do not edit! - -DESC="All the the packages available in system" -DEPS=" acl acpid attr binutils bootscripts brotli bzip2 cacerts sbase dbus dhcp efibootmgr efivar elogind eudev expat findutils freetype2 gc gdbm gettext musl glib gmp gnutls gobject-introspection gperf grub guile gzip iana-etc icu imlib2 intltool js78 kbd kmod krb5 ldns libarchive libcap-ng libcap libffi libgudev libidn libldap liblinear libndp libnghttp libnl libp11-kit libpcap libpipeline libpng libpsl libptytty libsasl libseccomp libsigsegv libssh2 libtasn1 libtirpc libtool libunistring libusb libxcrypt libxml2 libxslt lua lz4 lzo mkinitramfs mpfr mtdev ncurses nettle networkmanager newt nspr nss openssl pahole pam pcre2 perl perl-xml-parser polkit popt psmisc python-mako python-markupsafe python-requests python-six python readline rtmpdump sed shadow slang sysklogd sysvinit tar tcl tomlc99 xxhash xz zip zlib zstd" diff --git a/repo/meta/util.xibuild b/repo/meta/util.xibuild deleted file mode 100644 index 2d4095b..0000000 --- a/repo/meta/util.xibuild +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# This file was automatically generated, do not edit! - -DESC="All the the packages available in util" -DEPS=" acpi bash cpio curl dash diffutils dosfstools dracut e2fsprogs elfutils file fzf gawk genfstab grep groff htop inetutils iproute2 iw keyutils less lm-sensors lynx make-ca man-db neofetch nmap openssh pciutils pm-utils procps-ng rsync sudo unzip usbutils util-linux vim webfs wget which wireless-tools wpa_supplicant" diff --git a/repo/python/python-pyparsing.xibuild b/repo/python/python-pyparsing.xibuild index 9fa74ad..803df1a 100644 --- a/repo/python/python-pyparsing.xibuild +++ b/repo/python/python-pyparsing.xibuild @@ -12,5 +12,5 @@ build() { } package () { - pytho3 setup.py install --root="$PKG_DEST" --optimize=1 + python setup.py install --root="$PKG_DEST" --optimize=1 } diff --git a/repo/media/alsa-oss.xibuild b/repo/skip/alsa-oss.xibuild index 3409c37..48d9672 100644 --- a/repo/media/alsa-oss.xibuild +++ b/repo/skip/alsa-oss.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make" -DEPS="alsa-lib" +DEPS="alsa-lib musl-legacy-compat" DESC="OSS compatibility library" diff --git a/repo/devel/icecream-sundae.xibuild b/repo/skip/icecream-sundae.xibuild index 58f08aa..58f08aa 100644 --- a/repo/devel/icecream-sundae.xibuild +++ b/repo/skip/icecream-sundae.xibuild diff --git a/repo/system/binutils.xibuild b/repo/system/binutils.xibuild index 03880d5..e65314f 100644 --- a/repo/system/binutils.xibuild +++ b/repo/system/binutils.xibuild @@ -44,6 +44,7 @@ build () { --enable-64-bit-bfd \ --enable-plugins \ --enable-relro \ + --enable-install-libiberty \ --enable-deterministic-archives \ --enable-targets=x86_64-pep \ --enable-default-hash-style=gnu \ diff --git a/repo/system/bootscripts.xibuild b/repo/system/bootscripts.xibuild index 72121f9..f133786 100644 --- a/repo/system/bootscripts.xibuild +++ b/repo/system/bootscripts.xibuild @@ -1,7 +1,7 @@ #!/bin/sh -MAKEDEPS="make s6-linux-init s6-rc" -DEPS="sh eudev s6 s6-rc s6-linux-utils s6-protable-utils s6-linux-init" +MAKEDEPS="make s6-linux-init s6-rc utmps" +DEPS="sh eudev s6 s6-rc s6-linux-utils s6-portable-utils s6-linux-init" SOURCE=https://xi.davidovski.xyz/git/bootscripts.git DESC="Bootscripts to initiate the system on boot" @@ -9,46 +9,15 @@ DESC="Bootscripts to initiate the system on boot" package () { make DESTDIR=$PKG_DEST bootscripts - cat > $PKG_DEST/etc/inittab << "EOF" -# Begin /etc/inittab - -id:3:initdefault: - -si::sysinit:/etc/rc.d/init.d/rc S - -l0:0:wait:/etc/rc.d/init.d/rc 0 -l1:S1:wait:/etc/rc.d/init.d/rc 1 -l2:2:wait:/etc/rc.d/init.d/rc 2 -l3:3:wait:/etc/rc.d/init.d/rc 3 -l4:4:wait:/etc/rc.d/init.d/rc 4 -l5:5:wait:/etc/rc.d/init.d/rc 5 -l6:6:wait:/etc/rc.d/init.d/rc 6 - -ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now - -su:S016:once:/sbin/sulogin - -1:2345:respawn:/sbin/agetty --noclear tty1 9600 -2:2345:respawn:/sbin/agetty tty2 9600 -3:2345:respawn:/sbin/agetty tty3 9600 -4:2345:respawn:/sbin/agetty tty4 9600 -5:2345:respawn:/sbin/agetty tty5 9600 -6:2345:respawn:/sbin/agetty tty6 9600 - -# End /etc/inittab -EOF - # Compile a basic database for boot - s6-rc-compile /etc/s6/db/basic /etc/s6/sv - ln -s /etc/s6/db/basic /etc/s6/db/current + s6-rc-compile $PKG_DEST/etc/s6/db/basic $PKG_DEST/etc/s6/sv + ln -s /etc/s6/db/basic $PKG_DEST/etc/s6/db/current # initialize s6 init base. s6-linux-init-maker -1 -t 2 -L \ - -f $PKG_DEST/etc/s6linux-init/skel \ + -f $PKG_DEST/etc/s6/skel \ -p "/usr/bin:/usr/sbin:/bin:/sbin" \ -D default \ -G "/sbin/agetty -L -8 tty1 115200" \ -c $PKG_DEST/etc/s6/base -u root -U utmp $PKG_DEST/etc/s6/base - - } diff --git a/repo/system/cacerts.xibuild b/repo/system/cacerts.xibuild index 40a37f5..9c0198d 100644 --- a/repo/system/cacerts.xibuild +++ b/repo/system/cacerts.xibuild @@ -1,18 +1,24 @@ #!/bin/sh -MAKEDEPS="sbase sed" -DEPS="libnghttp" +MAKEDEPS="sbase bash sed" +DEPS="libnghttp libp11-kit" PKG_VER=1.7 SOURCE=https://github.com/djlucas/make-ca/releases/download/v$PKG_VER/make-ca-$PKG_VER.tar.xz +ADDITIONAL=" + fix-sbase-coreutils.patch +" + DESC="Root certificates needed by ssl built using make-ca" + prepare () { + apply_patches sed -i "s/grep/ggrep/g" make-ca + } package () { - # TODO check why this doesnt package /etc/ssl/certs the first time in some occasions mkdir -p $PKG_DEST/etc/ssl/certs bash make-ca -g --force -D $PKG_DEST chmod -R 777 $PKG_DEST || echo "couldnt change permissions for $PKG_DEST" diff --git a/repo/system/dbus.xibuild b/repo/system/dbus.xibuild index 96f6264..e1a0e72 100644 --- a/repo/system/dbus.xibuild +++ b/repo/system/dbus.xibuild @@ -32,8 +32,8 @@ build () { package () { make DESTDIR=$PKG_DEST install - chown -v root:messagebus $PKG_DEST/usr/libexec/dbus-daemon-launch-helper && - chmod -v 4750 $PKG_DEST/usr/libexec/dbus-daemon-launch-helper + chown root:messagebus $PKG_DEST/usr/libexec/dbus-daemon-launch-helper && + chmod 4750 $PKG_DEST/usr/libexec/dbus-daemon-launch-helper cat > $PKG_DEST/etc/dbus-1/session-local.conf << "EOF" <!DOCTYPE busconfig PUBLIC diff --git a/repo/system/dhcp.xibuild b/repo/system/dhcp.xibuild index aba51fa..b8f5d9d 100644 --- a/repo/system/dhcp.xibuild +++ b/repo/system/dhcp.xibuild @@ -41,9 +41,9 @@ make -j1 package () { make -C client DESTDIR=$PKG_DEST install && - install -v -m755 client/scripts/linux $PKG_DEST/usr/sbin/dhclient-script + install -m755 client/scripts/linux $PKG_DEST/usr/sbin/dhclient-script - install -vdm755 /etc/dhcp && + install -dm755 /etc/dhcp && cat > $PKG_DEST/etc/dhcp/dhclient.conf << "EOF" # Begin /etc/dhcp/dhclient.conf # @@ -63,7 +63,7 @@ require subnet-mask, domain-name-servers; # End /etc/dhcp/dhclient.conf EOF - install -v -dm 755 $PKG_DEST/var/lib/dhclient + install -dm 755 $PKG_DEST/var/lib/dhclient tar xf $BOOTSCRIPTS.tar.xz cd $BOOTSCRIPTS diff --git a/repo/system/efivar.xibuild b/repo/system/efivar.xibuild index 5bbe926..2b5b666 100644 --- a/repo/system/efivar.xibuild +++ b/repo/system/efivar.xibuild @@ -5,14 +5,25 @@ DEPS="musl" PKG_VER=37 SOURCE=https://github.com/rhboot/efivar/releases/download/$PKG_VER/efivar-$PKG_VER.tar.bz2 + ADDITIONAL=" - https://www.linuxfromscratch.org/patches/blfs/svn/efivar-$PKG_VER-gcc_9-1.patch - " + patches/musl-bswap.patch + patches/efivar-fix-format_guid.patch + patches/efivar-fix-packed.patch + patches/efivar-fix-ucs2.patch +" DESC="Tools and libraries to manupulate EFI variables" -prepare () { - patch -Np1 -i efivar-$PKG_VER-gcc_9-1.patch +prepare() { + apply_patches + + # remove verbosity in ln commands + for f in Makefile src/Makefile src/test/Makefile docs/Makefile Make.rules; do + echo "patching $f" + sed -i "s@-vfs@-fs@g" $f + sed -i "s@-rfv@-rf@g" $f + done } build () { diff --git a/repo/system/elfutils.xibuild b/repo/system/elfutils.xibuild new file mode 100644 index 0000000..a68827f --- /dev/null +++ b/repo/system/elfutils.xibuild @@ -0,0 +1,54 @@ +#!/bin/sh + +MAKEDEPS="bison flex zlib bzip2 xz argp-standalone libtool fts musl-obstack" +DEPS="musl zlib" + +PKG_VER=0.186 +SOURCE=https://sourceware.org/elfutils/ftp/$PKG_VER/elfutils-$PKG_VER.tar.bz2 +ADDITIONAL=" + files/error.h + patches/fix-aarch64_fregs.patch + patches/fix-uninitialized.patch + patches/musl-macros.patch + patches/musl-strndupa.patch + patches/musl-asm-ptrace-h.patch +" + +DESC="Utilities and DSOs to handle ELF files and DWARF data" + +prepare () { + apply_patches + + cp error.h lib + cp error.h src + + cat > lib/libintl.h <<-EOF + #ifndef LIBINTL_H + #define LIBINTL_H + #define _(x) (x) + #endif + EOF + +} + +build () { + CFLAGS="$CFLAGS -Wno-error -Wno-null-dereference" \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --disable-werror \ + --program-prefix=eu- \ + --enable-deterministic-archives \ + --disable-nls \ + --disable-libdebuginfod \ + --disable-debuginfod + make +} + +package() { + make DESTDIR=$PKG_DEST install + rm -r "$PKG_DEST"/usr/lib/libelf.so.* + rm -r "$PKG_DEST"/usr/include/libelf.h +} diff --git a/repo/system/gmp.xibuild b/repo/system/gmp.xibuild index c3f14ee..0bfd3f4 100644 --- a/repo/system/gmp.xibuild +++ b/repo/system/gmp.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make perl" -DEPS="bash procps-ng" +DEPS="sh procps-ng" PKG_VER=6.2.1 SOURCE=https://gmplib.org/download/gmp/gmp-$PKG_VER.tar.xz diff --git a/repo/system/grub.xibuild b/repo/system/grub.xibuild index 7bedae9..cf224bb 100644 --- a/repo/system/grub.xibuild +++ b/repo/system/grub.xibuild @@ -15,7 +15,7 @@ DESC="GNU GRand Unified Bootloader v2" prepare () { gunzip -c unifont-13.0.06.pcf.gz > $PKG_DEST/usr/share/fonts/unifont/unifont.pcf - unset {C,CPP,CXX,LD}FLAGS + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS } build () { @@ -26,6 +26,6 @@ build () { package () { make DESTDIR=$PKG_DEST install - mkdir -pv $PKG_DEST/usr/share/bash-completion/completions - mv -v $PKG_DEST/etc/bash_completion.d/grub $PKG_DEST/usr/share/bash-completion/completions + mkdir -p $PKG_DEST/usr/share/bash-completion/completions + mv $PKG_DEST/etc/bash_completion.d/grub $PKG_DEST/usr/share/bash-completion/completions } diff --git a/repo/system/gzip.xibuild b/repo/system/gzip.xibuild index d82471d..8e3c78a 100644 --- a/repo/system/gzip.xibuild +++ b/repo/system/gzip.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make " -DEPS="musl bash less" +DEPS="musl sh less" PKG_VER=1.11 SOURCE=https://ftp.gnu.org/gnu/gzip/gzip-$PKG_VER.tar.xz diff --git a/repo/system/imlib2.xibuild b/repo/system/imlib2.xibuild index 7d57dff..5e734a5 100644 --- a/repo/system/imlib2.xibuild +++ b/repo/system/imlib2.xibuild @@ -15,7 +15,8 @@ build () { package () { make DESTDIR=$PKG_DEST install - install -v -m755 -d /usr/share/doc/imlib2-$PKG_VER && - install -v -m644 doc/{*.gif,index.html} /usr/share/doc/imlib2-$PKG_VER + install -m755 -d /usr/share/doc/imlib2-$PKG_VER && + install -m644 doc/index.html /usr/share/doc/imlib2-$PKG_VER + install -m644 doc/*.gif /usr/share/doc/imlib2-$PKG_VER } diff --git a/repo/system/intltool.xibuild b/repo/system/intltool.xibuild index 7530db9..da4d84d 100644 --- a/repo/system/intltool.xibuild +++ b/repo/system/intltool.xibuild @@ -18,5 +18,5 @@ check () { package () { make DESTDIR=$PKG_DEST install - install -v -Dm644 doc/I18N-HOWTO $PKG_DEST/usr/share/doc/intltool-$PKG_VER/I18N-HOWTO + install -Dm644 doc/I18N-HOWTO $PKG_DEST/usr/share/doc/intltool-$PKG_VER/I18N-HOWTO } diff --git a/repo/system/js78.xibuild b/repo/system/js78.xibuild index 26716d9..199740a 100644 --- a/repo/system/js78.xibuild +++ b/repo/system/js78.xibuild @@ -6,10 +6,10 @@ DEPS="readline nspr bash zlib" PKG_VER=78.15.0 SOURCE=https://archive.mozilla.org/pub/firefox/releases/${PKG_VER}esr/source/firefox-${PKG_VER}esr.source.tar.xz ADDITIONAL=" - patches/js78/disable-jslint.patch - patches/js78/fd6847c9416f9eebde636e21d794d25d1be8791d.patch - patches/js78/fix-musl-build.patch - patches/js78/fix-python3.10-compilation.patch + patches/disable-jslint.patch + patches/fd6847c9416f9eebde636e21d794d25d1be8791d.patch + patches/fix-musl-build.patch + patches/fix-python3.10-compilation.patch " DESC="JavaScript interpreter and libraries - Version 78" @@ -49,7 +49,7 @@ build () { --disable-strip - make -j1 + make } check () { diff --git a/repo/system/libcap.xibuild b/repo/system/libcap.xibuild index f3a5ee3..dab917e 100644 --- a/repo/system/libcap.xibuild +++ b/repo/system/libcap.xibuild @@ -10,6 +10,7 @@ DESC="POSIX 1003.1e capabilities" prepare () { sed -i '/install -m.*STA/d' libcap/Makefile + sed -i 's/xargs -e/xargs /g' pam_cap/Makefile } build () { diff --git a/repo/system/libdwarf.xibuild b/repo/system/libdwarf.xibuild new file mode 100644 index 0000000..66aec4f --- /dev/null +++ b/repo/system/libdwarf.xibuild @@ -0,0 +1,25 @@ +#!/bin/sh + +MAKEDEPS="elfutils zlib" +DEPS="musl zlib libelf" + +PKG_VER=20210528 +SOURCE=http://www.prevanders.net/libdwarf-$PKG_VER.tar.gz +DESC="Parsing library for DWARF2 and later debugging file format" + +build () { + ./configure \ + --prefix=/usr \ + --enable-shared \ + --enable-dwarfgen + make +} + +check () { + make check +} + + +package () { + make DESTDIR=$PKG_DEST install +} diff --git a/repo/system/libelf.xibuild b/repo/system/libelf.xibuild index 52d9f7c..5ec93b0 100644 --- a/repo/system/libelf.xibuild +++ b/repo/system/libelf.xibuild @@ -14,7 +14,7 @@ prepare() { cp error.h lib/ cp error.h src/ - autoreconf -ifv + autoreconf -if } diff --git a/repo/system/liblinear.xibuild b/repo/system/liblinear.xibuild index de47b0e..7a20846 100644 --- a/repo/system/liblinear.xibuild +++ b/repo/system/liblinear.xibuild @@ -12,8 +12,9 @@ build () { } package () { - mkdir -pv ${PKG_DEST}/usr/{include,lib} - install -vm644 linear.h $PKG_DEST/usr/include && - install -vm755 liblinear.so.4 $PKG_DEST/usr/lib && - ln -sfv liblinear.so.4 $PKG_DEST/usr/lib/liblinear.so + mkdir -p ${PKG_DEST}/usr/include + mkdir -p ${PKG_DEST}/usr/lib + install -m644 linear.h $PKG_DEST/usr/include && + install -m755 liblinear.so.4 $PKG_DEST/usr/lib && + ln -sf liblinear.so.4 $PKG_DEST/usr/lib/liblinear.so } diff --git a/repo/system/lua.xibuild b/repo/system/lua.xibuild index 6a9d521..c8c992f 100644 --- a/repo/system/lua.xibuild +++ b/repo/system/lua.xibuild @@ -43,16 +43,17 @@ build () { } package () { - make install make INSTALL_TOP=/usr \ - DESTDIR=$PKG_DEST \ - INSTALL_DATA="cp -d" \ - INSTALL_MAN=/usr/share/man/man1 \ - TO_LIB="liblua.so liblua.so.${PKG_VER} liblua.so.5.4.4" \ - install && - - mkdir -pv $PKG_DEST/usr/share/doc/lua-$PKG_VER && - cp -v doc/*.{html,css,gif,png} $PKG_DEST/usr/share/doc/lua-$PKG_VER && - - install -v -m644 -D lua.pc $PKG_DEST/usr/lib/pkgconfig/lua.pc + DESTDIR=$PKG_DEST \ + INSTALL="install" \ + INSTALL_MAN=/usr/share/man/man1 \ + TO_LIB="liblua.so liblua.so.${PKG_VER} liblua.so.5.4.4" \ + install && + + mkdir -p $PKG_DEST/usr/share/doc/lua-$PKG_VER && + for s in html css gif png; do + cp doc/*.$s $PKG_DEST/usr/share/doc/lua-$PKG_VER + done + + install -m644 -D lua.pc $PKG_DEST/usr/lib/pkgconfig/lua.pc } diff --git a/repo/system/musl-legacy-compat.xibuild b/repo/system/musl-legacy-compat.xibuild index 33d0e45..00ecaa1 100644 --- a/repo/system/musl-legacy-compat.xibuild +++ b/repo/system/musl-legacy-compat.xibuild @@ -15,7 +15,7 @@ DESC="Legacy compatibility headers for musl" package () { for h in cdefs queue tree do - install -v -D -m644 $h.h $PKG_DEST/usr/include/sys + install -D -m644 $h.h $PKG_DEST/usr/include/sys done } diff --git a/repo/system/networkmanager.xibuild b/repo/system/networkmanager.xibuild index 7abd804..63400e0 100644 --- a/repo/system/networkmanager.xibuild +++ b/repo/system/networkmanager.xibuild @@ -4,7 +4,7 @@ MAKEDEPS="grep meson ninja python intltool glib" DEPS="jansson libndp curl wpa_supplicant newt nss polkit libpsl audit dbus gobject-introspection dhcp" PKG_VER=1.35.5 -SOURCE=https://download.gnome.org/sources/NetworkManager/$(echo $PKG_VER | cut -d. -f-2)/NetworkManager-$PKG_VER.tar.xz +SOURCE=https://download.gnome.org/sources/NetworkManager/${PKG_VER%.*}/NetworkManager-$PKG_VER.tar.xz BOOTSCRIPTS=blfs-bootscripts-20210826 ADDITIONAL=" @@ -14,7 +14,7 @@ ADDITIONAL=" DESC="Network connection manager and user applications" prepare () { - grep -rl '^#!.*python$' | xargs sed -i '1s/python/&3/' + ggrep -rl '^#!.*python$' | xargs sed -i '1s/python/&3/' dbus-uuidgen --ensure } @@ -22,7 +22,6 @@ build () { mkdir build && cd build && - CXXFLAGS+="-O2 -fPIC" \ meson --prefix=/usr \ --buildtype=release \ -Dlibaudit=no \ @@ -42,7 +41,8 @@ build () { package () { DESTDIR=$PKG_DEST ninja install && - mv -v $PKG_DEST/usr/share/doc/NetworkManager{,-$PKG_VER} + mv $PKG_DEST/usr/share/doc/NetworkManager \ + $PKG_DEST/usr/share/doc/NetworkManager-$PKG_VER} # create minimum config file cat >> $PKG_DEST/etc/NetworkManager/NetworkManager.conf << "EOF" diff --git a/repo/system/nss.xibuild b/repo/system/nss.xibuild index 06b70d0..5d549e7 100644 --- a/repo/system/nss.xibuild +++ b/repo/system/nss.xibuild @@ -7,6 +7,13 @@ PKG_VER=3.74 SOURCE=https://archive.mozilla.org/pub/security/nss/releases/NSS_$(echo $PKG_VER | sed 's/\./_/g')_RTM/src/nss-$PKG_VER.tar.gz +ADDITIONAL=" + nss-util.pc.in + nss-softokn.pc.in + nss-config.in + nss.pc.in +" + DESC="Network Security Services" build () { @@ -46,4 +53,21 @@ package () { install -m644 Linux*/lib/pkgconfig/nss.pc $PKG_DEST/usr/lib/pkgconfig ln -sf ./pkcs11/p11-kit-trust.so $PKG_DEST/usr/lib/libnssckbi.so + + cd .. + local _pc; for _pc in nss.pc nss-util.pc nss-softokn.pc; do + sed $_pc.in \ + -e "s,%libdir%,/usr/lib,g" \ + -e "s,%prefix%,/usr,g" \ + -e "s,%exec_prefix%,/usr/bin,g" \ + -e "s,%includedir%,/usr/include/nss,g" \ + -e "s,%SOFTOKEN_VERSION%,$PKG_VER,g" \ + -e "s,%NSPR_VERSION%,$PKG_VER,g" \ + -e "s,%NSS_VERSION%,$PKG_VER,g" \ + -e "s,%NSSUTIL_VERSION%,$PKG_VER,g" \ + > "$PKG_DEST"/usr/lib/pkgconfig/$_pc + done + ln -sf nss.pc "$PKG_DEST"/usr/lib/pkgconfig/mozilla-nss.pc + chmod 644 "$PKG_DEST"/usr/lib/pkgconfig/*.pc + } diff --git a/repo/system/openssl.xibuild b/repo/system/openssl.xibuild index 396710b..b30ea90 100644 --- a/repo/system/openssl.xibuild +++ b/repo/system/openssl.xibuild @@ -15,6 +15,6 @@ build () { package () { sed -i '/INSTALL_LIBS/s/libcrypto.a libssl.a//' Makefile make MANSUFFIX=ssl DESTDIR=$PKG_DEST install - mkdir -pv $PKG_DEST/usr/share/doc/openssl - cp -vfr doc/* $PKG_DEST/usr/share/doc/openssl + mkdir -p $PKG_DEST/usr/share/doc/openssl + cp -fr doc/* $PKG_DEST/usr/share/doc/openssl } diff --git a/repo/system/pahole.xibuild b/repo/system/pahole.xibuild index e9b4f99..6b57291 100644 --- a/repo/system/pahole.xibuild +++ b/repo/system/pahole.xibuild @@ -1,26 +1,22 @@ #!/bin/sh -MAKEDEPS="cmake python make " -DEPS="libelf python" +MAKEDEPS="cmake-modules python make " +DEPS="libelf python elfutils libdwarf musl-obstack argp-standalone libbpf" -PKG_VER=1.23 +PKG_VER=1.22 SOURCE=https://git.kernel.org/pub/scm/devel/pahole/pahole.git BRANCH=v$PKG_VER DESC="Pahole and other DWARF Utils" build () { - cmake -S . -B build \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=None \ - -D__LIB=lib + cmake -B build -G Ninja . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=None \ + -D__LIB=lib cmake --build build } package () { DESTDIR="$PKG_DEST" cmake --install build - - - python -m compileall -d / "$PKG_DEST" - python -O -m compileall -d / "$PKG_DEST" } diff --git a/repo/system/pcre2.xibuild b/repo/system/pcre2.xibuild index 4f9b783..770ad58 100644 --- a/repo/system/pcre2.xibuild +++ b/repo/system/pcre2.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make " -DEPS="musl readline zlib bzip2 bash" +DEPS="musl readline zlib bzip2 sh" PKG_VER=10.39 SOURCE=https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$PKG_VER/pcre2-$PKG_VER.tar.gz diff --git a/repo/system/polkit.xibuild b/repo/system/polkit.xibuild index 567e316..de414cc 100644 --- a/repo/system/polkit.xibuild +++ b/repo/system/polkit.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="git gobject-introspection meson libxslt patch elogind" +MAKEDEPS="git gobject-introspection meson libxslt patch elogind gtk-doc autoconf-archive" DEPS="expat glib js78 pam" PKG_VER=0.120 @@ -8,42 +8,46 @@ SOURCE=https://www.freedesktop.org/software/polkit/releases/polkit-$PKG_VER.tar. DESC="Application development toolkit for controlling system-wide privileges" +ADDITIONAL=" + files/polkit-1 + patches/CVE-2021-4034.patch + patches/make-innetgr-optional.patch +" + prepare () { - sed '/0,/s/^/#/' -i meson_post_install.py && - sed '/policy,/d' -i actions/meson.build \ - -i src/examples/meson.build + apply_patches + autoreconf -fi } build () { mkdir build && cd build && - # TODO fix man - meson --prefix=/usr \ - -Dman=false \ - -Dsession_tracking=libelogind \ - -Dsystemdsystemunitdir=/tmp \ - --buildtype=release \ - .. && - ninja + ../configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --libexecdir=/usr/lib/polkit-1 \ + --localstatedir=/var \ + --disable-static \ + --enable-introspection \ + --with-authfw=pam \ + --with-os-type=alpine \ + --disable-gtk-doc \ + --disable-gtk-doc-html \ + --disable-gtk-doc-pdf \ + --disable-libelogind \ + --disable-systemd \ + --enable-libsystemd-login + make } package () { - DESTDIR=$PKG_DEST ninja install && - - - cat > $PKG_DEST/etc/pam.d/polkit-1 << "EOF" -# Begin /etc/pam.d/polkit-1 - -auth include system-auth -account include system-account -password include system-password -session include system-session - -# End /etc/pam.d/polkit-1 -EOF - + make DESTDIR=$PKG_DEST install && + cd .. && + install -m644 polkit-1 $PKG_DEST/etc/pam.d/polkit-1 } postinstall() { diff --git a/repo/system/psmisc.xibuild b/repo/system/psmisc.xibuild index ed3ba78..61d767f 100644 --- a/repo/system/psmisc.xibuild +++ b/repo/system/psmisc.xibuild @@ -1,14 +1,13 @@ #!/bin/sh -MAKEDEPS="make" +MAKEDEPS="make gettext-tiny libintl" DEPS="ncurses" PKG_VER=23.4 -SOURCE=https://gitlab.com/psmisc/psmisc/-/archive/v$PKG_VER/psmisc-v$PKG_VER.tar.gz +SOURCE=https://downloads.sourceforge.net/psmisc/psmisc-$PKG_VER.tar.xz DESC="Miscellaneous procfs tools" build () { - ./autogen.sh ./configure --prefix=/usr make } diff --git a/repo/system/rtmpdump.xibuild b/repo/system/rtmpdump.xibuild index a994c34..cac7356 100644 --- a/repo/system/rtmpdump.xibuild +++ b/repo/system/rtmpdump.xibuild @@ -17,9 +17,9 @@ build () { } package () { - mkdir -pv $PKG_DEST/usr/bin - mkdir -pv $PKG_DEST/usr/share - mkdir -pv $PKG_DEST/usr/lib/pkgconfig + mkdir -p $PKG_DEST/usr/bin + mkdir -p $PKG_DEST/usr/share + mkdir -p $PKG_DEST/usr/lib/pkgconfig make \ prefix='/usr' \ sbindir='/usr/bin' \ diff --git a/repo/system/s6-linux-init.xibuild b/repo/system/s6-linux-init.xibuild index 737aed3..fa68b90 100644 --- a/repo/system/s6-linux-init.xibuild +++ b/repo/system/s6-linux-init.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make" -DEPS="s6 skalibs" +DEPS="s6 skalibs nsss" PKG_VER=1.0.7.0 SOURCE=https://skarnet.org/software/s6-linux-init/s6-linux-init-$PKG_VER.tar.gz @@ -16,7 +16,7 @@ build () { --libdir=/usr/lib \ --libexecdir=/usr/lib/s6-linux-init \ --with-dynlib=/usr/lib \ - --enable-utmps ${OPARG} + --enable-utmps make } diff --git a/repo/system/sysklogd.xibuild b/repo/system/sysklogd.xibuild index 6c9393d..ac71d5f 100644 --- a/repo/system/sysklogd.xibuild +++ b/repo/system/sysklogd.xibuild @@ -13,7 +13,7 @@ build () { package () { make DESTDIR=$PKG_DEST install - mkdir -pv $PKG_DEST/etc + mkdir -p $PKG_DEST/etc cat > $PKG_DEST/etc/syslog.conf << "EOF" # Begin /etc/syslog.conf diff --git a/repo/system/tomlc99.xibuild b/repo/system/tomlc99.xibuild index b6b6f63..6387c96 100644 --- a/repo/system/tomlc99.xibuild +++ b/repo/system/tomlc99.xibuild @@ -12,7 +12,8 @@ build () { } package () { - mkdir -pv $PKG_DEST/usr/{include,lib} + mkdir -p $PKG_DEST/usr/lib + mkdir -p $PKG_DEST/usr/include install toml.h $PKG_DEST/usr/include install libtoml.so.$PKG_VER $PKG_DEST/usr/lib ln -s libtoml.so.$PKG_VER $PKG_DEST/usr/lib/libtoml.so diff --git a/repo/system/utmps.xibuild b/repo/system/utmps.xibuild index 0d45319..c92c210 100644 --- a/repo/system/utmps.xibuild +++ b/repo/system/utmps.xibuild @@ -32,4 +32,14 @@ Requires.private: skalibs Libs: -lutmps Cflags: -I/usr/include/utmps EOF + + #ln -s utmps/wtmp /var/log/wtmp +} + +postinstall () { + useradd -c "utmps user" -d /run/utmps \ + -u 984 -g utmp -s /bin/false utmp + [ -d /var/log/utmps ] || mkdir -p /var/log/utmps + chown -R utmp:utmp /var/log/utmps + } diff --git a/repo/util/cpio.xibuild b/repo/util/cpio.xibuild index 8aa3a45..2c3a41d 100644 --- a/repo/util/cpio.xibuild +++ b/repo/util/cpio.xibuild @@ -23,10 +23,12 @@ build () { package () { make DESTDIR=$PKG_DEST install && - install -v -m755 -d $PKG_DEST/usr/share/doc/cpio-2.13/html && - install -v -m644 doc/html/* \ - $PKG_DEST/usr/share/doc/cpio-2.13/html && - install -v -m644 doc/cpio.{html,txt} \ - $PKG_DEST/usr/share/doc/cpio-2.13 + install -m755 -d $PKG_DEST/usr/share/doc/cpio-$PKG_VER/html && + install -m644 doc/html/* \ + $PKG_DEST/usr/share/doc/cpio-$PKG_VER/html && + install -m644 doc/cpio.txt \ + $PKG_DEST/usr/share/doc/cpio-$PKG_VER + install -m644 doc/cpio.html \ + $PKG_DEST/usr/share/doc/cpio-$PKG_VER } diff --git a/repo/util/diffutils.xibuild b/repo/util/diffutils.xibuild index 08a5a39..0087a0d 100644 --- a/repo/util/diffutils.xibuild +++ b/repo/util/diffutils.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make" -DEPS="musl bash" +DEPS="musl sh" PKG_VER=3.8 SOURCE=https://ftp.gnu.org/gnu/diffutils/diffutils-$PKG_VER.tar.xz diff --git a/repo/util/dracut.xibuild b/repo/util/dracut.xibuild index 17d514e..30b8641 100644 --- a/repo/util/dracut.xibuild +++ b/repo/util/dracut.xibuild @@ -1,12 +1,19 @@ #!/bin/sh -MAKEDEPS="make asciidoc" +MAKEDEPS="make asciidoc musl-fts" DEPS="bash sbase cpio findutils grep gzip kmod pkgconf procps-ng sed util-linux xz" DESC="An initramfs infastructure aimin gto have as little possible hardcoded into the initramfs" PKG_VER=055 SOURCE=https://mirrors.edge.kernel.org/pub/linux/utils/boot/dracut/dracut-$PKG_VER.tar.xz +ADDITIONAL=" + fix-sbase-coreutils.patch +" + +prepare () { + apply_patches +} build () { ./configure --prefix=/usr diff --git a/repo/util/fzf.xibuild b/repo/util/fzf.xibuild index a149337..a144f28 100644 --- a/repo/util/fzf.xibuild +++ b/repo/util/fzf.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="git go" -DEPS="bash" +DEPS="sh" PKG_VER=0.29.0 SOURCE=https://github.com/junegunn/fzf.git diff --git a/repo/util/genfstab.xibuild b/repo/util/genfstab.xibuild index c263b32..46249a3 100644 --- a/repo/util/genfstab.xibuild +++ b/repo/util/genfstab.xibuild @@ -7,8 +7,17 @@ PKG_VER=24 SOURCE=https://github.com/archlinux/arch-install-scripts.git BRANCH=v$PKG_VER +ADDITIONAL=" + remove-extra-flags.patch +" + DESC="A tool for generating /etc/fstab files from archlinux" + +prepare () { + apply_patches +} + package () { make PREFIX=/usr BINPROGS=genfstab MANS=doc/genfstab.8 DESTDIR=$PKG_DEST install } diff --git a/repo/util/iproute2.xibuild b/repo/util/iproute2.xibuild index e5a9c78..3d0062d 100644 --- a/repo/util/iproute2.xibuild +++ b/repo/util/iproute2.xibuild @@ -8,8 +8,7 @@ DESC="IP Routing Utilities" build () { sed -i /ARPD/d Makefile - rm -fv man/man8/arpd.8 - + rm -f man/man8/arpd.8 make } diff --git a/repo/util/lm-sensors.xibuild b/repo/util/lm-sensors.xibuild index 71add17..c301161 100644 --- a/repo/util/lm-sensors.xibuild +++ b/repo/util/lm-sensors.xibuild @@ -21,7 +21,7 @@ package () { BUILD_STATIC_LIB=0 \ MANDIR=/usr/share/man install && - install -v -m755 -d /usr/share/doc/lm_sensors-$PKG_VER && - cp -rv README INSTALL doc/* \ + install -m755 -d /usr/share/doc/lm_sensors-$PKG_VER && + cp -r README INSTALL doc/* \ /usr/share/doc/lm_sensors-$PKG_VER } diff --git a/repo/util/pciutils.xibuild b/repo/util/pciutils.xibuild index 9ae5311..8eaa657 100644 --- a/repo/util/pciutils.xibuild +++ b/repo/util/pciutils.xibuild @@ -19,9 +19,9 @@ package () { SHAREDIR=/usr/share/hwdata \ SHARED=yes \ install install-lib && - chmod -v 755 $PKG_DEST/usr/lib/libpci.so + chmod 755 $PKG_DEST/usr/lib/libpci.so - mkdir -pv $PKG_DEST/etc/cron.weekly/ + mkdir -p $PKG_DEST/etc/cron.weekly/ cat > $PKG_DEST/etc/cron.weekly/update-pciids.sh << "EOF" && #!/bin/sh /usr/sbin/update-pciids diff --git a/repo/util/sudo.xibuild b/repo/util/sudo.xibuild index 3f54bfa..7d0ba6e 100644 --- a/repo/util/sudo.xibuild +++ b/repo/util/sudo.xibuild @@ -21,14 +21,14 @@ build () { package () { make DESTDIR=$PKG_DEST install && - ln -sfv libsudo_util.so.0.0.0 $PKG_DEST/usr/lib/sudo/libsudo_util.so.0 + ln -sf libsudo_util.so.0.0.0 $PKG_DEST/usr/lib/sudo/libsudo_util.so.0 cat > $PKG_DEST/etc/sudoers.d/00-sudo << "EOF" Defaults secure_path="/usr/sbin:/usr/bin" %wheel ALL="ALL" ALL EOF - mkdir -pv $PKG_DEST/etc/pam.d + mkdir -p $PKG_DEST/etc/pam.d cat > $PKG_DEST/etc/pam.d/sudo << "EOF" # Begin /etc/pam.d/sudo diff --git a/repo/util/unzip.xibuild b/repo/util/unzip.xibuild index 51bbff7..d3fea41 100644 --- a/repo/util/unzip.xibuild +++ b/repo/util/unzip.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make" -DEPS="bzip2 bash" +DEPS="bzip2 sh" PKG_VER=60 SOURCE=https://downloads.sourceforge.net/infozip/unzip$PKG_VER.tar.gz diff --git a/repo/util/webfs.xibuild b/repo/util/webfs.xibuild index 5b09682..ab76812 100644 --- a/repo/util/webfs.xibuild +++ b/repo/util/webfs.xibuild @@ -7,11 +7,14 @@ PKG_VER=1.21 SOURCE=https://www.kraxel.org/releases/webfs/webfs-$PKG_VER.tar.gz DESC="A simple instant server for static http content" +prepare () { + mv GNUmakefile Makefile +} + build() { - ./configure --prefix=/usr make } package () { - make DESTDIR=$PKG_DEST install + make prefix=/usr DESTDIR=$PKG_DEST install } diff --git a/repo/util/wireless-tools.xibuild b/repo/util/wireless-tools.xibuild index e461eb2..dc7e19f 100644 --- a/repo/util/wireless-tools.xibuild +++ b/repo/util/wireless-tools.xibuild @@ -13,6 +13,7 @@ ADDITIONAL=" prepare () { sed -i "s/ldconfig/echo/g" Makefile + sed -i "s/ln -sfn/ln -sf/g" Makefile patch -Np1 -i wireless_tools-$PKG_VER-fix_iwlist_scanning-1.patch } diff --git a/repo/util/wpa_supplicant.xibuild b/repo/util/wpa_supplicant.xibuild index b79237e..a9dca1f 100644 --- a/repo/util/wpa_supplicant.xibuild +++ b/repo/util/wpa_supplicant.xibuild @@ -53,15 +53,19 @@ build () { } package () { - mkdir -pv $PKG_DEST/usr/sbin - mkdir -pv $PKG_DEST/usr/share/dbus-1/system-services - install -v -m755 wpa_{cli,passphrase,supplicant} $PKG_DEST/usr/sbin/ && - install -v -m644 doc/docbook/wpa_supplicant.conf.5 $PKG_DEST/usr/share/man/man5/ && - install -v -m644 doc/docbook/wpa_{cli,passphrase,supplicant}.8 $PKG_DEST/usr/share/man/man8/ - install -v -m644 dbus/fi.w1.wpa_supplicant1.service \ + mkdir -p $PKG_DEST/usr/sbin + mkdir -p $PKG_DEST/usr/share/dbus-1/system-services + install -m755 wpa_cli $PKG_DEST/usr/sbin/ && + install -m755 wpa_passphrase $PKG_DEST/usr/sbin/ && + install -m755 wpa_supplicant $PKG_DEST/usr/sbin/ && + install -m644 doc/docbook/wpa_supplicant.conf.5 $PKG_DEST/usr/share/man/man5/ && + install -m644 doc/docbook/wpa_cli.8 $PKG_DEST/usr/share/man/man8/ + install -m644 doc/docbook/wpa_passphrase.8 $PKG_DEST/usr/share/man/man8/ + install -m644 doc/docbook/wpa_supplicant.8 $PKG_DEST/usr/share/man/man8/ + install -m644 dbus/fi.w1.wpa_supplicant1.service \ $PKG_DEST/usr/share/dbus-1/system-services/ && - install -v -d -m755 $PKG_DEST/etc/dbus-1/system.d && - install -v -m644 dbus/dbus-wpa_supplicant.conf \ + install -d -m755 $PKG_DEST/etc/dbus-1/system.d && + install -m644 dbus/dbus-wpa_supplicant.conf \ $PKG_DEST/etc/dbus-1/system.d/wpa_supplicant.conf cd .. diff --git a/repo/x11/xf86-input-libinput.xibuild b/repo/x11/xf86-input-libinput.xibuild index 1886e84..9385bc0 100644 --- a/repo/x11/xf86-input-libinput.xibuild +++ b/repo/x11/xf86-input-libinput.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make" -DEPS="libinput" +DEPS="libinput xorg-server" DESC="Generic input driver for the X.Org server based on libinput" diff --git a/repo/x11/xf86-video-intel.xibuild b/repo/x11/xf86-video-intel.xibuild index bd806eb..2b46e0c 100644 --- a/repo/x11/xf86-video-intel.xibuild +++ b/repo/x11/xf86-video-intel.xibuild @@ -21,12 +21,12 @@ build () { package () { make DESTDIR=$PKG_DEST install - mkdir -pv $PKG_DEST/usr/share/man/man1 - mv -v $PKG_DEST/usr/share/man/man4/intel-virtual-output.4 \ + mkdir -p $PKG_DEST/usr/share/man/man1 + mv $PKG_DEST/usr/share/man/man4/intel-virtual-output.4 \ $PKG_DEST/usr/share/man/man1/intel-virtual-output.1 && sed -i '/\.TH/s/4/1/' $PKG_DEST/usr/share/man/man1/intel-virtual-output.1 - mkdir -pv $PKG_DEST/etc/X11/xorg.conf.d + mkdir -p $PKG_DEST/etc/X11/xorg.conf.d cat >> $PKG_DEST/etc/X11/xorg.conf.d/20-intel.conf << "EOF" Section "Device" Identifier "Intel Graphics" diff --git a/repo/x11/xf86-video-nouveau.xibuild b/repo/x11/xf86-video-nouveau.xibuild index 501a80d..7e276a9 100644 --- a/repo/x11/xf86-video-nouveau.xibuild +++ b/repo/x11/xf86-video-nouveau.xibuild @@ -9,8 +9,7 @@ PKG_VER=1.0.17 SOURCE=https://www.x.org/pub/individual/driver/xf86-video-nouveau-$PKG_VER.tar.bz2 prepare () { - grep -rl slave | xargs sed -i s/slave/secondary/ - + ggrep -rl slave | xargs sed -i s/slave/secondary/ } build () { diff --git a/repo/x11/xorg-server.xibuild b/repo/x11/xorg-server.xibuild index f3f9799..c65f6fe 100644 --- a/repo/x11/xorg-server.xibuild +++ b/repo/x11/xorg-server.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="meson ninja doxygen xmlto fop" -DEPS="libxcvt pixman font-util xkeyboardconfig elogind libepoxy libtirpc polkit acpid nettle libgcrypt xcb-util-keysyms xcb-util-image xcb-util-renderutil xcb-util-wm xkbcomp xf86-input-libinput" +DEPS="libxcvt pixman font-util xkeyboardconfig elogind libepoxy libtirpc polkit acpid nettle libgcrypt xcb-util-keysyms xcb-util-image xcb-util-renderutil xcb-util-wm xkbcomp" PKG_VER=21.1.3 SOURCE=https://www.x.org/pub/individual/xserver/xorg-server-$PKG_VER.tar.xz @@ -19,8 +19,8 @@ build () { package () { DESTDIR=$PKG_DEST ninja install - mkdir -pv $PKG_DEST/etc/X11/xorg.conf.d && - mkdir -pv $PKG_DEST/etc/sysconfig && + mkdir -p $PKG_DEST/etc/X11/xorg.conf.d && + mkdir -p $PKG_DEST/etc/sysconfig && cat >> $PKG_DEST/etc/sysconfig/createfiles << "EOF" /tmp/.ICE-unix dir 1777 root root /tmp/.X11-unix dir 1777 root root diff --git a/repo/xi/sysconfigs.xibuild b/repo/xi/sysconfigs.xibuild index a75655e..92acddb 100644 --- a/repo/xi/sysconfigs.xibuild +++ b/repo/xi/sysconfigs.xibuild @@ -7,8 +7,8 @@ PKG_VER=N/A DESC="Default system configs for xilinux" package () { - mkdir -pv $PKG_DEST/etc/ - mkdir -pv $PKG_DEST/etc/sysconfig + mkdir -p $PKG_DEST/etc/ + mkdir -p $PKG_DEST/etc/sysconfig cat > $PKG_DEST/etc/sysconfig/rc.site << "EOF" # rc.site diff --git a/repo/xi/xib.xibuild b/repo/xi/xib.xibuild index 3c1f877..52ebdb9 100644 --- a/repo/xi/xib.xibuild +++ b/repo/xi/xib.xibuild @@ -1,12 +1,12 @@ #!/bin/sh MAKEDEPS="" -DEPS="xichroot xiutils git tar unzip" +DEPS="xichroot xipkg xiutils git tar unzip" SOURCE=https://git.davidovski.xyz/xilinux/xib.git DESC="The XiBuild system" package () { - mkdir -pv $PKG_DEST/var/lib/xib + mkdir -p $PKG_DEST/var/lib/xib mv * $PKG_DEST/var/lib/xib/ } diff --git a/repo/xi/xichroot.xipkg b/repo/xi/xichroot.xibuild index 651c1ec..680262b 100644 --- a/repo/xi/xichroot.xipkg +++ b/repo/xi/xichroot.xibuild @@ -3,11 +3,12 @@ MAKEDEPS="bash" DEPS="bash" -PKG_VER=1.0.1 +PKG_VER=1.1.1 SOURCE=https://git.davidovski.xyz/xilinux/xiutils.git BRANCH=v$PKG_VER DESC="A script to aid with chrooting on XiLinux" package () { + mkdir -p $PKG_DEST/usr/bin make DESTDIR=$PKG_DEST install-chroot } diff --git a/repo/xi/xiutils.xibuild b/repo/xi/xiutils.xibuild index c8f7bf6..b052226 100644 --- a/repo/xi/xiutils.xibuild +++ b/repo/xi/xiutils.xibuild @@ -1,11 +1,12 @@ #!/bin/sh -MAKEDEPS="gcc" -DEPS="bash" +MAKEDEPS="make gcc" +DEPS="musl sh" -PKG_VER=1.0.2 +# Use master +#PKG_VER=1.1.2 SOURCE=https://git.davidovski.xyz/xilinux/xiutils.git -BRANCH="v$PKG_VER" +#BRANCH="v$PKG_VER" DESC="Utilities required by various components of the xilinux system" |