summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2016-10-28 19:39:21 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2016-10-28 19:39:21 +0100
commitc5dd608caa03d368e7d721cf291530b43410f73c (patch)
tree0c35c6835270f5c0c1c8ea5ec1b3d28014481eb1
parenta774a4122da1a0fd02104bae4a2379bff8245319 (diff)
downloaddraklive-config-c5dd608caa03d368e7d721cf291530b43410f73c.tar
draklive-config-c5dd608caa03d368e7d721cf291530b43410f73c.tar.gz
draklive-config-c5dd608caa03d368e7d721cf291530b43410f73c.tar.bz2
draklive-config-c5dd608caa03d368e7d721cf291530b43410f73c.tar.xz
draklive-config-c5dd608caa03d368e7d721cf291530b43410f73c.zip
Don't preinstall dkms
- significantly reduces installed system size when not using proprietary drivers, reduces ISO size to a lesser extent - relatively minor increase in boot time when using proprietary drivers
-rw-r--r--config/auto_inst.cfg.pl5
-rwxr-xr-xfiles/mga_rpms/update_media.sh28
2 files changed, 27 insertions, 6 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 985384e..95b229f 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -66,6 +66,8 @@ $o = {
'denemo', # pulls in lilypond and texlive
+ # no devel packages on live media
+ 'glibc-devel', 'gdb', 'gcc', 'gcc3.3', 'dkms',
# pulls in devel deps
'empathy',
# not needed on live medias
@@ -176,8 +178,6 @@ $o = {
if_($ENV{DRAKLIVE_PRODUCT} =~ /guadec/i, 'rfbdrake'),
- if_($has_kde4, 'gdb'), #- suggested by one of the kde4 base package
-
#exclude some packages that are too big from the KDE4 Live CD
if_($ENV{DRAKLIVE_PRODUCT} !~ /liveusb-rw/i,
if_($has_kde4, 'digikam'),
@@ -241,7 +241,6 @@ $o = {
'basesystem', 'x11-server-common', 'x11-driver-video', 'x11-driver-input',
'x11-driver-video-vboxvideo',
- 'dkms',
'bluez-firmware', 'mageiawelcome',
'usbutils', # we want lsusb
diff --git a/files/mga_rpms/update_media.sh b/files/mga_rpms/update_media.sh
index 3fe9670..826a32e 100755
--- a/files/mga_rpms/update_media.sh
+++ b/files/mga_rpms/update_media.sh
@@ -5,9 +5,18 @@ copy_latest()
{
repo=$1
for arch in i586 x86_64 ; do
- path=`ls -1v $bcdmedia/$arch/media/$repo/{release,updates}/$2.rpm 2> /dev/null | tail -1`
+ if [ $2 = "lib" ] ; then
+ if [ $arch = "x86_64" ] ; then
+ name=lib64$3
+ else
+ name=lib$3
+ fi
+ else
+ name=$2
+ fi
+ path=`ls -1v $bcdmedia/$arch/media/$repo/{release,updates}/$name.rpm 2> /dev/null | tail -1`
if [ -z $path ] ; then
- echo "Couldn't find $2 for $arch"
+ echo "Couldn't find $name for $arch"
exit 1
else
cp $path $arch/mga_rpms/$repo/
@@ -27,10 +36,23 @@ copy_latest core grub2-2.*
copy_latest core grub2-efi-2.*
copy_latest core grub2-mageia-theme-2.*
copy_latest core os-prober-*
-copy_latest core lib*efivar0-*
+copy_latest core lib efivar0-*
copy_latest core efibootmgr-*
copy_latest core efivar-*
+# add dkms
+copy_latest core dkms-2*
+copy_latest core gcc-4*
+copy_latest core gcc-cpp-4*
+copy_latest core glibc-devel*
+copy_latest core kernel-desktop*-devel-4*
+copy_latest core kernel-desktop*-devel-latest-4*
+copy_latest core kernel-userspace-headers-*
+copy_latest core lib mpc3-1*
+copy_latest core lib ncurses-devel*
+copy_latest core libstdc++-devel*
+copy_latest core make-4*
+
# add fglrx
copy_latest nonfree dkms-fglrx-*
copy_latest nonfree x11-driver-video-fglrx-*