From ae17937155b36c09a88bf7716607426a115cb0a7 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sun, 14 Jan 2018 13:36:54 +0000 Subject: Update to allow draklive to generate the local repo. --- build_all.sh | 1 - build_one.sh | 1 - config/build.cfg | 49 ++++++++++++++---------------- update_media.sh | 90 -------------------------------------------------------- 4 files changed, 22 insertions(+), 119 deletions(-) delete mode 100755 update_media.sh diff --git a/build_all.sh b/build_all.sh index 2842913..2d3d222 100755 --- a/build_all.sh +++ b/build_all.sh @@ -10,7 +10,6 @@ desktops[i586]="Xfce" desktops[x86_64]="GNOME Plasma Xfce" -./update_media.sh ./update_bootloader_files.sh for arch in $archs; do for desktop in ${desktops[$arch]}; do diff --git a/build_one.sh b/build_one.sh index ccfda8e..f71e1c1 100755 --- a/build_one.sh +++ b/build_one.sh @@ -1,5 +1,4 @@ #!/bin/sh -./update_media.sh ./update_bootloader_files.sh draklive='perl -I ../drakiso/lib ../drakiso/draklive' if [ $# -gt 0 ] ; then diff --git a/config/build.cfg b/config/build.cfg index a6d5ca4..7cf2dcd 100644 --- a/config/build.cfg +++ b/config/build.cfg @@ -103,7 +103,6 @@ my $_l = { # mageia specific 'mageiawelcome', # nice helper app 'mageia-doc-mcc-en', # some nice docs - 'grub2-mageia-theme', # Gnome specific stuff if_($has_gnome, @@ -138,22 +137,15 @@ my $_l = { # no server kernels '/^kernel-server-/', '/^vboxadditions-kernel-.*-server-/', - # no legacy bootloaders, we default to grub2 - 'grub', 'lilo', - - # no efi stuff - only needed for install, and shipped in live core repo - 'grub2-efi', 'efibootmgr', 'efivar', + # No bootloaders, but we need to keep one to satisfy basesystem requirements. + # We will zap it later. The grub2 bootloaders are needed for install, so we + # add them to the local repo, which means they are automatically excluded. + 'grub', # no devel packages on live media - 'glibc-devel', 'gdb', 'gcc', 'gcc3.3', 'dkms', + 'gdb', 'gcc3.3', 'empathy', 'gnome-builder', # pulls devel stuff - # shipped in live nonfree repo - 'dkms-broadcom-wl', 'broadcom-wl-common', - 'broadcom-bcma-config', 'broadcom-ssb-config', - '/^x11-driver-video-fglrx/', - '/^x11-driver-video-nvidia/', - # huge deps 'denemo', # pulls in lilypond and texlive 'virtuoso-opensource', # not needed on live media @@ -189,6 +181,21 @@ my $_l = { if_($has_plasma, 'sddm'), 'gdm', ], + local_repo_packages => [ + # core + 'broadcom-bcma-config', + 'broadcom-ssb-config', + 'dkms', + 'efibootmgr', 'efivar', + 'grub2', 'grub2-efi', 'grub2-mageia-theme', + if_($arch eq 'i586', 'kernel-desktop586-devel-latest'), + if_($arch eq 'x86_64', 'kernel-desktop-devel-latest'), + # nonfree + 'dkms-broadcom-wl', + 'dkms-nvidia304', 'x11-driver-video-nvidia304', + 'dkms-nvidia340', 'x11-driver-video-nvidia340', + 'dkms-nvidia-current', 'x11-driver-video-nvidia-current', + ], post_install_nr => join(";", "cp /tmp/media/$arch/release-notes.* /mnt", @@ -249,14 +256,6 @@ my $_l = { [ '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_($arch eq 'i586', - [ 'files/mga_rpms/i586/mga_rpms', '/var/local' ], - ), - if_($arch eq 'x86_64', - [ 'files/mga_rpms/x86_64/mga_rpms', '/var/local' ], - ), - # add initial dns resolver for online medias [ 'files/resolv.conf', '/etc/resolv.conf', { mode => 0644 } ], @@ -363,15 +362,11 @@ my $_l = { "ak=/etc/draklive-install.d/run.d/restore-akonadi-config.sh; echo -e '#!/bin/sh\ncp /etc/akonadi/mysql-global-standard.conf /etc/akonadi/mysql-global.conf' > \$ak; chmod +x \$ak", ), - # add local medias - "urpmi.addmedia -q 'Live Core' /var/local/mga_rpms/core with media_info/hdlist.cz", - "urpmi.addmedia -q 'Live Nonfree' /var/local/mga_rpms/nonfree with media_info/hdlist.cz", - # disable HPLIP systray startup "echo 'Hidden=true' >> /etc/xdg/autostart/hplip-systray.desktop", - # remove pre-installed grub2, we need to be able to select grub2 vs grub2-efi at install time - "rpm -e --nodeps grub2", + # remove pre-installed lilo, we don't need it + "rpm -e --nodeps lilo", # allow draklive-install to spawn subtasks that access the display "echo 'session optional pam_xauth.so # for draklive-install' >> /etc/pam.d/polkit-1", diff --git a/update_media.sh b/update_media.sh deleted file mode 100755 index f340fde..0000000 --- a/update_media.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -repository=$(grep repository config/settings.cfg | sed s/repository=//) -echo "Updating files/mga_rpms from $repository" - -cd files/mga_rpms - -copy_latest() -{ - repo=$1 - for arch in i586 x86_64 ; do - if [ $2 = "lib" ] ; then - if [ $arch = "x86_64" ] ; then - name=lib64$3 - else - name=lib$3 - fi - else - name=$2 - fi - if [ $arch = "i586" ] ; then - name=${name/-desktop-/-desktop586-} - fi - path=`ls -1v $repository/$arch/media/$repo/{release,updates}/$name.rpm 2> /dev/null | tail -1` - if [ -z $path ] ; then - echo "Couldn't find $name for $arch" - exit 1 - else - cp $path $arch/mga_rpms/$repo/ - fi - done -} - -# 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 grub2 -copy_latest core grub2-2* -copy_latest core grub2-efi-2* -copy_latest core grub2-mageia-theme-2* -copy_latest core lib efivar0-* -copy_latest core efibootmgr-* -copy_latest core efivar-* - -# add dkms -copy_latest core dkms-2* -copy_latest core binutils-2* -copy_latest core gcc-5* -copy_latest core gcc-cpp-5* -copy_latest core glibc-devel-* -copy_latest core isl-0* -copy_latest core kernel-desktop-devel-4* -copy_latest core kernel-desktop-devel-latest-4* -copy_latest core kernel-userspace-headers-4* -copy_latest core lib isl15-0* -copy_latest core lib mpc3-1* -copy_latest core lib ncurses-devel-* -copy_latest core libstdc++-devel-* -copy_latest core make-4* - -# add nvidia -copy_latest nonfree dkms-nvidia304-* -copy_latest nonfree dkms-nvidia340-* -copy_latest nonfree dkms-nvidia-current-* -copy_latest nonfree x11-driver-video-nvidia304-* -copy_latest nonfree x11-driver-video-nvidia340-* -copy_latest nonfree x11-driver-video-nvidia-current-* - -# add broadcom-wl -copy_latest nonfree dkms-broadcom-wl-* -copy_latest nonfree broadcom-wl-common-* - -# add broadcom wireless configs -copy_latest core broadcom-bcma-config-* -copy_latest core broadcom-ssb-config-* - -# add repo pubkeys -for arch in i586 x86_64 ; do - cp $repository/$arch/media/core/release/media_info/pubkey $arch/mga_rpms/core/media_info/ - cp $repository/$arch/media/nonfree/release/media_info/pubkey $arch/mga_rpms/nonfree/media_info/ -done - -# create hdlists -for arch in i586 x86_64 ; do - genhdlist2 $arch/mga_rpms/core - genhdlist2 $arch/mga_rpms/nonfree -done -- cgit v1.2.1