[arch-releng] [archiso] [PATCH 1/2] Add common KMS modules to the releng initramfs image.
On machines with common graphics chipsets (radeon, intel, nvidia), enable KMS early. Downloading images from a remote server can take time, better view the status with a nice resolution. --- archiso/Makefile | 2 ++ archiso/install/archiso_kms | 14 ++++++++++++++ configs/releng/mkinitcpio.conf | 2 +- 3 files changed, 17 insertions(+), 1 deletions(-) create mode 100644 archiso/install/archiso_kms diff --git a/archiso/Makefile b/archiso/Makefile index 11aff53..a073adf 100644 --- a/archiso/Makefile +++ b/archiso/Makefile @@ -26,6 +26,7 @@ install-hooks: install -D -m 644 install/archiso_pxe_nfs $(DESTDIR)/lib/initcpio/install/archiso_pxe_nfs install -D -m 644 hooks/archiso_loop_mnt $(DESTDIR)/lib/initcpio/hooks/archiso_loop_mnt install -D -m 644 install/archiso_loop_mnt $(DESTDIR)/lib/initcpio/install/archiso_loop_mnt + install -D -m 644 install/archiso_kms $(DESTDIR)/lib/initcpio/install/archiso_kms install-examples: # install examples @@ -55,6 +56,7 @@ uninstall: rm -f $(DESTDIR)/lib/initcpio/install/archiso_pxe_nfs rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_loop_mnt rm -f $(DESTDIR)/lib/initcpio/install/archiso_loop_mnt + rm -f $(DESTDIR)/lib/initcpio/install/archiso_kms rm -rf $(DESTDIR)/usr/share/archiso/ .PHONY: install install-program install-hooks install-examples install-doc uninstall diff --git a/archiso/install/archiso_kms b/archiso/install/archiso_kms new file mode 100644 index 0000000..1dd18cc --- /dev/null +++ b/archiso/install/archiso_kms @@ -0,0 +1,14 @@ +#!/bin/bash + +build() { + MODULES="radeon nouveau i915 via-agp sis-agp intel-agp" + if [[ $(uname -m) = i686 ]]; then + MODULES+=" amd64-agp ati-agp sworks-agp ali-agp amd-k7-agp nvidia-agp efficeon-agp" + fi +} + +help() { + cat << HELPEOF +Adds all common KMS drivers to the initramfs image. +HELPEOF +} diff --git a/configs/releng/mkinitcpio.conf b/configs/releng/mkinitcpio.conf index 8d77dee..5570ed6 100644 --- a/configs/releng/mkinitcpio.conf +++ b/configs/releng/mkinitcpio.conf @@ -1,2 +1,2 @@ -HOOKS="base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_curl archiso_pxe_nfs pata scsi sata virtio usb fw pcmcia filesystems usbinput" +HOOKS="base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_curl archiso_pxe_nfs archiso_kms pata scsi sata virtio usb fw pcmcia filesystems usbinput" COMPRESSION="xz" -- 1.7.7.4
--- archiso/install/archiso_pxe_common | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/archiso/install/archiso_pxe_common b/archiso/install/archiso_pxe_common index 7dc1ebb..ce54f7a 100644 --- a/archiso/install/archiso_pxe_common +++ b/archiso/install/archiso_pxe_common @@ -18,9 +18,9 @@ build () add_binary "/lib/initcpio/ipconfig" "/bin/ipconfig" # Add hosts support files+dns - add_symlink $(readlink /lib/libnss_files.so.2) /lib/libnss_files.so.2 + add_symlink /lib/libnss_files.so.2 $(readlink /lib/libnss_files.so.2) add_binary $(readlink -f /lib/libnss_files.so.2) - add_symlink $(readlink /lib/libnss_dns.so.2) /lib/libnss_dns.so.2 + add_symlink /lib/libnss_dns.so.2 $(readlink /lib/libnss_dns.so.2) add_binary $(readlink -f /lib/libnss_dns.so.2) echo "hosts: files dns" > $BUILDROOT/etc/nsswitch.conf } -- 1.7.7.4
On 11/29/2011 09:26 AM, Thomas Bächler wrote:
--- archiso/install/archiso_pxe_common | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/archiso/install/archiso_pxe_common b/archiso/install/archiso_pxe_common index 7dc1ebb..ce54f7a 100644 --- a/archiso/install/archiso_pxe_common +++ b/archiso/install/archiso_pxe_common @@ -18,9 +18,9 @@ build () add_binary "/lib/initcpio/ipconfig" "/bin/ipconfig"
# Add hosts support files+dns - add_symlink $(readlink /lib/libnss_files.so.2) /lib/libnss_files.so.2 + add_symlink /lib/libnss_files.so.2 $(readlink /lib/libnss_files.so.2) add_binary $(readlink -f /lib/libnss_files.so.2) - add_symlink $(readlink /lib/libnss_dns.so.2) /lib/libnss_dns.so.2 + add_symlink /lib/libnss_dns.so.2 $(readlink /lib/libnss_dns.so.2) add_binary $(readlink -f /lib/libnss_dns.so.2) echo "hosts: files dns"> $BUILDROOT/etc/nsswitch.conf } skipped, already applied a fix. Thanks.
-- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
On machines with common graphics chipsets (radeon, intel, nvidia), enable KMS early. Downloading images from a remote server can take time, better view the status with a nice resolution. --- archiso/Makefile | 2 ++ archiso/install/archiso_kms | 14 ++++++++++++++ configs/releng/mkinitcpio.conf | 2 +- 3 files changed, 17 insertions(+), 1 deletions(-) create mode 100644 archiso/install/archiso_kms
diff --git a/archiso/Makefile b/archiso/Makefile index 11aff53..a073adf 100644 --- a/archiso/Makefile +++ b/archiso/Makefile @@ -26,6 +26,7 @@ install-hooks: install -D -m 644 install/archiso_pxe_nfs $(DESTDIR)/lib/initcpio/install/archiso_pxe_nfs install -D -m 644 hooks/archiso_loop_mnt $(DESTDIR)/lib/initcpio/hooks/archiso_loop_mnt install -D -m 644 install/archiso_loop_mnt $(DESTDIR)/lib/initcpio/install/archiso_loop_mnt + install -D -m 644 install/archiso_kms $(DESTDIR)/lib/initcpio/install/archiso_kms
install-examples: # install examples @@ -55,6 +56,7 @@ uninstall: rm -f $(DESTDIR)/lib/initcpio/install/archiso_pxe_nfs rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_loop_mnt rm -f $(DESTDIR)/lib/initcpio/install/archiso_loop_mnt + rm -f $(DESTDIR)/lib/initcpio/install/archiso_kms rm -rf $(DESTDIR)/usr/share/archiso/
.PHONY: install install-program install-hooks install-examples install-doc uninstall diff --git a/archiso/install/archiso_kms b/archiso/install/archiso_kms new file mode 100644 index 0000000..1dd18cc --- /dev/null +++ b/archiso/install/archiso_kms @@ -0,0 +1,14 @@ +#!/bin/bash + +build() { + MODULES="radeon nouveau i915 via-agp sis-agp intel-agp" + if [[ $(uname -m) = i686 ]]; then + MODULES+=" amd64-agp ati-agp sworks-agp ali-agp amd-k7-agp nvidia-agp efficeon-agp" + fi +} + +help() { + cat<< HELPEOF +Adds all common KMS drivers to the initramfs image. +HELPEOF +} diff --git a/configs/releng/mkinitcpio.conf b/configs/releng/mkinitcpio.conf index 8d77dee..5570ed6 100644 --- a/configs/releng/mkinitcpio.conf +++ b/configs/releng/mkinitcpio.conf @@ -1,2 +1,2 @@ -HOOKS="base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_curl archiso_pxe_nfs pata scsi sata virtio usb fw pcmcia filesystems usbinput" +HOOKS="base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_curl archiso_pxe_nfs archiso_kms pata scsi sata virtio usb fw pcmcia filesystems usbinput" COMPRESSION="xz"
On 11/29/2011 09:26 AM, Thomas Bächler wrote: pushed to master. I only changed [[ = ]] by [[ == ]] ;) -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
participants (2)
-
Gerardo Exequiel Pozzi
-
Thomas Bächler