Skip to content

Commit

Permalink
Fix Gentoo build
Browse files Browse the repository at this point in the history
  • Loading branch information
sebanc committed Jan 25, 2024
1 parent 0a1bed0 commit f72f8a6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/live.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout linuxloops script
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set current date
run: echo "current_date=$(date '+%Y%m%d')" >> $GITHUB_ENV
- name: Build Linuxloops Live Disk
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
matrix: ${{ steps.distros.outputs.matrix }}
steps:
- name: Checkout linuxloops source code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Create build matrix
id: distros
run: |
Expand Down Expand Up @@ -53,6 +53,6 @@ jobs:
echo "Free space:"
df -h
- name: Checkout linuxloops source code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Launch distro build
run: sudo bash linuxloops -dst test.img -t -s 50 -distro $(echo ${{ matrix.distro }} | cut -d'#' -f1) -env $(echo ${{ matrix.distro }} | cut -d'#' -f2) $(echo ${{ matrix.distro }} | cut -d'#' -f3) $(echo ${{ matrix.distro }} | cut -d'#' -f4) $(echo ${{ matrix.distro }} | cut -d'#' -f5) $(echo ${{ matrix.distro }} | cut -d'#' -f6) $(echo ${{ matrix.distro }} | cut -d'#' -f7)
8 changes: 4 additions & 4 deletions linuxloops
Original file line number Diff line number Diff line change
Expand Up @@ -3012,9 +3012,9 @@ mkdir /etc/portage/package.license
echo '*/* *' >> /etc/portage/package.license/custom
echo "VIDEO_CARDS=\"amdgpu dummy fbdev intel nouveau qxl radeon radeonsi vesa virtualbox\"" >> /etc/portage/make.conf
if [ "$(echo ${desktop} | cut -d '/' -f2)" == "Openrc" ]; then
echo "USE=\"a52 aac accessibility alsa appindicator bluetooth boost branding cairo cdda client colord cups dbus drm dts dvd eds egl elogind exif flac gif gles2 gstreamer gtk gtk3 icu introspection jpeg keyring lcms libei libnotify lock mbim mdnsresponder-compat modemmanager mount mp3 mpeg networkmanager nss ogg opengl pango pdf png policykit pulseaudio python qml sdl secureboot spell svg sysprof -systemd text theora tiff tracker truetype udev udisks usb vorbis vulkan wayland wpasupplicant X x264 xml xorg zeroconf\"" >> /etc/portage/make.conf
echo "USE=\"a52 aac accessibility alsa appindicator bluetooth boost branding cairo cdda client colord cups dbus dracut drm dts dvd eds egl elogind exif flac gif gles2 gstreamer gtk gtk3 icu introspection jpeg keyring lcms libei libnotify lock mbim mdnsresponder-compat modemmanager mount mp3 mpeg networkmanager nss ogg opengl pango pdf png policykit pulseaudio python qml sdl secureboot spell svg sysprof -systemd text theora tiff tracker truetype udev udisks usb vorbis vulkan wayland wpasupplicant X x264 xml xorg zeroconf\"" >> /etc/portage/make.conf
else
echo "USE=\"a52 aac accessibility alsa appindicator bluetooth boost branding cairo cdda client colord cups dbus drm dts dvd eds egl -elogind exif flac gif gles2 gstreamer gtk gtk3 icu introspection jpeg keyring lcms libei libnotify lock mbim mdnsresponder-compat modemmanager mount mp3 mpeg networkmanager nss ogg opengl pango pdf png policykit pulseaudio python qml sdl secureboot spell svg sysprof systemd text theora tiff tracker truetype udev udisks usb vorbis vulkan wayland wpasupplicant X x264 xml xorg zeroconf\"" >> /etc/portage/make.conf
echo "USE=\"a52 aac accessibility alsa appindicator bluetooth boost branding cairo cdda client colord cups dbus dracut drm dts dvd eds egl -elogind exif flac gif gles2 gstreamer gtk gtk3 icu introspection jpeg keyring lcms libei libnotify lock mbim mdnsresponder-compat modemmanager mount mp3 mpeg networkmanager nss ogg opengl pango pdf png policykit pulseaudio python qml sdl secureboot spell svg sysprof systemd text theora tiff tracker truetype udev udisks usb vorbis vulkan wayland wpasupplicant X x264 xml xorg zeroconf\"" >> /etc/portage/make.conf
fi
echo "GRUB_PLATFORMS=\"efi-64\"" >> /etc/portage/make.conf
echo -e "MAKEOPTS=\"--jobs 2\"\nEMERGE_DEFAULT_OPTS=\"--jobs 2 --getbinpkg\"" >> /etc/portage/make.conf
Expand Down Expand Up @@ -4592,11 +4592,11 @@ echo -e 'APT::Install-Recommends "0";\nAPT::Get::Install-Recommends "false";' >
echo -e 'Dpkg::Options {\n "--force-confnew";\n};' > /etc/apt/apt.conf.d/71debconf
yes | DEBIAN_FRONTEND=noninteractive apt update
yes | DEBIAN_FRONTEND=noninteractive apt install ca-certificates console-setup dirmngr gpg kbd locales parrot-core
sed -i 's@https://deb.parrot.sh/parrot\\|https://deb.parrot.sh/direct/parrot@http://mirrors.mit.edu/parrot/@g' /etc/apt/sources.list.d/parrot.list
sed -i 's@https://deb.parrot.sh/parrot\\|https://deb.parrot.sh/direct/parrot@http://mirror.parrot.sh/parrot@g' /etc/apt/sources.list.d/parrot.list
echo -e 'Dpkg::Options {\n "--force-confdef";\n};' > /etc/apt/apt.conf.d/71debconf
yes | DEBIAN_FRONTEND=noninteractive apt update
yes | DEBIAN_FRONTEND=noninteractive apt dist-upgrade
sed -i 's@https://deb.parrot.sh/parrot\\|https://deb.parrot.sh/direct/parrot@http://mirrors.mit.edu/parrot/@g' /etc/apt/sources.list.d/parrot.list
sed -i 's@https://deb.parrot.sh/parrot\\|https://deb.parrot.sh/direct/parrot@http://mirror.parrot.sh/parrot@g' /etc/apt/sources.list.d/parrot.list
yes | DEBIAN_FRONTEND=noninteractive apt install linux-image-amd64 linux-headers-amd64 dkms firmware-linux firmware-atheros firmware-iwlwifi firmware-realtek wireless-regdb bash sudo modemmanager network-manager wpasupplicant bluez cryptsetup-initramfs e2fsprogs ntfs-3g nano acpid curl thermald bash-completion gnupg-utils policykit-1 xdg-user-dirs zstd fwupd-signed patchutils net-tools usb-modeswitch upower efibootmgr grub-efi grub-efi-amd64-bin os-prober shim-signed amd64-microcode intel-microcode lsb-release sbsigntool mokutil dosfstools btrfs-progs cpio
CHROOT_INIT
chmod 0755 "${linuxloopsdir}"/chroot/bootstrap/linuxloops/chroot_init
Expand Down

0 comments on commit f72f8a6

Please sign in to comment.