| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | Makefile | 17 | ||||
| -rw-r--r-- | archinstall/lib/hardware.py | 18 | ||||
| -rw-r--r-- | archinstall/lib/mirrors.py | 4 | ||||
| -rw-r--r-- | archinstall/lib/networking.py | 11 | ||||
| -rw-r--r-- | archinstall/lib/user_interaction/system_conf.py | 2 | ||||
| -rw-r--r-- | examples/guided.py | 8 | ||||
| -rw-r--r-- | profiles/applications/pipewire.py | 2 |
diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..53e8b008 --- /dev/null +++ b/Makefile @@ -0,0 +1,17 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +PREFIX ?= /usr/local + +all: + +V=$(shell git describe) + +dist: + git archive --format=tar --prefix=archinstall32-$(V)/ $(V) | gzip -9 > archinstall32-$(V).tar.gz + gpg --detach-sign --use-agent archinstall32-$(V).tar.gz + +upload: + scp archinstall32-$(V).tar.gz archinstall32-$(V).tar.gz.sig sources.archlinux32.org:sources/ + +.PHONY: dist upload diff --git a/archinstall/lib/hardware.py b/archinstall/lib/hardware.py index 9660ea95..8400d338 100644 --- a/archinstall/lib/hardware.py +++ b/archinstall/lib/hardware.py @@ -15,12 +15,12 @@ __packages__ = [ "xf86-video-ati", "xf86-video-nouveau", "xf86-video-vmware", + "xf86-video-intel", + "xf86-video-qxl", "libva-mesa-driver", "libva-intel-driver", - "intel-media-driver", "vulkan-radeon", "vulkan-intel", - "nvidia", ] AVAILABLE_GFX_DRIVERS = { @@ -32,9 +32,10 @@ AVAILABLE_GFX_DRIVERS = { "xf86-video-ati", "xf86-video-nouveau", "xf86-video-vmware", + "xf86-video-intel", + "xf86-video-qxl", "libva-mesa-driver", "libva-intel-driver", - "intel-media-driver", "vulkan-radeon", "vulkan-intel", ], @@ -45,20 +46,21 @@ AVAILABLE_GFX_DRIVERS = { "libva-mesa-driver", "vulkan-radeon", ], - "Intel (open-source)": [ + "Intel (open-source, modern)": [ "mesa", "libva-intel-driver", - "intel-media-driver", "vulkan-intel", ], - "Nvidia (open kernel module for newer GPUs, Turing+)": ["nvidia-open"], + "Intel (open-source, old)": [ + "mesa", + "xf86-video-intel" + ], "Nvidia (open-source nouveau driver)": [ "mesa", "xf86-video-nouveau", "libva-mesa-driver" ], - "Nvidia (proprietary)": ["nvidia"], - "VMware / VirtualBox (open-source)": ["mesa", "xf86-video-vmware"], + "VMware / VirtualBox / QXL (open-source)": ["mesa", "xf86-video-vmware", "xf86-video-qxl"], } CPUINFO = Path("/proc/cpuinfo") diff --git a/archinstall/lib/mirrors.py b/archinstall/lib/mirrors.py index d76e0473..f78a8b18 100644 --- a/archinstall/lib/mirrors.py +++ b/archinstall/lib/mirrors.py @@ -67,7 +67,7 @@ def filter_mirrors_by_region(regions :str, :type regions: str """ region_list = [f'country={region}' for region in regions.split(',')] - response = urllib.request.urlopen(urllib.request.Request(f"https://archlinux.org/mirrorlist/?{'&'.join(region_list)}&protocol=https&protocol=http&ip_version=4&ip_version=6&use_mirror_status=on'", headers={'User-Agent': 'ArchInstall'})) + response = urllib.request.urlopen(urllib.request.Request(f"https://archlinux32.org/mirrorlist/?{'&'.join(region_list)}&protocol=https&protocol=http&ip_version=4&ip_version=6&use_mirror_status=on'", headers={'User-Agent': 'ArchInstall'})) new_list = response.read().replace(b"#Server", b"Server") if sort_order: @@ -152,7 +152,7 @@ def list_mirrors(sort_order :List[str] = ["https", "http"]) -> Dict[str, Any]: with pathlib.Path('/etc/pacman.d/mirrorlist').open('rb') as fh: mirrorlist = fh.read() else: - url = "https://archlinux.org/mirrorlist/?protocol=https&protocol=http&ip_version=4&ip_version=6&use_mirror_status=on" + url = "https://archlinux32.org/mirrorlist/?protocol=https&protocol=http&ip_version=4&ip_version=6&use_mirror_status=on" try: response = urllib.request.urlopen(url) diff --git a/archinstall/lib/networking.py b/archinstall/lib/networking.py index 96e8f3a1..5a60886f 100644 --- a/archinstall/lib/networking.py +++ b/archinstall/lib/networking.py @@ -54,6 +54,17 @@ def update_keyring() -> bool: return False +# TODO: this should be a function maybe upstream taking a parameter.. copy pasting for now.. +def update_keyring32() -> bool: + log("Updating archlinux32-keyring ...", level=logging.INFO) + if run_pacman("-Sy --noconfirm archlinux32-keyring").exit_code == 0: + return True + + elif os.geteuid() != 0: + log("update_keyring32() uses 'pacman -Sy archlinux32-keyring' which requires root.", level=logging.ERROR, fg="red") + + return False + def enrich_iface_types(interfaces: Union[Dict[str, Any], List[str]]) -> Dict[str, str]: result = {} diff --git a/archinstall/lib/user_interaction/system_conf.py b/archinstall/lib/user_interaction/system_conf.py index 42a6cec7..8454a3da 100644 --- a/archinstall/lib/user_interaction/system_conf.py +++ b/archinstall/lib/user_interaction/system_conf.py @@ -21,7 +21,7 @@ def select_kernel(preset: List[str] = None) -> List[str]: :rtype: string """ - kernels = ["linux", "linux-lts", "linux-zen", "linux-hardened"] + kernels = ["linux", "linux-lts", "linux-zen", "linux-pae"] default_kernel = "linux" warning = str(_('Are you sure you want to reset this setting?')) diff --git a/examples/guided.py b/examples/guided.py index e242138e..f0b52299 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -282,6 +282,14 @@ if archinstall.arguments.get('skip-mirror-check', False) is False and archinstal if not archinstall.arguments.get('offline'): latest_version_archlinux_keyring = max([k.pkg_version for k in archinstall.find_package('archlinux-keyring')]) + # For now always update for now, we don't have the coresponding package search API + if archinstall.arguments.get('skip-keyring-update', False) is False: + # Then we update the keyring in the ISO environment + if not archinstall.update_keyring32(): + log_file = os.path.join(archinstall.storage.get('LOG_PATH', None), archinstall.storage.get('LOG_FILE', None)) + archinstall.log(f"Failed to update the Arch32 keyring. Please check your internet connection and the log file '{log_file}'.", level=logging.INFO, fg="red") + exit(1) + # If we want to check for keyring updates # and the installed package version is lower than the upstream version if archinstall.arguments.get('skip-keyring-update', False) is False and \ diff --git a/profiles/applications/pipewire.py b/profiles/applications/pipewire.py index b6e79347..1da7c617 100644 --- a/profiles/applications/pipewire.py +++ b/profiles/applications/pipewire.py @@ -3,7 +3,7 @@ import logging # Define the package list in order for lib to source # which packages will be installed by this profile -__packages__ = ["pipewire", "pipewire-alsa", "pipewire-jack", "pipewire-pulse", "gst-plugin-pipewire", "libpulse", "wireplumber"] +__packages__ = ["pipewire", "pipewire-alsa", "pipewire-jack", "pipewire-pulse", "gst-plugin-pipewire", "libpulse", "pipewire-media-session"] archinstall.log('Installing pipewire', level=logging.INFO) archinstall.storage['installation_session'].add_additional_packages(__packages__) |