diff options
| -rw-r--r-- | config/live.cfg | 24 | ||||
| -rwxr-xr-x | files/mga_rpms/PLASMA5/update_media.sh | 54 | ||||
| -rwxr-xr-x | files/mga_rpms/update_media.sh (renamed from files/mga_rpms/GNOME/update_media.sh) | 0 |
3 files changed, 7 insertions, 71 deletions
diff --git a/config/live.cfg b/config/live.cfg index 823e8b4..b1e8fba 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -53,24 +53,14 @@ my $_l = { # clean live files [ 'files/live.51-mageia-resume.conf', '/etc/dracut.conf.d/51-mageia-resume.conf', { mode => 0644 } ], [ 'files/live.modprobe.conf', '/etc/modprobe.conf', { mode => 0644 } ], - + # add local repos - if_($live->{settings}{desktop} eq 'GNOME', - if_($live->{settings}{arch} eq 'i586', - [ 'files/mga_rpms/GNOME/i586/mga_rpms', '/var/local/mga_rpms' ], - ), - if_($live->{settings}{arch} eq 'x86_64', - [ 'files/mga_rpms/GNOME/x86_64/mga_rpms', '/var/local/mga_rpms' ], - ), - ), - if_($live->{settings}{desktop} eq 'PLASMA5', - if_($live->{settings}{arch} eq 'i586', - [ 'files/mga_rpms/PLASMA5/i586/mga_rpms', '/var/local/mga_rpms' ], - ), - if_($live->{settings}{arch} eq 'x86_64', - [ 'files/mga_rpms/PLASMA5/x86_64/mga_rpms', '/var/local/mga_rpms' ], - ), - ), + if_($live->{settings}{arch} eq 'i586', + [ 'files/mga_rpms/i586/mga_rpms', '/var/local/mga_rpms' ], + ), + if_($live->{settings}{arch} eq 'x86_64', + [ 'files/mga_rpms/x86_64/mga_rpms', '/var/local/mga_rpms' ], + ), # disable suspend and hibernate in live mode [ 'files/50-disable-suspend.pkla', '/etc/polkit-1/localauthority/50-local.d/50-disable-suspend.pkla', { mode => 0644, no_install => 1 } ], diff --git a/files/mga_rpms/PLASMA5/update_media.sh b/files/mga_rpms/PLASMA5/update_media.sh deleted file mode 100755 index 866fe9e..0000000 --- a/files/mga_rpms/PLASMA5/update_media.sh +++ /dev/null @@ -1,54 +0,0 @@ - -bcdmedia=/home/bcd/build_bcd/pieces/cauldron - -# create dirs if non-existant -mkdir -p {i586,x86_64}/mga_rpms/{core,nonfree}/media_info - -# clean dirs -rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/*.rpm -rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/media_info/* - -# add broadcom-wl -cp $bcdmedia/i586/media/nonfree/release/broadcom-wl-common*.rpm i586/mga_rpms/nonfree/ -cp $bcdmedia/i586/media/nonfree/release/broadcom-wl-kernel-*-desktop586-*.rpm i586/mga_rpms/nonfree/ -cp $bcdmedia/i586/media/nonfree/release/broadcom-wl-kernel-desktop586-latest-*.rpm i586/mga_rpms/nonfree/ - -cp $bcdmedia/x86_64/media/nonfree/release/broadcom-wl-common-*.rpm x86_64/mga_rpms/nonfree/ -cp $bcdmedia/x86_64/media/nonfree/release/broadcom-wl-kernel-*-desktop-*.rpm x86_64/mga_rpms/nonfree/ -cp $bcdmedia/x86_64/media/nonfree/release/broadcom-wl-kernel-desktop-latest-*.rpm x86_64/mga_rpms/nonfree/ - -# add broadcom wireless configs -cp $bcdmedia/i586/media/core/release/broadcom-*-config-*.rpm i586/mga_rpms/core/ -cp $bcdmedia/x86_64/media/core/release/broadcom-*-config-*.rpm x86_64/mga_rpms/core/ - -# add grub2 stuff -cp $bcdmedia/i586/media/core/release/grub2-2*.rpm i586/mga_rpms/core/ -cp $bcdmedia/i586/media/core/release/grub2-common-2*.rpm i586/mga_rpms/core/ -cp $bcdmedia/i586/media/core/release/grub2-efi-2*.rpm i586/mga_rpms/core/ -cp $bcdmedia/i586/media/core/release/grub2-mageia-theme-*.rpm i586/mga_rpms/core/ -cp $bcdmedia/i586/media/core/release/os-prober-*.rpm i586/mga_rpms/core/ -cp $bcdmedia/i586/media/core/release/efibootmgr-*.rpm i586/mga_rpms/core/ -cp $bcdmedia/i586/media/core/release/efivar-*.rpm i586/mga_rpms/core/ -cp $bcdmedia/i586/media/core/release/libefivar0-*.rpm i586/mga_rpms/core/ - -cp $bcdmedia/x86_64/media/core/release/grub2-2*.rpm x86_64/mga_rpms/core/ -cp $bcdmedia/x86_64/media/core/release/grub2-common-2*.rpm x86_64/mga_rpms/core/ -cp $bcdmedia/x86_64/media/core/release/grub2-efi-2*.rpm x86_64/mga_rpms/core/ -cp $bcdmedia/x86_64/media/core/release/grub2-mageia-theme-*.rpm x86_64/mga_rpms/core/ -cp $bcdmedia/x86_64/media/core/release/os-prober-*.rpm x86_64/mga_rpms/core/ -cp $bcdmedia/x86_64/media/core/release/efibootmgr-*.rpm x86_64/mga_rpms/core/ -cp $bcdmedia/x86_64/media/core/release/efivar-*.rpm x86_64/mga_rpms/core/ -cp $bcdmedia/x86_64/media/core/release/lib64efivar0-*.rpm x86_64/mga_rpms/core/ - -# add repo pubkeys -cp $bcdmedia/i586/media/core/release/media_info/pubkey i586/mga_rpms/core/media_info/ -cp $bcdmedia/x86_64/media/core/release/media_info/pubkey x86_64/mga_rpms/core/media_info/ - -cp $bcdmedia/i586/media/nonfree/release/media_info/pubkey i586/mga_rpms/nonfree/media_info/ -cp $bcdmedia/x86_64/media/nonfree/release/media_info/pubkey x86_64/mga_rpms/nonfree/media_info/ - -# create hdlists -genhdlist2 i586/mga_rpms/core -genhdlist2 i586/mga_rpms/nonfree -genhdlist2 x86_64/mga_rpms/core -genhdlist2 x86_64/mga_rpms/nonfree diff --git a/files/mga_rpms/GNOME/update_media.sh b/files/mga_rpms/update_media.sh index 673ecdc..673ecdc 100755 --- a/files/mga_rpms/GNOME/update_media.sh +++ b/files/mga_rpms/update_media.sh |