From 92a76bb80efda3fcb96cb0a990ae5bfa658449d1 Mon Sep 17 00:00:00 2001 From: davidovski Date: Wed, 2 Mar 2022 16:25:19 +0000 Subject: changed coreutils to sbase --- repo/apps/lynx.xibuild | 2 +- repo/devel/llvm.xibuild | 2 +- repo/devel/rustc.xibuild | 15 +++++++++------ repo/font/fontconfig.xibuild | 2 +- repo/linux/linux.xibuild | 2 +- repo/meta/all.xibuild | 2 +- repo/meta/base.xibuild | 2 +- repo/meta/system.xibuild | 2 +- repo/skip/cacert-utils.xibuild | 2 +- repo/util/dracut.xibuild | 2 +- repo/util/genfstab.xibuild | 2 +- repo/util/usbutils.xibuild | 2 +- repo/util/util-linux.xibuild | 2 +- 13 files changed, 21 insertions(+), 18 deletions(-) diff --git a/repo/apps/lynx.xibuild b/repo/apps/lynx.xibuild index d5a0dab..e773a3a 100644 --- a/repo/apps/lynx.xibuild +++ b/repo/apps/lynx.xibuild @@ -27,6 +27,6 @@ build () { package () { make DESTDIR=$PKG_DEST install-full - chgrp -v -R root $PKG_DEST/usr/share/doc/lynx-$PKG_VER/lynx_doc + chgrp -R root $PKG_DEST/usr/share/doc/lynx-$PKG_VER/lynx_doc } diff --git a/repo/devel/llvm.xibuild b/repo/devel/llvm.xibuild index cc90e8c..be70e9d 100644 --- a/repo/devel/llvm.xibuild +++ b/repo/devel/llvm.xibuild @@ -12,7 +12,7 @@ package () { } build () { - mkdir -v build && + mkdir build && cd build && CC=gcc CXX=g++ \ diff --git a/repo/devel/rustc.xibuild b/repo/devel/rustc.xibuild index 67f1583..e575ec7 100644 --- a/repo/devel/rustc.xibuild +++ b/repo/devel/rustc.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="cmake " +MAKEDEPS="cmake llvm" DEPS="curl gcc libssh2" PKG_VER=1.58.1 @@ -8,10 +8,10 @@ SOURCE=https://static.rust-lang.org/dist/rustc-$PKG_VER-src.tar.gz DESC="Systems programming language focused on safety, speed and concurrency" prepare () { - mkdir -pv $PKG_DEST/opt/rustc-$PKG_VER && - ln -svfin rustc-$PKG_VER $PKG_DEST/opt/rustc + mkdir -p $PKG_DEST/opt/rustc-$PKG_VER && + ln -sf rustc-$PKG_VER $PKG_DEST/opt/rustc - cat << EOF > config.toml + cat > config.toml << EOF # see config.toml.example for more possible options [llvm] @@ -47,6 +47,9 @@ codegen-tests = false # get a trace if there is an Internal Compiler Exception backtrace-on-ice = true +[target.x86_64-unknown-linux-musl] +llvm-config = "/usr/bin/llvm-config" + EOF } @@ -64,7 +67,7 @@ package () { chown -R root:root install && cp -a install/* $PKG_DEST - mkdir -pv $PKG_DEST/etc/profile.d/ + mkdir -p $PKG_DEST/etc/profile.d/ cat > $PKG_DEST/etc/profile.d/rustc.sh << "EOF" # Begin /etc/profile.d/rustc.sh @@ -72,7 +75,7 @@ pathprepend /opt/rustc/bin PATH # End /etc/profile.d/rustc.sh EOF - mkdir -pv $PKG_DEST/etc/ld.so.conf.d + mkdir -p $PKG_DEST/etc/ld.so.conf.d cat >> $PKG_DEST/etc/ld.so.conf.d/rustc.conf << EOF # Begin rustc addition diff --git a/repo/font/fontconfig.xibuild b/repo/font/fontconfig.xibuild index 76f8d80..7814f4a 100644 --- a/repo/font/fontconfig.xibuild +++ b/repo/font/fontconfig.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make libxml2 texlive" -DEPS="freetype json" +DEPS="freetype2 json" PKG_VER=2.13.1 SOURCE=https://www.freedesktop.org/software/fontconfig/release/fontconfig-$PKG_VER.tar.bz2 diff --git a/repo/linux/linux.xibuild b/repo/linux/linux.xibuild index 44e0b1d..caf0918 100644 --- a/repo/linux/linux.xibuild +++ b/repo/linux/linux.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make bc" -DEPS="coreutils kmod" +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 diff --git a/repo/meta/all.xibuild b/repo/meta/all.xibuild index c70dc0e..ec8efc1 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 coreutils 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 libressl pahole pam pcre 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 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 libressl pahole pam pcre 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" diff --git a/repo/meta/base.xibuild b/repo/meta/base.xibuild index d62915a..b13a24b 100644 --- a/repo/meta/base.xibuild +++ b/repo/meta/base.xibuild @@ -1,5 +1,5 @@ #!/bin/sh -DEPS="bash bzip2 coreutils findutils iana-etc file gawk gettext musl grep gzip iproute2 iputils xipkg pciutils procps-ng psmisc sed shadow sysvinit tar util-linux xz linux-headers sysconfigs inetutils" +DEPS="bash bzip2 sbase ubase s6 bootscripts findutils iana-etc file gawk gettext musl grep gzip iproute2 iputils xipkg pciutils procps-ng psmisc sed shadow tar util-linux xz linux-headers sysconfigs inetutils" MAKEDEPS="grep python" DESC="The base system to be installed" diff --git a/repo/meta/system.xibuild b/repo/meta/system.xibuild index b5db1bb..4ae00a4 100644 --- a/repo/meta/system.xibuild +++ b/repo/meta/system.xibuild @@ -2,4 +2,4 @@ # 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 coreutils 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 libressl pahole pam pcre 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" +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 libressl pahole pam pcre 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/skip/cacert-utils.xibuild b/repo/skip/cacert-utils.xibuild index b48e891..2f21aeb 100644 --- a/repo/skip/cacert-utils.xibuild +++ b/repo/skip/cacert-utils.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="" -DEPS="bash coreutils findutils libp11-kit" +DEPS="bash sbase findutils libp11-kit" SOURCE=https://src.fedoraproject.org/rpms/ca-certificates DESC="CA certificate utilities" diff --git a/repo/util/dracut.xibuild b/repo/util/dracut.xibuild index 3a5882c..17d514e 100644 --- a/repo/util/dracut.xibuild +++ b/repo/util/dracut.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make asciidoc" -DEPS="bash coreutils cpio findutils grep gzip kmod pkgconf procps-ng sed util-linux xz" +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" diff --git a/repo/util/genfstab.xibuild b/repo/util/genfstab.xibuild index eca6d1f..c263b32 100644 --- a/repo/util/genfstab.xibuild +++ b/repo/util/genfstab.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make asciidoc" -DEPS="bash coreutils gawk" +DEPS="bash sbase gawk" PKG_VER=24 SOURCE=https://github.com/archlinux/arch-install-scripts.git diff --git a/repo/util/usbutils.xibuild b/repo/util/usbutils.xibuild index 274efc9..9df636f 100644 --- a/repo/util/usbutils.xibuild +++ b/repo/util/usbutils.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="libusb wget" -DEPS="libusb musl hwdata coreutils python" +DEPS="libusb musl hwdata sbase python" PKG_VER=014 SOURCE=https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-$PKG_VER.tar.xz diff --git a/repo/util/util-linux.xibuild b/repo/util/util-linux.xibuild index a97f3ef..327d0db 100644 --- a/repo/util/util-linux.xibuild +++ b/repo/util/util-linux.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make " -DEPS="coreutils libcap libxcrypt readline" +DEPS="sbase libcap libxcrypt readline" PKG_VER=2.37.2 SOURCE=https://cdn.kernel.org/pub/linux/utils/util-linux/v$(echo $PKG_VER | cut -d. -f-2)/util-linux-$PKG_VER.tar.xz -- cgit v1.2.1