aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xcreate_dual.sh7
-rw-r--r--lists/basesystem_mini10
-rw-r--r--lists/exclude_mini4
-rw-r--r--lists/input_cat2
-rw-r--r--lists/kernel325
-rw-r--r--lists/kernel648
6 files changed, 26 insertions, 10 deletions
diff --git a/create_dual.sh b/create_dual.sh
index 854d194..626b6b8 100755
--- a/create_dual.sh
+++ b/create_dual.sh
@@ -35,9 +35,10 @@ mkdir -p $BUILDISOPATH
for i in i586 x86_64
do
cp -af $OLDBUILDPATH-$i/$i $BUILDPATH
- rm -vf $BUILDPATH/$i/install/images/boot.iso $BUILDPATH/$i/install/images/*nonfree*
- rm -rvf $BUILDPATH/$i/install/images/alternatives
- rm -rvf $BUILDPATH/$i/isolinux
+ rm -f $BUILDPATH/$i/install/images/boot.iso $BUILDPATH/$i/install/images/*nonfree*
+ rm -rf $BUILDPATH/$i/install/images/alternatives
+ rm -rf $BUILDPATH/$i/isolinux
+ cp -f $PIECES/iso/dual/compssUsers.pl $PIECES/iso/dual/rpmsrate $BUILDPATH/$i/media/media_info
done
sync
cp -r $PIECES/iso/dual/isolinux $BUILDPATH
diff --git a/lists/basesystem_mini b/lists/basesystem_mini
index 208a4e2..de2e5e3 100644
--- a/lists/basesystem_mini
+++ b/lists/basesystem_mini
@@ -81,7 +81,6 @@ dmraid
laptop-mode-tools
numlock
vlan-utils
-reiserfsprogs
xfsprogs
alsa-utils
pptp-linux
@@ -119,18 +118,21 @@ sudo
lvm2
mdadm
task-lxde
+mageia-lxde-config
+x11-driver-video
+x11-driver-video-vboxvideo
oxygen-gtk
oxygen-gtk3
bridge-utils
-mc
-martmontools
+smartmontools
bash-completion
lshw
screen
iftop
tcpdump
freeipmi
-samba-client
midori
+lxdm
+mageia-gfxboot-theme
diff --git a/lists/exclude_mini b/lists/exclude_mini
index 79c1456..5590efb 100644
--- a/lists/exclude_mini
+++ b/lists/exclude_mini
@@ -1,5 +1,4 @@
kernel-xen
-mageia-lxde-config-Default
kernel-kerrighed
kernel-linus
kernel-netbook
@@ -16,3 +15,6 @@ apache-mpm-rsbac
hpli
kernel-source
kernel-desktop-devel
+libcairo-xcb2
+lib64cairo-xcb2
+glibc-devel
diff --git a/lists/input_cat b/lists/input_cat
index 31abc28..ce79c89 100644
--- a/lists/input_cat
+++ b/lists/input_cat
@@ -213,3 +213,5 @@ python-at-spi
supertux
task-obsolete
python-devel
+
+
diff --git a/lists/kernel32 b/lists/kernel32
index 641c70e..814b472 100644
--- a/lists/kernel32
+++ b/lists/kernel32
@@ -7,3 +7,8 @@ kernel-server-devel-latest
kernel-headers
kernel-source-latest
libcares2
+libmozjs185_1.0
+libdirectfb1.5_0
+libgtk+-x11-2.0_0
+libjscore-gir3.0
+libwebkit-gir1.0
diff --git a/lists/kernel64 b/lists/kernel64
index 56d1467..037e44b 100644
--- a/lists/kernel64
+++ b/lists/kernel64
@@ -1,7 +1,11 @@
kernel-desktop-latest
-kernel-desktop-devel-latest
kernel-headers
kernel-source-latest
-kernel-server-latest
kernel-server-devel-latest
lib64cares2
+lib64mozjs185_1.0
+lib64directfb1.5_0
+lib64gtk+-x11-2.0_0
+libjscore-gir3.0
+libwebkit-gir1.0
+