Various improvments

This commit is contained in:
Tracker-Friendly 2023-10-29 15:34:13 +00:00
parent 0746984942
commit 994f7a4a23
66 changed files with 74 additions and 1124 deletions

View File

@ -1,7 +1,7 @@
# Template file for 'base-system' # Template file for 'base-system'
pkgname=base-system pkgname=base-system
version=0.114 version=0.115
revision=7 revision=1
bootstrap=yes bootstrap=yes
build_style=meta build_style=meta
short_desc="EvolutionOS base system meta package" short_desc="EvolutionOS base system meta package"
@ -11,10 +11,10 @@ homepage="https://hectabit.org/evolutionos"
depends=" depends="
base-files busybox-evolution base-files busybox-evolution
mdocml>=1.13.3 shadow mdocml>=1.13.3 shadow eudev
procps-ng tzdata iana-etc dhcpcd procps-ng tzdata iana-etc dhcpcd
iwd xbps wifi-firmware iwd kmod xbps wifi-firmware
dinit removed-packages dinit removed-packages dinit-services
evolution-patches booster-evolution" evolution-patches booster-evolution"
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in

View File

@ -1,21 +0,0 @@
# Template file for 'base-voidstrap'
pkgname=base-voidstrap
version=0.11
revision=1
build_style=meta
short_desc="Void Linux base system meta package for containers/chroots"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Public Domain"
homepage="https://www.voidlinux.org/"
depends="
base-files ncurses coreutils busybox-core
bash file less util-linux man-pages
mdocml>=1.13.3 shadow e2fsprogs btrfs-progs xfsprogs dosfstools kbd
procps-ng iana-etc eudev runit-void openssh dhcpcd
iproute2 iputils xbps kmod removed-packages"
case "$XBPS_TARGET_MACHINE" in
*-musl) depends+=" musl";;
*) depends+=" glibc-locales";;
esac

View File

@ -1,7 +1,7 @@
# Template file for 'booster-evolution' # Template file for 'booster-evolution'
pkgname=booster-evolution pkgname=booster-evolution
version=0.11 version=0.11
revision=1 revision=2
build_style=go build_style=go
go_import_path=github.com/anatol/booster go_import_path=github.com/anatol/booster
hostmakedepends="git ruby-ronn" hostmakedepends="git ruby-ronn"
@ -9,9 +9,9 @@ short_desc="Fast and secure initramfs generator"
maintainer="Tracker-Friendly <jliwin98@danwin1210.de>" maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
license="MIT" license="MIT"
homepage="https://github.com/anatol/booster" homepage="https://github.com/anatol/booster"
conf_files="/etc/booster.yaml"
distfiles="https://github.com/anatol/booster/archive/${version}.tar.gz" distfiles="https://github.com/anatol/booster/archive/${version}.tar.gz"
checksum=2f111b1729143c38ec287e5567ae9f57e0fb8118cc11afa22657da8ac9b0105a checksum=2f111b1729143c38ec287e5567ae9f57e0fb8118cc11afa22657da8ac9b0105a
conf_files="/etc/booster.yaml"
replaces="booster" replaces="booster"
alternatives=" alternatives="
initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/booster/kernel-hook-postinst initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/booster/kernel-hook-postinst
@ -28,6 +28,7 @@ do_build() {
ronn docs/manpage.md ronn docs/manpage.md
touch booster.yaml
} }
do_install() { do_install() {
@ -49,4 +50,6 @@ do_install() {
vcompletion contrib/completion/bash bash booster vcompletion contrib/completion/bash bash booster
vlicense LICENSE vlicense LICENSE
} }

View File

@ -1,128 +0,0 @@
# Template file for 'busybox'
pkgname=busybox
version=1.34.1
revision=4
hostmakedepends="perl"
checkdepends="tar which zip"
short_desc="Swiss Army Knife of Embedded Linux"
maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-2.0-only"
homepage="https://www.busybox.net"
distfiles="${homepage}/downloads/busybox-${version}.tar.bz2"
checksum=415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549
_alternatives_core="
ash:ash:/usr/bin/busybox
awk:awk:/usr/bin/busybox
hostname:hostname:/usr/bin/busybox
sh:sh:/usr/bin/busybox
vi:vi:/usr/bin/busybox
logger:logger:/usr/bin/busybox"
_alternatives="
${_alternatives_core}
ntpd:ntpd:/usr/bin/busybox
ntpd:ntpd:/etc/sv/busybox-ntpd"
alternatives="${_alternatives}"
register_shell="/usr/bin/ash"
_patch_config() {
local t="$1"
shift
while [ "$1" ]; do
local p="$1"
shift
echo "Applying $p..."
patch "${t}/.config" <"${FILESDIR}/dotconfig.d/${p}.patch"
done
}
do_configure() {
mkdir -p src
mv * src || true
local t
for t in busybox busybox-static busybox-core busybox-huge; do
mkdir -p $t
cp -f ${FILESDIR}/dotconfig ${t}/.config
case "$XBPS_TARGET_MACHINE" in
*-musl) vsed -i -e /CONFIG_FEATURE_VI_REGEX_SEARCH/s/y/n/ \
${t}/.config;;
esac
if [ "$CROSS_BUILD" ]; then
vsed -i -e \
"s,\(CONFIG_CROSS_COMPILER_PREFIX\).*,\1=\"${XBPS_CROSS_TRIPLET}-\",g" \
${t}/.config
fi
done
_patch_config busybox udhcpc ntpd
_patch_config busybox-static udhcpc ntpd static
_patch_config busybox-huge udhcpc ntpd httpd mdev sysklogd huge
for t in busybox-core busybox busybox-static busybox-huge; do
make -C "${t}" KBUILD_SRC="${wrksrc}/src" -f "${wrksrc}/src/Makefile" oldconfig
make -C "${t}" KBUILD_SRC="${wrksrc}/src" -f "${wrksrc}/src/Makefile" prepare "${makejobs}"
done
if [ "$SOURCE_DATE_EPOCH" ]; then
# rewrite date with the one from the date wrapper.
d=$(date +"%F %T %Z")
sed -i "s/\(#define AUTOCONF_TIMESTAMP\).*/\1 \"$d\"/" */include/autoconf.h
fi
}
do_build() {
for t in busybox-core busybox busybox-static busybox-huge; do
make -C "${t}" SKIP_STRIP=y "${makejobs}"
done
}
do_check() {
for t in busybox-core busybox busybox-static busybox-huge; do
make -C "${t}" "${makejobs}" \
SKIP_KNOWN_BUGS=yes SKIP_INTERNET_TESTS=yes \
check
done
}
do_install() {
vbin busybox/busybox_unstripped busybox
vman busybox/docs/busybox.1
vsv busybox-ntpd
}
busybox-core_package() {
short_desc+=" (essential applets)"
conflicts="busybox>=0 busybox-huge>=0"
alternatives="${_alternatives_core}"
register_shell="/usr/bin/ash"
pkg_install() {
vbin busybox-core/busybox_unstripped busybox
vman busybox-core/docs/busybox.1
}
}
busybox-static_package() {
short_desc+=" (statically linked)"
pkg_install() {
vbin busybox-static/busybox busybox.static
}
}
busybox-huge_package() {
short_desc+=" (extra applets)"
conflicts="busybox>=0 busybox-core>=0"
alternatives="${_alternatives}"
register_shell="/usr/bin/ash"
pkg_install() {
vbin busybox-huge/busybox_unstripped busybox
vman busybox-huge/docs/busybox.1
vsv busybox-ntpd
vsv busybox-syslogd
vsv busybox-klogd
}
}

View File

@ -660,12 +660,12 @@ CONFIG_FEATURE_MDEV_DAEMON=y
CONFIG_MESG=y CONFIG_MESG=y
CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
CONFIG_MKE2FS=y CONFIG_MKE2FS=y
CONFIG_MKFS_EXT2=y # CONFIG_MKFS_EXT2=y
CONFIG_MKFS_MINIX=y CONFIG_MKFS_MINIX=y
CONFIG_FEATURE_MINIX2=y CONFIG_FEATURE_MINIX2=y
# CONFIG_MKFS_REISER is not set # CONFIG_MKFS_REISER is not set
CONFIG_MKDOSFS=y # CONFIG_MKDOSFS is not set
CONFIG_MKFS_VFAT=y # CONFIG_MKFS_VFAT is not set
CONFIG_MKSWAP=y CONFIG_MKSWAP=y
CONFIG_FEATURE_MKSWAP_UUID=y CONFIG_FEATURE_MKSWAP_UUID=y
CONFIG_MORE=y CONFIG_MORE=y

View File

@ -1,7 +1,7 @@
# Template file for 'busybox' # Template file for 'busybox'
pkgname=busybox-evolution pkgname=busybox-evolution
version=1.36.1 version=1.36.1
revision=4 revision=5
hostmakedepends="perl pkg-config" hostmakedepends="perl pkg-config"
checkdepends="tar which zip" checkdepends="tar which zip"
short_desc="Swiss Army Knife of Embedded Linux (evolutionOS edition)" short_desc="Swiss Army Knife of Embedded Linux (evolutionOS edition)"

View File

@ -0,0 +1,4 @@
case "$ACTION" in
post)
drunner
esac

View File

@ -25,8 +25,6 @@ if [ "$1" != "stop" ]; then
# You can put other static configuration here: # You can put other static configuration here:
#/sbin/ifconfig eth0 192.168.1.38 netmask 255.255.255.0 broadcast 192.168.1.255 #/sbin/ifconfig eth0 192.168.1.38 netmask 255.255.255.0 broadcast 192.168.1.255
echo "myhost" > /proc/sys/kernel/hostname
# /usr/sbin/alsactl restore # /usr/sbin/alsactl restore
else else

View File

@ -1,5 +1,11 @@
#!/bin/sh #!/bin/sh
if [ -e /etc/runit/runsvdir/default ]; then
:
else
mkdir -p /etc/runit/runsvdir/default
fi
for i in $(ls /etc/sv/); do for i in $(ls /etc/sv/); do
rm -f /etc/dinit.d/boot.d/runitb.d rm -f /etc/dinit.d/boot.d/runitb.d
mkdir -p /etc/dinit.d/runitb.d/"$i" mkdir -p /etc/dinit.d/runitb.d/"$i"
@ -15,3 +21,5 @@ done
for i in $(ls /etc/runit/runsvdir/default/); do for i in $(ls /etc/runit/runsvdir/default/); do
ln -sf /etc/dinit.d/"$i" /etc/dinit.d/boot.d/ ln -sf /etc/dinit.d/"$i" /etc/dinit.d/boot.d/
done done
rm -rf /etc/dinit.d/boot.d/runitb.d

View File

@ -0,0 +1,17 @@
#!/bin/sh
pkgname=dinit-services
version=1.0
revision=0
short_desc="System services for evolutionOS"
maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
homepage="https://github.com/davmac314/dinit"
license="GPL-3.0"
conflicts="runit-void"
build_style=meta
do_install() {
mkdir -p ${DESTDIR}/etc/dinit.d/
cp -r ${FILESDIR}/dinit.d/* ${DESTDIR}/etc/dinit.d/
vbin ${FILESDIR}/drunner
ln -s /usr/bin/dinit ${DESTDIR}/usr/bin/init
}

View File

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
pkgname=dinit pkgname=dinit
version=0.17.1 version=0.17.1
revision=7 revision=8
short_desc="Simple Linux / BSD init system (NOT MY SOFTWARE)" short_desc="Simple Linux / BSD init system (NOT MY SOFTWARE)"
maintainer="Tracker-Friendly <jliwin98@danwin1210.de>" maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
homepage="https://github.com/davmac314/dinit" homepage="https://github.com/davmac314/dinit"
license="GPL-3.0" license="GPL-3.0"
makedepends="git make gcc m4" makedepends="git make gcc m4"
conflicts="runit runit-void" conflicts="runit"
do_build() { do_build() {
echo "Building..." echo "Building..."
@ -29,8 +29,4 @@ do_install() {
mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin/ mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin/
rm -rf ${DESTDIR}/sbin rm -rf ${DESTDIR}/sbin
ls ${DESTDIR}/usr/bin ls ${DESTDIR}/usr/bin
mkdir -p ${DESTDIR}/etc/dinit.d/
cp -r ${FILESDIR}/dinit.d/* ${DESTDIR}/etc/dinit.d/
vbin ${FILESDIR}/drunner
ln -s /usr/bin/dinit ${DESTDIR}/usr/bin/init
} }

View File

@ -7,13 +7,10 @@ post)
mv /etc/greetd/config.toml.2 /etc/greetd/config.toml mv /etc/greetd/config.toml.2 /etc/greetd/config.toml
usermod -d /etc/greetd/greeter greeter usermod -d /etc/greetd/greeter greeter
chown greeter /etc/greetd/greeter -R chown greeter /etc/greetd/greeter -R
cp -r /run/runit/supervise.agetty-tty1 /run/runit/supervise.greetd
cp -r /run/runit/supervise.agetty-tty1 /run/runit/supervise.polkitd
cp -r /run/runit/supervise.agetty-tty1 /run/runit/supervise.dbus
tty="$(cat /sys/class/tty/tty0/active | sed 's/.*\(.\)$/\1/')" tty="$(cat /sys/class/tty/tty0/active | sed 's/.*\(.\)$/\1/')"
echo "chvt 5" >> /etc/rc.local echo "chvt 5" >> /etc/rc.local
chvt "$tty" chvt "$tty"
rm -rf /etc/dinit.d/boot.d/agetty-tty5 rm -rf /etc/dinit.d/boot.d/tty5-agetty
sed -i '/ctrl_interface_group=.*$/d' /etc/wpa_supplicant/wpa_supplicant.conf sed -i '/ctrl_interface_group=.*$/d' /etc/wpa_supplicant/wpa_supplicant.conf
if [ -d /etc/runit/runsvdir/default/wpa_supplicant ]; then if [ -d /etc/runit/runsvdir/default/wpa_supplicant ]; then
: :

View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
pactl set-sink-mute @DEFAULT_SINK@ 0 pactl set-sink-mute @DEFAULT_SINK@ 0
if [ "$1" = "up" ]; then if [ "$1" = "up" ]; then
if [ "$(pactl list sinks | grep '^[[:space:]]Volume:' | head -n $(( $SINK + 1 )) | tail -n 1 | sed -e 's,.* \([0-9][0-9]*\)%.*,\1,')" = "100" ]; then if [ "$(pactl list sinks | grep '^[[:space:]]Volume:' | head -n $(( $SINK + 1 )) | tail -n 1 | sed -e 's,.* \([0-9][0-9]*\)%.*,\1,')" = "100" ]; then

View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
help() { help() {
echo "Help:" echo "Help:"
@ -7,16 +7,16 @@ help() {
echo " nothing: Enables Evolution-Desktop at launch" echo " nothing: Enables Evolution-Desktop at launch"
} }
if [[ "$1" = "" ]]; then if [ "$1" = "" ]; then
drunner drunner
ln -s /etc/dinit.d/greetd /etc/dinit.d/boot.d/greetd ln -s /etc/dinit.d/greetd /etc/dinit.d/boot.d/greetd
ln -s /etc/dinit.d/evolution-desktop /etc/dinit.d/boot.d/evolution-desktop ln -s /etc/dinit.d/evolution-desktop /etc/dinit.d/boot.d/evolution-desktop
echo "Evolution-Desktop will now start at launch." echo "Evolution-Desktop will now start at launch."
elif [[ "$1" = "-h" ]]; then elif [ "$1" = "-h" ]; then
help help
elif [[ "$1" = "--help" ]]; then elif [ "$1" = "--help" ]; then
help help
elif [[ "$1" = "-r" ]]; then elif [ "$1" = "-r" ]; then
rm -f /etc/dinit.d/boot.d/greetd rm -f /etc/dinit.d/boot.d/greetd
rm -f /etc/dinit.d/boot.d/evolution-desktop rm -f /etc/dinit.d/boot.d/evolution-desktop
echo "Evolution-Desktop will no longer start at launch" echo "Evolution-Desktop will no longer start at launch"

View File

@ -1,6 +1,6 @@
pkgname=evolution-desktop pkgname=evolution-desktop
version=1.1 version=1.1
revision=13 revision=16
build_style=meta build_style=meta
maintainer="Tracker-Friendly <jliwin98@danwin1210.de>" maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
short_desc="Desktop and Greeter for EvolutionOS" short_desc="Desktop and Greeter for EvolutionOS"
@ -10,7 +10,7 @@ depends="wayfire greetd wf-shell wcm mesa mesa-dri elogind polkit mate-polkit gr
conf_files="/usr/bin/Wayfire /usr/bin/startsession" conf_files="/usr/bin/Wayfire /usr/bin/startsession"
do_install() { do_install() {
#!/bin/bash #!/bin/sh
mkdir -p ${DESTDIR}/etc/runit/runsvdir/default mkdir -p ${DESTDIR}/etc/runit/runsvdir/default
cp -r ${FILESDIR}/var/service/* ${DESTDIR}/etc/runit/runsvdir/default/ cp -r ${FILESDIR}/var/service/* ${DESTDIR}/etc/runit/runsvdir/default/

View File

@ -7,7 +7,7 @@ if command -v busybox >/dev/null 2>&1; then
for i in $(busybox --list-full); do for i in $(busybox --list-full); do
if [ -e "/$i" ]; then if [ -e "/$i" ]; then
busybox echo "Error: $i already exists." :
else else
busybox echo "Creating symlink from /bin/busybox to $i" busybox echo "Creating symlink from /bin/busybox to $i"
busybox ln -s "/usr/bin/busybox" "/$i" busybox ln -s "/usr/bin/busybox" "/$i"

View File

@ -1,6 +1,6 @@
pkgname=evolution-patches pkgname=evolution-patches
version=1.1 version=1.2
revision=6 revision=0
build_style=meta build_style=meta
maintainer="Tracker-Friendly <jliwin98@danwin1210.de>" maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
short_desc="Simple patches that enable an usable OS out of the box" short_desc="Simple patches that enable an usable OS out of the box"
@ -17,7 +17,7 @@ do_install() {
# Get the list of commands from busybox # Get the list of commands from busybox
commands="[ [[ arch ascii base32 base64 basename brctl cat chgrp chmod chown chroot comm cp crc32 cttyhack cut date dc dd df dirname dnsdomainname du dumpkmap echo ed env expand expr factor false fatattr fbset fold fsync fuser getty groups head hexedit i2cdetect i2cdump i2cget i2cset i2ctransfer id ifconfig ifenslave install iostat ipaddr iplink ipneigh iproute iprule iptunnel killall killall5 link ln loadkmap ls lsof lsscsi lzcat md5sum mkdir mkfifo mknod mkstat mv nc netstat nice nl nohup nproc nslookup od partprobe paste patch pipe_progress powertop printenv printf pstree pwd readlink realpath rm rmdir seq setfattr sha1sum sha256sum sha3sum sha512sum shred shuf sleep sort split ssl_client stat strings stty sum svok sync tac tail tee telnet test time touch tr true truncate ts tty uevent uname unexpand uniq unlink unxz unzip uudecode uuencode wc wget whoami whois xxd xz xzcat yes sh find diff gunzip tar gzip sed which mktemp grep xargs cmp egrep fgrep lspci lsusb mpstat tree tsort zcat add-shell addgroup adduser adjtimex ar arp ash awk bc beep chat cksum conspy crond crontab cryptpw delgroup deluser devmem dhcprelay dnsd dos2unix dpkg dpkg-deb dumpleases ether-wake fakeidentd fbsplash fdflush fdformat freeramdisk ftpd ftpget ftpput hd hdparm hostid hostname httpd hush ifdown ifplugd ifup inetd ipcalc klogd linux32 linux64 loadfont logger logname logread lpd lpq lpr lzma lzop lzopcat makedevs makemime mdev microcom mim minips mkdosfs mkfs.ext2 mkfs.vfat mkpasswd mt nameif nanddump nandwrite nbd-client netcat nmeter ntpd nuke ping ping6 popmaildir pscan raidautorun rdate rdev readahead reformime remove-shell resize resume route rpm rpm2cpio run-init runlevel rx seedrng sendmail setconsole setlogcons setserial slattach smemcap start-stop-daemon syslogd tcpsvd telnetd tftp tftpd timeout traceroute traceroute6 ttysize tunctl ubiattach ubidetach ubimkvol ubirename ubirmvol ubirsvol ubiupdatevol udhcpc udhcpc6 udhcpd udpsvd uncompress unix2dos unlzma unlzop users usleep vconfig vi volname w watchdog who zcip" commands="[ [[ arch ascii base32 base64 basename brctl cat chgrp chmod chown chroot comm cp crc32 cttyhack cut date dc dd df dirname dnsdomainname du dumpkmap echo ed env expand expr factor false fatattr fbset fold fsync fuser getty groups head hexedit i2cdetect i2cdump i2cget i2cset i2ctransfer id ifconfig ifenslave install iostat ipaddr iplink ipneigh iproute iprule iptunnel killall killall5 link ln loadkmap ls lsof lsscsi lzcat md5sum mkdir mkfifo mknod mkstat mv nc netstat nice nl nohup nproc nslookup od partprobe paste patch pipe_progress powertop printenv printf pstree pwd readlink realpath rm rmdir seq setfattr sha1sum sha256sum sha3sum sha512sum shred shuf sleep sort split ssl_client stat strings stty sum svok sync tac tail tee telnet test time touch tr true truncate ts tty uevent uname unexpand uniq unlink unxz unzip uudecode uuencode wc wget whoami whois xxd xz xzcat yes sh find diff gunzip tar gzip sed which mktemp grep xargs cmp egrep fgrep lspci lsusb mpstat tree tsort zcat add-shell addgroup adduser adjtimex ar arp ash awk bc beep chat cksum conspy crond crontab cryptpw delgroup deluser devmem dhcprelay dnsd dos2unix dpkg dpkg-deb dumpleases ether-wake fakeidentd fbsplash fdflush fdformat freeramdisk ftpd ftpget ftpput hd hdparm hostid hostname httpd hush ifdown ifplugd ifup inetd ipcalc klogd linux32 linux64 loadfont logger logname logread lpd lpq lpr lzma lzop lzopcat makedevs makemime mdev microcom mim minips mkpasswd mt nameif nanddump nandwrite nbd-client netcat nmeter ntpd nuke ping ping6 popmaildir pscan raidautorun rdate rdev readahead reformime remove-shell resize resume route rpm rpm2cpio run-init runlevel rx seedrng sendmail setconsole setlogcons setserial slattach smemcap start-stop-daemon syslogd tcpsvd telnetd tftp tftpd timeout traceroute traceroute6 ttysize tunctl ubiattach ubidetach ubimkvol ubirename ubirmvol ubirsvol ubiupdatevol udhcpc udhcpc6 udhcpd udpsvd uncompress unix2dos unlzma unlzop users usleep vconfig vi volname w watchdog who zcip"
mkdir -p ${DESTDIR}/usr/bin/ mkdir -p ${DESTDIR}/usr/bin/
# Loop through each command # Loop through each command
for cmd in $commands; do for cmd in $commands; do
@ -31,8 +31,6 @@ do_install() {
echo ${DESTDIR} echo ${DESTDIR}
echo done echo done
mkdir -p ${DESTDIR}/etc/sv/agetty-tty1
cp ${FILESDIR}/conf ${DESTDIR}/etc/sv/agetty-tty1/conf
mkdir -p ${DESTDIR}/usr/share/xbps.d mkdir -p ${DESTDIR}/usr/share/xbps.d
cp ${FILESDIR}/main.conf ${DESTDIR}/usr/share/xbps.d/*-0-evolution-main.conf cp ${FILESDIR}/main.conf ${DESTDIR}/usr/share/xbps.d/*-0-evolution-main.conf
mkdir -p ${DESTDIR}/etc/ mkdir -p ${DESTDIR}/etc/
@ -43,7 +41,7 @@ do_install() {
mkdir -p ${DESTDIR}/etc/dinit.d/boot.d mkdir -p ${DESTDIR}/etc/dinit.d/boot.d
for i in $(echo "agetty-tty1 agetty-tty2 agetty-tty3 agetty-tty4 agetty-tty5 agetty-tty6 agetty-tty7 dbus dbus-log dhcpcd dhcpcd-log ead ead-log iwd iwd-log loginready ntpd runitb.d splash sshd sshd-log udevd"); do for i in $(echo "tty1-agetty tty2-agetty tty3-agetty tty4-agetty tty5-agetty tty6-agetty tty7-agetty dbus dbus-log dhcpcd dhcpcd-log ead ead-log iwd iwd-log loginready ntpd runitb.d splash sshd sshd-log udevd"); do
ln -sf "/etc/dintit.d/$i" "${DESTDIR}/etc/dinit.d/boot.d/$i" ln -sf "/etc/dinit.d/$i" "${DESTDIR}/etc/dinit.d/boot.d/$i"
done done
} }

View File

@ -1,10 +1,10 @@
#!/bin/sh #!/bin/sh
pkgname=evolution-theme-switcher pkgname=evolution-theme-switcher
version=1.0 version=1.0
revision=5 revision=6
short_desc="Just a theme switcher for evolution-desktop" short_desc="Just a theme switcher for evolution-desktop"
maintainer="Tracker-Friendly <jliwin98@danwin1210.de>" maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
homepage="https://hectabit.org/centrifuge/HectaBit/dconf-theme-switcher" homepage="https://centrifuge.hectabit.org/HectaBit/dconf-theme-switcher"
license="GPL-3.0" license="GPL-3.0"
makedepends="make gcc git pkg-config gtk+3-devel dconf" makedepends="make gcc git pkg-config gtk+3-devel dconf"
depends="gtk+3 dconf" depends="gtk+3 dconf"
@ -13,7 +13,7 @@ do_build() {
echo "Building..." echo "Building..."
cd ${XBPS_BUILDDIR} cd ${XBPS_BUILDDIR}
rm -rf gtkgreet rm -rf gtkgreet
git clone https://hectabit.org/centrifuge/HectaBit/dconf-theme-switcher.git git clone https://centrifuge.hectabit.org/HectaBit/dconf-theme-switcher
cd dconf-theme-switcher cd dconf-theme-switcher
make make
} }

View File

@ -1 +0,0 @@
grub

View File

@ -1 +0,0 @@
grub

View File

@ -1 +0,0 @@
grub

View File

@ -1,21 +0,0 @@
#
# Configuration file for GRUB.
#
GRUB_DEFAULT=0
#GRUB_HIDDEN_TIMEOUT=0
#GRUB_HIDDEN_TIMEOUT_QUIET=false
GRUB_TIMEOUT=5
GRUB_DISTRIBUTOR="EvolutionOS"
GRUB_CMDLINE_LINUX_DEFAULT="loglevel=4"
# Uncomment to use basic console
#GRUB_TERMINAL_INPUT="console"
# Uncomment to disable graphical terminal
#GRUB_TERMINAL_OUTPUT=console
#GRUB_BACKGROUND=/usr/share/void-artwork/splash.png
#GRUB_GFXMODE=1920x1080x32
#GRUB_DISABLE_LINUX_UUID=true
GRUB_DISABLE_RECOVERY=true
# Uncomment and set to the desired menu colors. Used by normal and wallpaper
# modes only. Entries specified as foreground/background.
#GRUB_COLOR_NORMAL="light-blue/black"
#GRUB_COLOR_HIGHLIGHT="light-cyan/blue"

View File

@ -1,19 +0,0 @@
#!/bin/sh
#
# Kernel hook for GRUB 2.
#
# Arguments passed to this script: $1 pkgname, $2 version.
#
PKGNAME="$1"
VERSION="$2"
export ZPOOL_VDEV_NAME_PATH=YES
if command -v grub-mkconfig >/dev/null 2>&1; then
if [ -d $ROOTDIR/boot/grub ]; then
grub-mkconfig -o $ROOTDIR/boot/grub/grub.cfg
exit $?
fi
fi
exit 0

View File

@ -1,32 +0,0 @@
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index f8cbb8d..f271608 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -246,6 +246,8 @@ export GRUB_DEFAULT \
GRUB_BACKGROUND \
GRUB_THEME \
GRUB_GFXPAYLOAD_LINUX \
+ GRUB_COLOR_NORMAL \
+ GRUB_COLOR_HIGHLIGHT \
GRUB_INIT_TUNE \
GRUB_SAVEDEFAULT \
GRUB_ENABLE_CRYPTODISK \
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index d2e7252..8259f45 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -125,6 +125,14 @@ cat <<EOF
EOF
+if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then
+ cat << EOF
+set menu_color_normal=$GRUB_COLOR_NORMAL
+set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT
+
+EOF
+fi
+
serial=0;
gfxterm=0;
for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do

View File

@ -1,15 +0,0 @@
EvolutionOS is not GNU/Linux, it is just Linux. To keep on par with branding, I removed that too. It's not evolutionOS Linux.
--- 10_linux
+++ a/util/grub.d/10_linux.in
@@ -29,9 +29,9 @@
CLASS="--class gnu-linux --class gnu --class os"
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
- OS="GNU/Linux"
+ OS=""
else
- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
+ OS="${GRUB_DISTRIBUTOR}"
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
fi

View File

@ -1,96 +0,0 @@
From b98275138bf4fc250a1c362dfd2c8b1cf2421701 Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Tue, 28 Sep 2021 13:50:47 +0800
Subject: build: Fix build error with binutils 2.36
The following procedure to build xen/pvgrub is broken.
git clone https://git.savannah.gnu.org/git/grub.git
cd grub
./bootstrap
mkdir build-xen
cd build-xen
../configure --with-platform=xen
make
It fails with the message:
/usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/bin/ld:
section .note.gnu.property VMA [0000000000400158,0000000000400187]
overlaps section .bss VMA [000000000000f000,000000000041e1af]
The most significant factor is that new assembler (GNU as) generates the
.note.gnu.property section as default. This note section overlaps with
.bss because it doesn't reposition with -Wl,-Ttext,0 with which the base
address of .text section is set, rather the address of .note.gnu.property
is calculated for some reason from 0x400000 where the ELF executable
defaults to start.
Using -Ttext-segment doesn't help either, though it is said to set the
address of the first byte of the text segment according to "man ld".
What it actually does is to override the default 0x400000, aka the image
base address, to something else. The entire process can be observed in
the default linker script used by gcc [1]. Therefore we can't expect it
to achieve the same thing as -Ttext given that the first segment where
.text resides is offset by SIZEOF_HEADERS plus some sections may be
preceding it within the first segment. The end result is .text always
has to start with non-zero address with -Wl,-Ttext-segment,0 if using
default linker script.
It is also worth mentioning that binutils upstream apparently doesn't
seem to consider this as a bug [2] and proposed to use -Wl,-Ttext-segment,0
which is not fruitful as what has been tested by Gentoo [3].
As long as GRUB didn't use ISA information encoded in .note.gnu.property,
we can safely drop it via -Wa,-mx86-used-note=no assembler option to
fix the linker error above.
This is considered a better approach than using custom linker script to
drop the .note.gnu.property section because object file manipulation can
also be hampered one way or the other in that linker script may not be
helpful. See also this commit removing the section in the process of objcopy.
6643507ce build: Fix GRUB i386-pc build with Ubuntu gcc
[1] In /usr/lib64/ldscripts/elf_x86_64.x or use 'gcc -Wl,--verbose ...'
PROVIDE (__executable_start = SEGMENT_START("text-segment", 0x400000));
. = SEGMENT_START("text-segment", 0x400000) + SIZEOF_HEADERS;
[2] https://sourceware.org/bugzilla/show_bug.cgi?id=27377
[3] https://bugs.gentoo.org/787221
Signed-off-by: Michael Chang <mchang@suse.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---
configure.ac | 14 ++++++++++++++
1 file changed, 14 insertions(+)
(limited to 'configure.ac')
diff --git a/configure.ac b/configure.ac
index eeb5d22..8d1c81a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -840,6 +840,20 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p
TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow"
fi
+if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ); then
+ AC_CACHE_CHECK([whether -Wa,-mx86-used-note works], [grub_cv_cc_mx86_used_note], [
+ CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no -Werror"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_mx86_used_note=yes],
+ [grub_cv_cc_mx86_used_note=no])
+ ])
+
+ if test "x$grub_cv_cc_mx86_used_note" = xyes; then
+ TARGET_CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no"
+ TARGET_CCASFLAGS="$TARGET_CCASFLAGS -Wa,-mx86-used-note=no"
+ fi
+fi
+
# GRUB doesn't use float or doubles at all. Yet some toolchains may decide
# that floats are a good fit to run instead of what's written in the code.
# Given that floating point unit is disabled (if present to begin with)
--
cgit v1.1

View File

@ -1,71 +0,0 @@
From 04aa0aa735f4bfa2d7a4f6593745fbe1d7fa0d0a Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@hellion.org.uk>
Date: Sat, 6 Sep 2014 12:20:12 +0100
Subject: grub-install: Install PV Xen binaries into the upstream specified
path
Upstream have defined a specification for where guests ought to place their
xenpv grub binaries in order to facilitate chainloading from a stage 1 grub
loaded from dom0.
http://xenbits.xen.org/docs/unstable-staging/misc/x86-xenpv-bootloader.html
The spec calls for installation into /boot/xen/pvboot-i386.elf or
/boot/xen/pvboot-x86_64.elf.
Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Bug-Debian: https://bugs.debian.org/762307
Forwarded: http://lists.gnu.org/archive/html/grub-devel/2014-10/msg00041.html
Last-Update: 2014-10-24
Patch-Name: grub-install-pvxen-paths.patch
---
v2: Respect bootdir, create /boot/xen as needed.
---
util/grub-install.c | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/util/grub-install.c b/util/grub-install.c
index b82c14d41..caadada98 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -1962,6 +1962,28 @@ main (int argc, char *argv[])
}
break;
+ case GRUB_INSTALL_PLATFORM_I386_XEN:
+ {
+ char *path = grub_util_path_concat (2, bootdir, "xen");
+ char *dst = grub_util_path_concat (2, path, "pvboot-i386.elf");
+ grub_install_mkdir_p (path);
+ grub_install_copy_file (imgfile, dst, 1);
+ free (dst);
+ free (path);
+ }
+ break;
+
+ case GRUB_INSTALL_PLATFORM_X86_64_XEN:
+ {
+ char *path = grub_util_path_concat (2, bootdir, "xen");
+ char *dst = grub_util_path_concat (2, path, "pvboot-x86_64.elf");
+ grub_install_mkdir_p (path);
+ grub_install_copy_file (imgfile, dst, 1);
+ free (dst);
+ free (path);
+ }
+ break;
+
case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON:
case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:
case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS:
@@ -1971,8 +1971,6 @@ main (int argc, char *argv[])
case GRUB_INSTALL_PLATFORM_MIPSEL_ARC:
case GRUB_INSTALL_PLATFORM_ARM_UBOOT:
case GRUB_INSTALL_PLATFORM_I386_QEMU:
- case GRUB_INSTALL_PLATFORM_I386_XEN:
- case GRUB_INSTALL_PLATFORM_X86_64_XEN:
case GRUB_INSTALL_PLATFORM_I386_XEN_PVH:
grub_util_warn ("%s",
_("WARNING: no platform-specific install was performed"));

View File

@ -1,32 +0,0 @@
From 54b741317568867fc4ad801a65397d05f3ea0f59 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
Date: Thu, 25 Sep 2014 18:41:29 -0300
Subject: Include a text attribute reset in the clear command for ppc
Always clear text attribute for clear command in order to avoid problems
after it boots.
* grub-core/term/terminfo.c: Add escape for text attribute reset
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1295255
Origin: other, https://lists.gnu.org/archive/html/grub-devel/2014-09/msg00076.html
Last-Update: 2014-09-26
Patch-Name: ieee1275-clear-reset.patch
---
grub-core/term/terminfo.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
index f0d3e3deb..7cb7909c8 100644
--- a/grub-core/term/terminfo.c
+++ b/grub-core/term/terminfo.c
@@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term,
/* Clear the screen. Using serial console, screen(1) only recognizes the
* ANSI escape sequence. Using video console, Apple Open Firmware
* (version 3.1.1) only recognizes the literal ^L. So use both. */
- data->cls = grub_strdup (" \e[2J");
+ data->cls = grub_strdup (" \e[2J\e[m");
data->reverse_video_on = grub_strdup ("\e[7m");
data->reverse_video_off = grub_strdup ("\e[m");
if (grub_strcmp ("ieee1275", str) == 0)

View File

@ -1,220 +0,0 @@
From 35118b5023b0d9b4e3ad82f6e15fb696ad8e2a10 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Tue, 28 Jan 2014 14:40:02 +0000
Subject: Port yaboot logic for various powerpc machine types
Some powerpc machines require not updating the NVRAM. This can be handled
by existing grub-install command-line options, but it's friendlier to detect
this automatically.
On chrp_ibm machines, use the nvram utility rather than nvsetenv. (This
is possibly suitable for other machines too, but that needs to be
verified.)
Forwarded: no
Last-Update: 2014-10-15
Patch-Name: install_powerpc_machtypes.patch
---
grub-core/osdep/basic/platform.c | 5 +++
grub-core/osdep/linux/platform.c | 72 ++++++++++++++++++++++++++++++
grub-core/osdep/unix/platform.c | 28 +++++++++---
grub-core/osdep/windows/platform.c | 6 +++
include/grub/util/install.h | 3 ++
util/grub-install.c | 11 +++++
6 files changed, 119 insertions(+), 6 deletions(-)
diff --git a/grub-core/osdep/basic/platform.c b/grub-core/osdep/basic/platform.c
index 4b5502aeb..2ab907976 100644
--- a/grub-core/osdep/basic/platform.c
+++ b/grub-core/osdep/basic/platform.c
@@ -30,3 +30,8 @@ grub_install_get_default_x86_platform (void)
return "i386-pc";
}
+const char *
+grub_install_get_default_powerpc_machtype (void)
+{
+ return "generic";
+}
diff --git a/grub-core/osdep/linux/platform.c b/grub-core/osdep/linux/platform.c
index 35f1bcc0e..9805c36d4 100644
--- a/grub-core/osdep/linux/platform.c
+++ b/grub-core/osdep/linux/platform.c
@@ -23,6 +23,7 @@
#include <grub/emu/misc.h>
#include <sys/types.h>
#include <dirent.h>
+#include <stdio.h>
#include <string.h>
#include <sys/utsname.h>
@@ -154,3 +154,74 @@ grub_install_get_default_x86_platform (void)
grub_util_info ("... not found");
return "i386-pc";
}
+
+const char *
+grub_install_get_default_powerpc_machtype (void)
+{
+ FILE *fp;
+ char *buf = NULL;
+ size_t len = 0;
+ const char *machtype = "generic";
+
+ fp = grub_util_fopen ("/proc/cpuinfo", "r");
+ if (! fp)
+ return machtype;
+
+ while (getline (&buf, &len, fp) > 0)
+ {
+ if (strncmp (buf, "pmac-generation",
+ sizeof ("pmac-generation") - 1) == 0)
+ {
+ if (strstr (buf, "NewWorld"))
+ {
+ machtype = "pmac_newworld";
+ break;
+ }
+ if (strstr (buf, "OldWorld"))
+ {
+ machtype = "pmac_oldworld";
+ break;
+ }
+ }
+
+ if (strncmp (buf, "motherboard", sizeof ("motherboard") - 1) == 0 &&
+ strstr (buf, "AAPL"))
+ {
+ machtype = "pmac_oldworld";
+ break;
+ }
+
+ if (strncmp (buf, "machine", sizeof ("machine") - 1) == 0 &&
+ strstr (buf, "CHRP IBM"))
+ {
+ if (strstr (buf, "qemu"))
+ {
+ machtype = "chrp_ibm_qemu";
+ break;
+ }
+ else
+ {
+ machtype = "chrp_ibm";
+ break;
+ }
+ }
+
+ if (strncmp (buf, "platform", sizeof ("platform") - 1) == 0)
+ {
+ if (strstr (buf, "Maple"))
+ {
+ machtype = "maple";
+ break;
+ }
+ if (strstr (buf, "Cell"))
+ {
+ machtype = "cell";
+ break;
+ }
+ }
+ }
+
+ free (buf);
+ fclose (fp);
+ return machtype;
+}
diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c
index a3fcfcaca..28cb37e15 100644
--- a/grub-core/osdep/unix/platform.c
+++ b/grub-core/osdep/unix/platform.c
@@ -218,13 +218,29 @@ grub_install_register_ieee1275 (int is_prep, const char *install_device,
else
boot_device = get_ofpathname (install_device);
- if (grub_util_exec ((const char * []){ "nvsetenv", "boot-device",
- boot_device, NULL }))
+ if (strcmp (grub_install_get_default_powerpc_machtype (), "chrp_ibm") == 0)
{
- char *cmd = xasprintf ("setenv boot-device %s", boot_device);
- grub_util_error (_("`nvsetenv' failed. \nYou will have to set `boot-device' variable manually. At the IEEE1275 prompt, type:\n %s\n"),
- cmd);
- free (cmd);
+ char *arg = xasprintf ("boot-device=%s", boot_device);
+ if (grub_util_exec ((const char * []){ "nvram",
+ "--update-config", arg, NULL }))
+ {
+ char *cmd = xasprintf ("setenv boot-device %s", boot_device);
+ grub_util_error (_("`nvram' failed. \nYou will have to set `boot-device' variable manually. At the IEEE1275 prompt, type:\n %s\n"),
+ cmd);
+ free (cmd);
+ }
+ free (arg);
+ }
+ else
+ {
+ if (grub_util_exec ((const char * []){ "nvsetenv", "boot-device",
+ boot_device, NULL }))
+ {
+ char *cmd = xasprintf ("setenv boot-device %s", boot_device);
+ grub_util_error (_("`nvsetenv' failed. \nYou will have to set `boot-device' variable manually. At the IEEE1275 prompt, type:\n %s\n"),
+ cmd);
+ free (cmd);
+ }
}
free (boot_device);
diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c
index 912269191..c30025b13 100644
--- a/grub-core/osdep/windows/platform.c
+++ b/grub-core/osdep/windows/platform.c
@@ -128,6 +128,12 @@ grub_install_get_default_x86_platform (void)
return "i386-efi";
}
+const char *
+grub_install_get_default_powerpc_machtype (void)
+{
+ return "generic";
+}
+
static void *
get_efi_variable (const wchar_t *varname, ssize_t *len)
{
diff --git a/include/grub/util/install.h b/include/grub/util/install.h
index 5ca4811cd..9f517a1bb 100644
--- a/include/grub/util/install.h
+++ b/include/grub/util/install.h
@@ -223,6 +223,9 @@ grub_install_get_default_arm_platform (void);
const char *
grub_install_get_default_x86_platform (void);
+const char *
+grub_install_get_default_powerpc_machtype (void);
+
int
grub_install_register_efi (grub_device_t efidir_grub_dev,
const char *efifile_path,
diff --git a/util/grub-install.c b/util/grub-install.c
index e1a0202da..70b22eec4 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -1179,7 +1179,18 @@ main (int argc, char *argv[])
if (platform == GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275)
{
+ const char *machtype = grub_install_get_default_powerpc_machtype ();
int is_guess = 0;
+
+ if (strcmp (machtype, "pmac_oldworld") == 0)
+ update_nvram = 0;
+ else if (strcmp (machtype, "cell") == 0)
+ update_nvram = 0;
+ else if (strcmp (machtype, "generic") == 0)
+ update_nvram = 0;
+ else if (strcmp (machtype, "chrp_ibm_qemu") == 0)
+ update_nvram = 0;
+
if (!macppcdir)
{
char *d;

View File

@ -1,16 +0,0 @@
Patches OS X detection out of os-prober hook on non-x86 architectures. The
menu entries generated for those are invalid for non-x86 Mac stuff.
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -45,6 +45,11 @@ if [ -z "${OSPROBED}" ] ; then
fi
osx_entry() {
+ # GRUB won't load OS X outside of x86, no entry
+ case "x`uname -m`" in
+ xi?86|xx86_64) ;;
+ *) return ;;
+ esac
if [ x$2 = x32 ]; then
# TRANSLATORS: it refers to kernel architecture (32-bit)
bitstr="$(gettext "(32-bit)")"

View File

@ -1,52 +0,0 @@
From efc381a55124b12fc74ed8117283f11367c9372a Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
Date: Thu, 25 Sep 2014 19:33:39 -0300
Subject: Disable VSX instruction
VSX bit is enabled by default for Power7 and Power8 CPU models,
so we need to disable them in order to avoid instruction exceptions.
Kernel will activate it when necessary.
* grub-core/kern/powerpc/ieee1275/startup.S: Disable VSX.
Also-By: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
Also-By: Colin Watson <cjwatson@debian.org>
Origin: other, https://lists.gnu.org/archive/html/grub-devel/2014-09/msg00078.html
Last-Update: 2015-01-27
Patch-Name: ppc64el-disable-vsx.patch
---
grub-core/kern/powerpc/ieee1275/startup.S | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/grub-core/kern/powerpc/ieee1275/startup.S b/grub-core/kern/powerpc/ieee1275/startup.S
index 21c884b43..de9a9601a 100644
--- a/grub-core/kern/powerpc/ieee1275/startup.S
+++ b/grub-core/kern/powerpc/ieee1275/startup.S
@@ -20,6 +20,8 @@
#include <grub/symbol.h>
#include <grub/offsets.h>
+#define MSR_VSX 0x80
+
.extern __bss_start
.extern _end
@@ -28,6 +30,16 @@
.globl start, _start
start:
_start:
+ _start:
+
+ /* Disable VSX instruction */
+ mfmsr 0
+ oris 0,0,MSR_VSX
+ /* The "VSX Available" bit is in the lower half of the MSR, so we
+ don't need mtmsrd, which in any case won't work in 32-bit mode. */
+ mtmsr 0
+ isync
+
li 2, 0
li 13, 0

View File

@ -1,62 +0,0 @@
Patch-Source: https://git.savannah.gnu.org/cgit/grub.git/commit/?id=7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763
useful because e2fsprogs 1.47 defaults to this enabled, and grub won't touch it
--
From 7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javierm@redhat.com>
Date: Fri, 11 Jun 2021 21:36:16 +0200
Subject: fs/ext2: Ignore checksum seed incompat feature
This incompat feature is used to denote that the filesystem stored its
metadata checksum seed in the superblock. This is used to allow tune2fs
changing the UUID on a mounted metdata_csum filesystem without having
to rewrite all the disk metadata. However, the GRUB doesn't use the
metadata checksum at all. So, it can just ignore this feature if it
is enabled. This is consistent with the GRUB filesystem code in general
which just does a best effort to access the filesystem's data.
The checksum seed incompat feature has to be removed from the ignore
list if the support for metadata checksum verification is added to the
GRUB ext2 driver later.
Suggested-by: Eric Sandeen <esandeen@redhat.com>
Suggested-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---
grub-core/fs/ext2.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
index e7dd78e..4953a15 100644
--- a/grub-core/fs/ext2.c
+++ b/grub-core/fs/ext2.c
@@ -103,6 +103,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
#define EXT4_FEATURE_INCOMPAT_64BIT 0x0080
#define EXT4_FEATURE_INCOMPAT_MMP 0x0100
#define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
+#define EXT4_FEATURE_INCOMPAT_CSUM_SEED 0x2000
#define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000
/* The set of back-incompatible features this driver DOES support. Add (OR)
@@ -123,10 +124,15 @@ GRUB_MOD_LICENSE ("GPLv3+");
* mmp: Not really back-incompatible - was added as such to
* avoid multiple read-write mounts. Safe to ignore for this
* RO driver.
+ * checksum seed: Not really back-incompatible - was added to allow tools
+ * such as tune2fs to change the UUID on a mounted metadata
+ * checksummed filesystem. Safe to ignore for now since the
+ * driver doesn't support checksum verification. However, it
+ * has to be removed from this list if the support is added later.
*/
#define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \
- | EXT4_FEATURE_INCOMPAT_MMP)
-
+ | EXT4_FEATURE_INCOMPAT_MMP \
+ | EXT4_FEATURE_INCOMPAT_CSUM_SEED)
#define EXT3_JOURNAL_MAGIC_NUMBER 0xc03b3998U
--
cgit v1.1

View File

@ -1,60 +0,0 @@
Patch-Source: https://git.savannah.gnu.org/cgit/grub.git/patch/?id=2e9fa73a040462b81bfbfe56c0bc7ad2d30b446b
useful to support the large_dir ext4 feature
--
From 2e9fa73a040462b81bfbfe56c0bc7ad2d30b446b Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 30 Aug 2022 22:41:59 -0400
Subject: fs/ext2: Ignore the large_dir incompat feature
Recently, ext4 added the large_dir feature, which adds support for
a 3 level htree directory support.
The GRUB supports existing file systems with htree directories by
ignoring their existence, and since the index nodes for the hash tree
look like deleted directory entries (by design), the GRUB can simply do
a brute force O(n) linear search of directories. The same is true for
3 level deep htrees indicated by large_dir feature flag.
Hence, it is safe for the GRUB to ignore the large_dir incompat feature.
Fixes: https://savannah.gnu.org/bugs/?61606
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---
grub-core/fs/ext2.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
index 0989e26..e1cc5e6 100644
--- a/grub-core/fs/ext2.c
+++ b/grub-core/fs/ext2.c
@@ -104,6 +104,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
#define EXT4_FEATURE_INCOMPAT_MMP 0x0100
#define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
#define EXT4_FEATURE_INCOMPAT_CSUM_SEED 0x2000
+#define EXT4_FEATURE_INCOMPAT_LARGEDIR 0x4000 /* >2GB or 3 level htree */
#define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000
/* The set of back-incompatible features this driver DOES support. Add (OR)
@@ -129,10 +130,17 @@ GRUB_MOD_LICENSE ("GPLv3+");
* checksummed filesystem. Safe to ignore for now since the
* driver doesn't support checksum verification. However, it
* has to be removed from this list if the support is added later.
+ * large_dir: Not back-incompatible given that the GRUB ext2 driver does
+ * not implement EXT2_FEATURE_COMPAT_DIR_INDEX. If the GRUB
+ * eventually supports the htree feature (aka dir_index)
+ * it should support 3 level htrees and then move
+ * EXT4_FEATURE_INCOMPAT_LARGEDIR to
+ * EXT2_DRIVER_SUPPORTED_INCOMPAT.
*/
#define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \
| EXT4_FEATURE_INCOMPAT_MMP \
- | EXT4_FEATURE_INCOMPAT_CSUM_SEED)
+ | EXT4_FEATURE_INCOMPAT_CSUM_SEED \
+ | EXT4_FEATURE_INCOMPAT_LARGEDIR)
#define EXT3_JOURNAL_MAGIC_NUMBER 0xc03b3998U
--
cgit v1.1

View File

@ -1,223 +0,0 @@
# Template file for 'grub'
pkgname=grub
version=2.06
revision=4
hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man
automake gettext-devel-tools"
makedepends="libusb-compat-devel ncurses-devel freetype-devel
liblzma-devel device-mapper-devel fuse-devel"
depends="os-prober"
conf_files="/etc/default/grub /etc/grub.d/*"
short_desc="GRand Unified Bootloader 2"
maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/grub/"
distfiles="${GNU_SITE}/grub/grub-${version}.tar.xz"
checksum=b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1
archs="i686 x86_64-musl"
nopie=yes
subpackages="grub-utils"
# _SUPPLEMENTARY_BUILDS is a list of <TARGET>-<PLATFORN> version of grub to build
case "$XBPS_TARGET_MACHINE" in
x86_64*)
_NATIVE_PLATFORM=pc
_SUPPLEMENTARY_BUILDS="i386-efi x86_64-efi i386-coreboot x86_64-xen"
subpackages+=" grub-i386-efi grub-x86_64-efi grub-i386-coreboot grub-xen"
;;
i686*)
CFLAGS="-D_FILE_OFFSET_BITS=64"
hostmakedepends+=" cross-x86_64-linux-musl"
configure_args+=" ac_cv_sizeof_off_t=8"
_NATIVE_PLATFORM=pc
_SUPPLEMENTARY_BUILDS="i386-efi x86_64-efi i386-coreboot i386-xen"
subpackages+=" grub-i386-efi grub-x86_64-efi grub-i386-coreboot grub-xen"
;;
aarch64*)
_NATIVE_PLATFORM=efi
subpackages+=" grub-arm64-efi"
;;
ppc*)
_NATIVE_PLATFORM=ieee1275
subpackages+=" grub-powerpc-ieee1275"
;;
esac
pre_configure() {
autoreconf -fi
}
do_configure() {
# workaround for https://savannah.gnu.org/bugs/?60458
# some more info: https://www.linuxquestions.org/questions/showthread.php?p=6257712
# grub 2.06 reboots immediately when compiled with -O2,
# only affects legacy BIOS
export CFLAGS="${CFLAGS/-O2/-Os}"
export CXXFLAGS="${CXXFLAGS/-O2/-Os}"
unset CC AS LD RANLIB CPP
local freestanding_cflags="-fno-stack-protector"
# building with altivec generates broken grub core
case "$XBPS_TARGET_MACHINE" in
ppc*) freestanding_cflags+=" -mno-altivec" ;;
esac
CFLAGS+=" $freestanding_cflags"
configure_args+=" --enable-device-mapper --enable-cache-stats --enable-nls
--enable-grub-mkfont --enable-grub-mount --disable-werror
--sbindir=/usr/bin"
# build tools
msg_normal "Configuring grub tools...\n"
mkdir $wrksrc/build
cd $wrksrc/build
../configure --host=${XBPS_TARGET_MACHINE} ${configure_args} \
${_NATIVE_PLATFORM:+--with-platform=${_NATIVE_PLATFORM}}
for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
_TARGET=${_SUPP_BUILD%%-*}
_PLATFORM=${_SUPP_BUILD##*-}
msg_normal "Configuring ${_TARGET} ${_PLATFORM} grub...\n"
mkdir $wrksrc/${_PLATFORM}_${_TARGET}_build
cd $wrksrc/${_PLATFORM}_${_TARGET}_build
if [ "$_TARGET" = x86_64 ] &&
[ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
_TARGET=x86_64-linux-musl
fi
CFLAGS="$freestanding_cflags" \
../configure --host=${XBPS_TARGET_MACHINE} \
--target=${_TARGET} \
--with-platform=${_PLATFORM} ${configure_args} \
--disable-efiemu \
--libdir=/usr/lib
done
}
do_build() {
# XXX remove the strip wrapper
rm ${XBPS_WRAPPERDIR}/strip
msg_normal "Building grub tools...\n"
cd $wrksrc/build
make ${makejobs}
for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
_TARGET=${_SUPP_BUILD%%-*}
_PLATFORM=${_SUPP_BUILD##*-}
msg_normal "Building ${_TARGET} ${_PLATFORM} grub...\n"
cd $wrksrc/${_PLATFORM}_${_TARGET}_build
make ${makejobs}
done
}
do_install() {
# XXX remove the strip wrapper
rm ${XBPS_WRAPPERDIR}/strip
for _SUPP_BUILD in ${_SUPPLEMENTARY_BUILDS}; do
_TARGET=${_SUPP_BUILD%%-*}
_GRUB_TARGET=${_TARGET}
case "${_GRUB_TARGET}" in
aarch64*)
_GRUB_TARGET=arm64
;;
esac
_PLATFORM=${_SUPP_BUILD##*-}
cd $wrksrc/${_PLATFORM}_${_TARGET}_build
make DESTDIR=$DESTDIR/${_PLATFORM}_${_TARGET} install
# Remove non-platform specific files
rm -rf ${DESTDIR}/${_PLATFORM}_${_TARGET}/{boot,etc,usr/{share,bin}}
rm -f ${DESTDIR}/${_PLATFORM}_${_TARGET}/usr/lib/grub/${_GRUB_TARGET}-${_PLATFORM}/${_GRUB_TARGET}-*
rm -f ${DESTDIR}/${_PLATFORM}_${_TARGET}/usr/lib/grub/${_GRUB_TARGET}-${_PLATFORM}/*.{module,image}
cp -r ${DESTDIR}/${_PLATFORM}_${_TARGET}/* ${DESTDIR}
rm -rf ${DESTDIR}/${_PLATFORM}_${_TARGET}
done
cd $wrksrc/build
make DESTDIR=$DESTDIR install
# Required to compress info files.
vmkdir usr/share/info
touch -f ${DESTDIR}/usr/share/info/dir
vinstall ${FILESDIR}/grub.default 644 etc/default grub
# Kernel hooks.
vinstall ${FILESDIR}/kernel.d/grub.post 750 \
etc/kernel.d/post-install 50-grub
vinstall ${FILESDIR}/kernel.d/grub.post 750 \
etc/kernel.d/post-remove 50-grub
# update-grub for noobs.
printf "#!/bin/sh\ngrub-mkconfig -o /boot/grub/grub.cfg\nexit \$?\n" >> \
${DESTDIR}/usr/bin/update-grub
chmod 755 ${DESTDIR}/usr/bin/update-grub
vmkdir usr/share/bash-completion/completions
mv ${DESTDIR}/etc/bash_completion.d/grub \
${DESTDIR}/usr/share/bash-completion/completions
# Remove useless tools
rm ${DESTDIR}/usr/bin/grub-ofpathname
rm ${DESTDIR}/usr/bin/grub-sparc64-setup
}
grub-utils_package() {
short_desc+=" - additional utilities"
depends="grub>=${version}"
pkg_install() {
vmove usr/bin/grub-menulst2cfg
vmove usr/bin/grub-fstest
vmove usr/bin/grub-mkfont
}
}
grub-x86_64-efi_package() {
depends="grub>=$version dosfstools efibootmgr"
short_desc+=" - x86_64 EFI support"
pkg_install() {
vmove usr/lib/grub/x86_64-efi
}
}
grub-i386-efi_package() {
depends="grub>=$version dosfstools efibootmgr"
short_desc+=" - i386 EFI support"
pkg_install() {
vmove usr/lib/grub/i386-efi
}
}
grub-i386-coreboot_package() {
depends="grub>=$version"
short_desc+=" - i386 coreboot support"
pkg_install() {
vmove usr/lib/grub/i386-coreboot
}
}
grub-xen_package() {
depends="grub>=$version"
short_desc+=" - Xen PV support"
pkg_install() {
case "$XBPS_TARGET_MACHINE" in
x86_64*)
vmove usr/lib/grub/x86_64-xen
;;
i686*)
vmove usr/lib/grub/i386-xen
;;
esac
}
}
grub-arm64-efi_package() {
depends="grub>=$version dosfstools efibootmgr"
short_desc+=" - arm64 EFI support"
pkg_install() {
vmove usr/lib/grub/arm64-efi
}
}
grub-powerpc-ieee1275_package() {
depends="grub>=$version powerpc-utils"
short_desc+=" - powerpc Open Firmware support"
pkg_install() {
vmove usr/lib/grub/powerpc-ieee1275
}
}

View File

@ -1,10 +1,10 @@
#!/bin/sh #!/bin/sh
pkgname=gtkloadspinner pkgname=gtkloadspinner
version=1.0 version=1.0
revision=2 revision=3
short_desc="Ridonculously simple spinner for GTK" short_desc="Ridonculously simple spinner for GTK"
maintainer="Tracker-Friendly <jliwin98@danwin1210.de>" maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
homepage="https://hectabit.org/centrifuge/hectabit/GtkLoadSpinner" homepage="https://centrifuge.hectabit.org/hectabit/GtkLoadSpinner"
license="GPL-3.0" license="GPL-3.0"
makedepends="make gcc git pkg-config gtk+3-devel" makedepends="make gcc git pkg-config gtk+3-devel"
depends="gtk+3" depends="gtk+3"
@ -13,7 +13,7 @@ do_build() {
echo "Building..." echo "Building..."
cd ${XBPS_BUILDDIR} cd ${XBPS_BUILDDIR}
rm -rf gtkgreet rm -rf gtkgreet
git clone https://hectabit.org/centrifuge/hectabit/GtkLoadSpinner.git git clone https://centrifuge.hectabit.org/hectabit/GtkLoadSpinner
cd GtkLoadSpinner cd GtkLoadSpinner
make make
} }

View File

@ -1,18 +1,18 @@
# Template file for 'linux-base' # Template file for 'linux-base'
pkgname=linux-base pkgname=linux-base
version=2021.07.21 version=2023.10.26
revision=1 revision=0
build_style=meta build_style=meta
short_desc="Linux kernel base dependencies" short_desc="Linux kernel base dependencies"
maintainer="Érico Nogueira <ericonr@disroot.org>" maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
license="Public Domain" license="Public Domain"
homepage="https://voidlinux.org/" homepage="https://voidlinux.org/"
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) i686*|x86_64*)
depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network booster" depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network booster-evolution"
;; ;;
ppc*|armv7l*|aarch64*) ppc*|armv7l*|aarch64*)
depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network booster" depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network booster-evolution"
;; ;;
esac esac

View File

@ -4,7 +4,7 @@ version=7.1.0
revision=8 revision=8
short_desc="Simple system information script (not my software)" short_desc="Simple system information script (not my software)"
maintainer="Tracker-Friendly <jliwin98@danwin1210.de>" maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
homepage="https://hectabit.org/centrifuge/evolutionos/neofetch" homepage="https://centrifuge.hectabit.org/evolutionos/neofetch"
license="MIT" license="MIT"
makedepends="make git" makedepends="make git"
depends="bash" depends="bash"
@ -16,7 +16,7 @@ do_build() {
do_install() { do_install() {
echo "Installing..." echo "Installing..."
git clone --depth=1 https://hectabit.org/centrifuge/evolutionos/neofetch.git git clone --depth=1 https://centrifuge.hectabit.org/evolutionos/neofetch.git
cd neofetch cd neofetch
mkdir -p ${DESTDIR}/usr/ mkdir -p ${DESTDIR}/usr/
make PREFIX=${DESTDIR}/usr/ install make PREFIX=${DESTDIR}/usr/ install