Skip to content

Commit 3f73d3b

Browse files
Hayao0819Hayao0819
committed
Merge branch 'nvidia-plymouth' into dev
2 parents dfe0318 + fc4b00b commit 3f73d3b

10 files changed

Lines changed: 58 additions & 7 deletions

File tree

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,7 @@ make_overisofs() {
10131013
_over_isofs_list=("${channel_dir}/over_isofs.any""${channel_dir}/over_isofs.${arch}")
10141014
for_module '_over_isofs_list+=("${module_dir}/{}/over_isofs.any" "${module_dir}/{}/over_isofs.${arch}")'
10151015
for _isofs in "${_over_isofs_list[@]}"; do
1016-
[[ -d "${_isofs}" ]] && cp -af "${_isofs}"/* "${isofs_dir}"
1016+
[[ -d "${_isofs}" ]] && [[ -n "$(find "${_isofs}" -mindepth 1 -maxdepth 2)" ]] && cp -af "${_isofs}"/* "${isofs_dir}"
10171017
done
10181018

10191019
return 0

‎efiboot/splash/archiso-cd.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88
title %OS_NAME% %ARCH% UEFI CD
99
efi /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi
10-
options initrd=/EFI/alteriso/intel-ucode.img initrd=/EFI/alteriso/amd-ucode.img initrd=/EFI/alteriso/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% arch=%ARCH% quiet splash loglevel=3
10+
options initrd=/EFI/alteriso/intel-ucode.img initrd=/EFI/alteriso/amd-ucode.img initrd=/EFI/alteriso/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% arch=%ARCH% quiet splash loglevel=3 nvidia-drm.modeset=1

‎efiboot/splash/archiso-usb.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88
title %OS_NAME% %ARCH% UEFI USB
99
efi /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
10-
options initrd=/%INSTALL_DIR%/boot/intel-ucode.img initrd=/%INSTALL_DIR%/boot/amd-ucode.img initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3
10+
options initrd=/%INSTALL_DIR%/boot/intel-ucode.img initrd=/%INSTALL_DIR%/boot/amd-ucode.img initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 nvidia-drm.modeset=1

‎modules/nvidia/alteriso‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
alteriso=3.1

‎modules/nvidia/architecture‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#
2+
# Yamada Hayao
3+
# Twitter: @Hayao0819
4+
# Email : hayao@fascode.net
5+
#
6+
# (c) 2019-2021 Fascode Network.
7+
#
8+
# Supported architecture list
9+
10+
x86_64
11+
i686
12+
i486

‎modules/nvidia/packages.i686/nvidia.i686‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#
2+
# Alter Linux package list
3+
#
4+
# Yamada Hayao
5+
# Twitter: @Hayao0819
6+
# Email : hayao@fascode.net
7+
#
8+
# (c) 2019-2021 Fascode Network.
9+
#
10+
# Nvidia
11+
12+
nvidia-dkms
13+
nvidia-settings
14+
nvidia-utils
15+
opencl-nvidia

‎modules/nvidia/packages.x86_64/nvidia.x86_64‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#
2+
# Alter Linux package list
3+
#
4+
# Yamada Hayao
5+
# Twitter: @Hayao0819
6+
# Email : hayao@fascode.net
7+
#
8+
# (c) 2019-2021 Fascode Network.
9+
#
10+
# Nvidia
11+
12+
lib32-nvidia-utils
13+
lib32-opencl-nvidia
14+
nvidia-dkms
15+
nvidia-settings
16+
nvidia-utils
17+
opencl-nvidia

‎syslinux/archiso_pxe_splash.cfg‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENDTEXT
1313
MENU LABEL Boot %OS_NAME% (%ARCH%) (NBD)
1414
LINUX /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
1515
INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/%ARCH%/archiso.img
16-
APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} loglevel=3 quiet splash udev.log-priority=3 checksum verify
16+
APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} loglevel=3 quiet splash udev.log-priority=3 checksum verify nvidia-drm.modeset=1
1717
SYSAPPEND 3
1818

1919
LABEL alter_%ARCH%_nfs
@@ -24,7 +24,7 @@ ENDTEXT
2424
MENU LABEL Boot %OS_NAME% (%ARCH%) (NFS)
2525
LINUX /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
2626
INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/%ARCH%/archiso.img
27-
APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt loglevel=3 quiet splash udev.log-priority=3 checksum verify
27+
APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt loglevel=3 quiet splash udev.log-priority=3 checksum verify nvidia-drm.modeset=1
2828
SYSAPPEND 3
2929

3030
LABEL alter_%ARCH%_http
@@ -35,5 +35,5 @@ ENDTEXT
3535
MENU LABEL Boot %OS_NAME% (%ARCH%) (HTTP)
3636
LINUX /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
3737
INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/%ARCH%/archiso.img
38-
APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ loglevel=3 quiet splash udev.log-priority=3 checksum verify
38+
APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ loglevel=3 quiet splash udev.log-priority=3 checksum verify nvidia-drm.modeset=1
3939
SYSAPPEND 3

‎syslinux/archiso_sys_splash.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENDTEXT
1313
MENU LABEL Boot %OS_NAME% (%ARCH%)
1414
LINUX /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
1515
INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/%ARCH%/archiso.img
16-
APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% loglevel=3 quiet splash udev.log-priority=3
16+
APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% loglevel=3 quiet splash udev.log-priority=3 nvidia-drm.modeset=1
1717

1818
LABEL alter_%ARCH%_res
1919
TEXT HELP

‎system/initcpio/install/archiso_kms‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ build() {
1212
add_module "sis-agp"
1313
add_module "intel-agp"
1414

15+
add_module "nvidia?"
16+
add_module "nvidia_modeset?"
17+
add_module "nvidia_uvm?"
18+
add_module "nvidia_drm?"
19+
20+
1521
if [[ $(uname -m) == i686 ]]; then
1622
add_module "amd64-agp"
1723
add_module "ati-agp"

0 commit comments

Comments
 (0)