verita84/arch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Your Name 2024-11-09 22:46:16 -07:00
parent e18923d061
commit df89f0c859
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gentoo.sh
View File

@ -50,7 +50,7 @@ ROOT_PARTITION_SIZE="30GB"
FEATURES="-pid-sandbox getbinpkg -binpkg-request-signature"
EMERGE_DEFAULT_OPTS="--getbinpkg "
#USEFLAG CONFIGURATION
USE_FLAGS="systemd-boot dist-kernel postscript webchannel qml -gpm plasma luks cryptsetup kernel-install boot proprietary-codecs libei gdk-pixbuf kernel-install gles2 pulseaudio keeshare gtk vpx bluray libaom libdrm libilbc libplacebo libsoxr libv4l libxml2 lv2 openh264 encode iconv ladspa libass libcaca mp3 openal opus theora v4l vorbis xvid x264 gstreamer networkmanager tray appindicator wayland alsa X sound-server screencast systemd firmware btrfs policykit networkmanager zlib pipewire minizip network browser "
USE_FLAGS=" systemd-boot -webengine jumbo-build hwaccel -telemetry dist-kernel postscript webchannel qml -gpm plasma luks cryptsetup kernel-install boot proprietary-codecs kernel-install gles2 pulseaudio keeshare vpx bluray libaom libdrm libilbc libplacebo libsoxr libv4l libxml2 lv2 openh264 encode iconv ladspa libass libcaca mp3 openal opus theora v4l vorbis xvid x264 gstreamer wayland alsa X sound-server screencast systemd firmware btrfs policykit networkmanager zlib pipewire minizip network browser "
VIDEO_CARDS="amdgpu radeon radeonsi"
#
#PACKAGE CONFIGURATION
@ -63,7 +63,7 @@ TMPFS_SIZE="32G"
CPU_TYPE="x86-64"
#Add Masked Packages to the Array
MASKED_PACKAGES+=( media-video/obs-studio net-misc/nyx net-libs/stem sys-libs/libudev-compat dev-libs/nss dev-libs/libappindicator media-video/ffmpeg games-util/game-device-udev-rules games-util/steam-launcher net-im/telegram-desktop-bin)
MASKED_PACKAGES+=(media-video/obs-studio net-misc/nyx net-libs/stem sys-libs/libudev-compat dev-libs/nss dev-libs/libappindicator media-video/ffmpeg games-util/game-device-udev-rules games-util/steam-launcher net-im/telegram-desktop-bin)
partitionDetection() {
#This is used for the installer to do script-based actions
@ -185,6 +185,12 @@ installNvidia() {
ACCEPT_KEYWORDS="~amd64" emerge x11-drivers/nvidia-drivers nvidia-cuda-toolkit www-apps/jellyfin net-im/coturn
}
localRepo() {
mkdir -p $TARGET/etc/portage/repos.conf
cp -f repos.conf $TARGET/etc/portage/repos.conf/
echo "GENTOO_MIRRORS=\"http://192.168.0.55/\"" >>$TARGET/etc/portage/make.conf
}
configurePortage() {
sed -i "s/-O2/-march=$CPU_TYPE -O2/i" $TARGET/etc/portage/make.conf
@ -192,22 +198,17 @@ configurePortage() {
echo "FEATURES=\"$FEATURES\"" >>$TARGET/etc/portage/make.conf
echo "EMERGE_DEFAULT_OPTS=\"$EMERGE_DEFAULT_OPTS\"" >>$TARGET/etc/portage/make.conf
echo "L10N=\"en en-US\"" >>$TARGET/etc/portage/make.conf
echo 'EXTRA_ECONF="--disable-bootstrap"' >>$TARGET/etc/portage/make.conf
mkdir -p $TARGET/var/tmp/portage
mkdir -p $TARGET/etc/portage/env
echo 'EXTRA_ECONF="--disable-bootstrap"'> $TARGET/etc/portage/env/gcc.conf
echo "sys-devel/gcc gcc.conf" > $TARGET/etc/portage/package.env
echo "sys-devel/llvm gcc.conf" >> $TARGET/etc/portage/package.env
echo 'EXTRA_ECONF="--disable-bootstrap"' >$TARGET/etc/portage/env/gcc.conf
echo "sys-devel/gcc gcc.conf" >$TARGET/etc/portage/package.env
echo "sys-devel/llvm gcc.conf" >>$TARGET/etc/portage/package.env
if [ -f "./repos.conf" ]; then
echo
echo "Found Local Gentoo Repo"
mkdir -p $TARGET/etc/portage/repos.conf
mkdir -p $TARGET/etc/portage/binrepos.conf
cp -f repos.conf $TARGET/etc/portage/repos.conf/
cp -f gentoobinhost.conf $TARGET/etc/portage/binrepos.conf/gentoobinhost.conf
echo "GENTOO_MIRRORS=\"https://mirrors.poster.place/\"" >>$TARGET/etc/portage/make.conf
localRepo
echo
echo
fi
@ -806,7 +807,7 @@ bootloader() {
#find /boot/* -type d -exec rm -rf {} \;
bootctl install
MACHINE_ID=$(cat /etc/machine-id)
KERNEL="kernel-$(ls /boot | grep kernel | cut -d '-' -f2-4 | head -1)"
KERNEL="kernel-$(ls /boot/$MACHINE_ID | grep gentoo)"
KERNEL_VERSION=$(echo $KERNEL | cut -d '-' -f2-4)
LOADER_FILE="/boot/loader/entries/$MACHINE_ID-$KERNEL_VERSION.conf"
PREVIOUS_LOADER_FILE="/boot/loader/entries/previous.conf"
@ -851,7 +852,7 @@ bootloader() {
echo "version $KERNEL_VERSION" >>$LOADER_FILE
echo "options $KERNEL_COMMAND_LINE " >>$LOADER_FILE
echo "machine-id $MACHINE_ID" >>$LOADER_FILE
echo "linux /$KERNEL" >>$LOADER_FILE
echo "linux /$MACHINE_ID/$KERNEL_VERSION/linux" >>$LOADER_FILE
echo "initrd /$MACHINE_ID/$KERNEL_VERSION/initrd" >>$LOADER_FILE
#Generate Previous Boot Entry
@ -909,6 +910,8 @@ elif [ "$1" = "remove-snapshot" ]; then
remove-snapshots
elif [ "$1" = "fix-base" ]; then
fixBase
elif [ "$1" = "local-repo" ]; then
localRepo
elif [ "$1" = "help" ]; then
show-help
else