diff options
| -rwxr-xr-x | create_dual.sh | 107 | ||||
| -rwxr-xr-x | create_dvd.sh | 18 | ||||
| -rw-r--r-- | dual.xml | 191 | ||||
| -rw-r--r-- | dual64.xml | 191 | ||||
| -rw-r--r-- | dvd_free-i586.xml | 15 | ||||
| -rw-r--r-- | dvd_free-x86_64.xml | 12 | ||||
| -rw-r--r-- | lists/input_cat | 6 |
7 files changed, 29 insertions, 511 deletions
diff --git a/create_dual.sh b/create_dual.sh deleted file mode 100755 index 5c77f15..0000000 --- a/create_dual.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh - -DISTRIB=Mageia -TREE=cauldron -TAG=vanda -VERSION=5 -SUPPORT=dual-DVD -VV=1 -MEDIAMAIN=media/core -PIECES="$HOME/build_bcd/pieces" -OLDBUILDPATH="$HOME/build_bcd/build/mageia-dual-$VERSION" -BUILDPATH="$HOME/build_bcd/build/$DISTRIB-$VERSION-$SUPPORT" -BUILDISOPATH="$HOME/build_bcd/iso/$DISTRIB-$VERSION-$SUPPORT" - -# genisoimage options -AGENISO="$DISTRIB - 5" -PUBLISHER="Mageia.Org" -SYSID="$PUBLISHER" -TOOL="$SYSID BCD" -VOLSET="$SYSID $DISTRIB - $VERSION" -VOLUME="$DISTRIB-$VERSION" - -echo $BUILDPATH/x86_64/$MEDIAMAIN - -# build both arch -./bcd.pl dual.xml all copy noiso -./bcd.pl dual64.xml all copy noiso - -# clean -rm -rf $BUILDPATH -rm -rvf $BUILDISOPATH -mkdir -p $BUILDPATH -mkdir -p $BUILDISOPATH - -# remove stuff to make size fit -for i in i586 x86_64 -do - cp -af $OLDBUILDPATH-$i/$i $BUILDPATH - rm -rf $BUILDPATH/$i/install/images - rm -rf $BUILDPATH/$i/isolinux - cp -f $PIECES/iso/dual/compssUsers.pl $BUILDPATH/$i/media/media_info -done -sync - -cp -r $PIECES/iso/dual/isolinux $BUILDPATH - -for i in i586 x86_64 -do - cp -r $PIECES/iso/images/$i $BUILDPATH/isolinux/ -done - - -for i in i586 x86_64 -do - perl -pi -e 's/Core media/Core Release/g' $BUILDPATH/$i/media/media_info/media.cfg -done - -# use symbolic links on noarch - -for i in core nonfree -do - cd $BUILDPATH/x86_64/media/$i - - for j in *noarch.rpm - do - if [ -f "../../../i586/$MEDIAMAIN/$j" ];then - echo $j - echo "erase package $j" - rm -vf $j - echo "link with the i586 one" - ln -sf ../../../i586/$MEDIAMAIN/$j . - else - echo "no ../../../i586/$MEDIAMAIN/$j package" - fi - done -done - -# build idx file, add release notes -for i in i586 x86_64 -do - cat $OLDBUILDPATH-$i/$i/pkg-$VERSION-$TAG.idx >> $BUILDPATH/$DISTRIB-$VERSION-$SUPPORT.idx - cp $PIECES/$TREE/i586/release-notes* $BUILDPATH/$i - cp $PIECES/$TREE/i586/index.html $BUILDPATH/$i -done - -# build iso -xorriso -as genisofs -f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4 \ - -A "$AGENISO" \ - -publisher "$PUBLISHER" \ - -sysid "$SYSID" \ - -p "$TOOL" \ - -volset "$VOLSET" \ - -V "$VOLUME" \ - -o "$BUILDISOPATH/$DISTRIB-$VERSION-$SUPPORT.iso" \ - -b isolinux/isolinux.bin \ - -boot-info-table \ - -quiet \ - $BUILDPATH/ - -du -sh $BUILDISOPATH/$DISTRIB-$VERSION-$SUPPORT.iso -echo "$BUILDISOPATH/$DISTRIB-$VERSION-$SUPPORT.idx" -cd $BUILDISOPATH/ -isohybrid -o 1 $BUILDISOPATH/$DISTRIB-$VERSION-$SUPPORT.iso -cp $BUILDPATH/$DISTRIB-$VERSION-$SUPPORT.idx . -md5sum $DISTRIB-$VERSION-$SUPPORT.iso > $DISTRIB-$VERSION-$SUPPORT.iso.md5 -sha1sum $DISTRIB-$VERSION-$SUPPORT.iso > $DISTRIB-$VERSION-$SUPPORT.iso.sha1 -date > $BUILDISOPATH/DATE.txt diff --git a/create_dvd.sh b/create_dvd.sh index 97043dc..8090108 100755 --- a/create_dvd.sh +++ b/create_dvd.sh @@ -2,7 +2,7 @@ arch=$1 distrib=Mageia -version=5 +version=6-dev1 homebcd=/home/bcd/build_bcd bin=$homebcd/bcd pieces=$homebcd/pieces/iso @@ -10,11 +10,14 @@ build=$homebcd/build/$distrib-$version-$arch $bin/bcd.pl dvd_free-$arch.xml all noiso -rm -rf $build/$arch/isolinux -cp -r $pieces/dvd/isolinux $build +#rm -rf $build/$arch/isolinux +#cp -r $pieces/dvd/isolinux $build +mv $homebcd/build/$distrib-$version-$arch/$arch/isolinux $homebcd/build/$distrib-$version-$arch cp $pieces/dvd/$arch.cfg $build/isolinux/isolinux.cfg -cp -r $pieces/images/$arch $build/isolinux -cp -f $pieces/dvd/compssUsers.pl $homebcd/build/$distrib-$version-$arch/$arch/media/media_info +cp $pieces/dvd/tools.cfg $build/isolinux/ +rm -f $build/isolinux/i386.cfg +#cp -f /home/bcd/message $build/isolinux/bootlogo +#cp -r $pieces/images/$arch $build/isolinux rm -f $build/$arch/install/images/*nonfree* @@ -23,8 +26,11 @@ then cd $build tar -xvJf $pieces/DVD-EFI.tar.xz cd - - rm -f $homebcd/build/$distrib-$version-$arch/$arch/install/images/boot.iso fi $bin/bcd.pl dvd_free-$arch.xml iso date > $homebcd/iso/$distrib-$version-$arch/DATE.txt +for i in md5 sha1 +do +${i}sum $homebcd/iso/$distrib-$version-$arch/$distrib-$version-$arch-DVD.iso > $homebcd/iso/$distrib-$version-$arch/$distrib-$version-$arch-DVD.iso.$i +done diff --git a/dual.xml b/dual.xml deleted file mode 100644 index b848a63..0000000 --- a/dual.xml +++ /dev/null @@ -1,191 +0,0 @@ -<?xml version='1.0'?> - -<productname desc="The Linux product"> - <nameid>mageia-dual</nameid> - <nb_fork>10</nb_fork> - <!-- you must specify on wich distrib this iso will be built --> - <based_on>cauldron</based_on> - <checktool>rpmcheck</checktool> - <arch>i586</arch> - <repo desc="Where is the repositery of the distribution"> - <path>/home/bcd/build_bcd/pieces</path> - </repo> - <workdir desc="Where is my working dir"> - <path>/home/bcd/build_bcd</path> - </workdir> - <tocopy_file>tocopy_bcd</tocopy_file> - <chroot_media>Core</chroot_media> - <chroot_media_exclude>Updates Testing</chroot_media_exclude> - <isolinux desc="isolinux info"> - <fullpath>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux</fullpath> - <!-- add hdt entry in syslinux.cfg --> - <entry name="hdt" desc="core media"> - <bin>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux/hdt.c32</bin> - <label>hdt</label> - <kernel>hdt.c32</kernel> - <append>modules=modules.pci</append> - - </entry> - <!-- keep this entry to create an array ref --> - <entry></entry> - <tocopy name="pcimap"> - <file>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux/modules.pcimap</file> - </tocopy> - <tocopy name="ids"> - <file>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux/pci.ids</file> - </tocopy> - <tocopy></tocopy> - </isolinux> - <installer desc="path to the Mageia installer (stage1/stage2)"> - <defaultpath>install</defaultpath> - <!--<fullpath></fullpath> --> - <advertising> - <defaultpath>advertising</defaultpath> - <!--<fullpath></fullpath> --> - </advertising> - </installer> - - <!-- theme must be available to path altx/all.rdz files --> - <theme name="mageia-release-Default"> - <theme>mageia-theme-Default</theme> - <bootsplash>Default</bootsplash> - <bootsplash_path>/home/bcd/build_bcd/pieces/iso/plymouth</bootsplash_path> - <gfxboot_path>/home/bcd/build_bcd/pieces/iso/gfxboot</gfxboot_path> - </theme> - - <media desc="media to take into account to build the ISO"> - <!-- name of the first media wich contains basesystem and kernels --> - <first_media>core</first_media> - <update_prefix>Updates</update_prefix> - <list name="Core" desc="Core media"> - <!-- MANDATORY list of wanted packages on the iso --> - <input name="base"> - <file>lists/basesystem_mini</file> - </input> - <input name="kernel"> - <file>lists/kernel32_mini</file> - </input> - <!-- to create an array you must keep this even if it is empty --> - <input name="lang"> - <file>lists/languages</file> - </input> - <!-- MANDATORY list of unwanted packages on the iso --> - <!-- to create an array you must keep this even if it is empty --> - <exclude name="mini"> - <file>lists/exclude_mini</file> - </exclude> - <exclude> - </exclude> - <!-- nosuggests options should be yes or no --> - <nosuggests>yes</nosuggests> - <!-- will be taken in {repo}{version}{aRCh}/media --> - <mediadir>core</mediadir> - <destmedia>core</destmedia> - <pubkey>release/media_info/pubkey</pubkey> - <release>yes</release> - <updates>yes</updates> - <backport>no</backport> - <testing>no</testing> - </list> - <list name="nonfree" desc="Nonfree Release"> - <!-- MANDATORY list of wanted packages on the iso --> - <input name="base"> - <file>lists/basesystem_mini</file> - </input> - <input> - <file>lists/nonfree_mini</file> - </input> - <input> - <file>lists/nonfree_mini32</file> - </input> - - <!-- to create an array you must keep this even if it is empty --> - <!-- MANDATORY list of unwanted packages on the iso --> - <exclude name="exclude"> - <file>lists/exclude</file> - </exclude> - <exclude name="exclude_free"> - <file>lists/exclude_free</file> - </exclude> - <exclude name="exclude"> - <file>lists/exclude_dual</file> - </exclude> - <!-- to create an array you must keep this even if it is empty --> - <exclude> - </exclude> - <!-- nosuggests options should be yes or no --> - <nosuggests>yes</nosuggests> - <!-- will be taken in {repo}{version}{aRCh}/media --> - <mediadir>nonfree</mediadir> - <destmedia>nonfree</destmedia> - <!-- - <fullpath_mediadir>/home/plop/iso/final/t/i586/media/main</fullpath_mediadir> - --> - <pubkey>release/media_info/pubkey</pubkey> - <release>yes</release> - <updates>yes</updates> - <backport>no</backport> - <testing>no</testing> - </list> - <!-- keep this entry to create an array ref --> - <list></list> - </media> - - - <mediainfo desc="All files relatives to media_info dir"> - <version>5</version> - <!-- set fullpath if youy want to use an files in a non MDV repositery --> - <fullpath>/home/bcd/build_bcd/pieces/cauldron/i586/media/media_info</fullpath> - <mediainfo_dir>media/media_info</mediainfo_dir> - <rpmsrate>rpmsrate</rpmsrate> - <compssusers>compssUsers.pl</compssusers> - <filedeps>file-deps</filedeps> - <filter>lists/no-filter</filter> - <urpmi_option> -p</urpmi_option> - <askmedia desc="add for other media ?"> - <todo>yes</todo> - </askmedia> - <suppl desc="add an external media ?"> - <todo>yes</todo> - </suppl> - <xmlinfo> - <todo>no</todo> - </xmlinfo> - </mediainfo> - - <iso> - <tag>vanda</tag> - <minor>1</minor> - <subversion>1</subversion> - <product>mageia-dual</product> - <branch>Devel</branch> - <type>basic</type> - <!-- dual aRCh not yet supported --> - <dualarch>yes</dualarch> - <!-- SIZE is not YET USED !!! --> - <size>700</size> - <!-- media.cfg will be stored on genisoimage->{builddir}/{nameid}/{aRCh} --> - <mediacfg>media/media_info/media.cfg</mediacfg> - <hdlist>yes</hdlist> - <synthesis>yes</synthesis> - <header desc="Iso header info"> - <systemid>Mageia</systemid> - <volumeid>Mageia - mageia dual 5 </volumeid> - <volumesetid>Mageia - 5 - dual</volumesetid> - <publisherid>Mageia.Org</publisherid> - <datapreparer>Mageia BCD</datapreparer> - <applicationid>mageia-dual - 5</applicationid> - <copyrightid>Mageia.Org</copyrightid> - </header> - <isohybrid> - <options>--fatfirst</options> - </isohybrid> - <genisoimage desc="iso generation tool"> - <options>-f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4 </options> - <bootcat>isolinux/boot.cat</bootcat> - <!-- builddir and destdir will always use the workdir --> - <builddir>build</builddir> - <isodir>iso</isodir> - </genisoimage> - </iso> -</productname> diff --git a/dual64.xml b/dual64.xml deleted file mode 100644 index aeaf013..0000000 --- a/dual64.xml +++ /dev/null @@ -1,191 +0,0 @@ -<?xml version='1.0'?> - -<productname desc="The Linux product"> - <nameid>mageia-dual</nameid> - <nb_fork>10</nb_fork> - <!-- you must specify on wich distrib this iso will be built --> - <based_on>cauldron</based_on> - <!-- --> - <arch>x86_64</arch> - <repo desc="Where is the repositery of the distribution"> - <path>/home/bcd/build_bcd/pieces</path> - </repo> - <workdir desc="Where is my working dir"> - <path>/home/bcd/build_bcd</path> - </workdir> - <tocopy_file>tocopy_plop</tocopy_file> - <chroot_media>Core</chroot_media> - <chroot_media_exclude>Updates Testing</chroot_media_exclude> - <isolinux desc="isolinux info"> - <fullpath>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux</fullpath> - <!-- add hdt entry in syslinux.cfg --> - <entry name="hdt" desc="Core media"> - <bin>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux/hdt.c32</bin> - <label>hdt</label> - <kernel>hdt.c32</kernel> - <append>modules=modules.pci</append> - </entry> - <!-- keep this entry to create an array ref --> - <entry></entry> - <tocopy name="pcimap"> - <file>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux/modules.pcimap</file> - </tocopy> - <tocopy name="ids"> - <file>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux/pci.ids</file> - </tocopy> - <tocopy></tocopy> - </isolinux> - <installer desc="path to the Mageia installer (stage1/stage2)"> - <defaultpath>install</defaultpath> - <!--<fullpath></fullpath> --> - <advertising> - <defaultpath>advertising</defaultpath> - <!--<fullpath></fullpath> --> - </advertising> - </installer> - - <!-- theme must be available to path altx/all.rdz files --> - <theme name="mageia-release-Default"> - <theme>mageia-theme-Default</theme> - <bootsplash>Mageia-Default</bootsplash> - <bootsplash_path>/home/bcd/build_bcd/pieces/iso/plymouth</bootsplash_path> - <gfxboot_path>/home/bcd/build_bcd/pieces/iso/gfxboot</gfxboot_path> - </theme> - - <media desc="media to take into account to build the ISO"> - <!-- name of the first media wich contains basesystem and kernels --> - <first_media>Core</first_media> - <update_prefix>Updates</update_prefix> - <list name="Core" desc="Core media"> - <!-- MANDATORY list of wanted packages on the iso --> - <input name="base"> - <file>lists/basesystem_mini</file> - </input> - <input name="kernel"> - <file>lists/kernel64_mini</file> - </input> - <!-- to create an array you must keep this even if it is empty --> - <input name="lang"> - <file>lists/languages</file> - </input> - <!-- MANDATORY list of unwanted packages on the iso --> - <exclude name="mini"> - <file>lists/exclude_mini</file> - </exclude> - <!-- to create an array you must keep this even if it is empty --> - <exclude> - </exclude> - <!-- nosuggests options should be yes or no --> - <nosuggests>yes</nosuggests> - <!-- will be taken in {repo}{version}{arch}/media --> - <mediadir>core</mediadir> - <destmedia>core</destmedia> - <pubkey>release/media_info/pubkey</pubkey> - <release>yes</release> - <updates>yes</updates> - <backport>no</backport> - <testing>no</testing> - </list> - <list name="nonfree" desc="Nonfree Release"> - <!-- MANDATORY list of wanted packages on the iso --> - <input name="base"> - <file>lists/basesystem_mini</file> - </input> - <input> - <file>lists/nonfree_mini</file> - </input> - <input> - <file>lists/nonfree_mini64</file> - </input> - - <!-- to create an array you must keep this even if it is empty --> - <!-- MANDATORY list of unwanted packages on the iso --> - <exclude name="exclude"> - <file>lists/exclude</file> - </exclude> - <exclude name="exclude_free"> - <file>lists/exclude_free</file> - </exclude> - <exclude name="exclude"> - <file>lists/exclude_dual</file> - </exclude> - <!-- to create an array you must keep this even if it is empty --> - <exclude> - </exclude> - <!-- nosuggests options should be yes or no --> - <nosuggests>yes</nosuggests> - <!-- will be taken in {repo}{version}{aRCh}/media --> - <mediadir>nonfree</mediadir> - <destmedia>nonfree</destmedia> - <!-- - <fullpath_mediadir>/home/plop/iso/final/t/i586/media/main</fullpath_mediadir> - --> - <pubkey>release/media_info/pubkey</pubkey> - <release>yes</release> - <updates>yes</updates> - <backport>no</backport> - <testing>no</testing> - </list> - - - <!-- keep this entry to create an array ref --> - <list></list> - </media> - - <mediainfo desc="All files relatives to media_info dir"> - <version>5</version> - <!-- set fullpath if youy want to use an files in a non MDV repositery --> - <fullpath>/home/bcd/build_bcd/pieces/cauldron/x86_64/media/media_info</fullpath> - <mediainfo_dir>media/media_info</mediainfo_dir> - <rpmsrate>rpmsrate</rpmsrate> - <compssusers>compssUsers.pl</compssusers> - <filedeps>file-deps</filedeps> - <filter>lists/no-filter</filter> - <urpmi_option> -p</urpmi_option> - <askmedia desc="add for other media ?"> - <todo>yes</todo> - </askmedia> - <suppl desc="add an external media ?"> - <todo>yes</todo> - </suppl> - <xmlinfo> - <todo>no</todo> - </xmlinfo> - </mediainfo> - - <iso> - <tag>vanda</tag> - <minor>1</minor> - <subversion>1</subversion> - <product>mageia-dual</product> - <branch>Devel</branch> - <type>basic</type> - <!-- dual arch not yet supported --> - <dualarch>no</dualarch> - <!-- SIZE is not YET USED !!! --> - <size>700</size> - <!-- media.cfg will be stored on genisoimage->{builddir}/{nameid}/{arch} --> - <mediacfg>media/media_info/media.cfg</mediacfg> - <hdlist>no</hdlist> - <synthesis>yes</synthesis> - <header desc="Iso header info"> - <systemid>Mageia</systemid> - <volumeid>Mageia - mageia dual 5</volumeid> - <volumesetid>Mageia - 5</volumesetid> - <publisherid>Mageia.Org</publisherid> - <datapreparer>Mageia BCD</datapreparer> - <applicationid>mageia-dual - 5</applicationid> - <copyrightid>Mageia.Org</copyrightid> - </header> - <isohybrid> - <options>--fatfirst</options> - </isohybrid> - <genisoimage desc="iso generation tool"> - <options>-f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4 </options> - <bootcat>isolinux/boot.cat</bootcat> - <!-- builddir and destdir will always use the workdir --> - <builddir>build</builddir> - <isodir>iso</isodir> - </genisoimage> - </iso> -</productname> diff --git a/dvd_free-i586.xml b/dvd_free-i586.xml index 49080ee..b1ceacc 100644 --- a/dvd_free-i586.xml +++ b/dvd_free-i586.xml @@ -25,16 +25,17 @@ <bin>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux/hdt.c32</bin> <label>hdt</label> <kernel>hdt.c32</kernel> - <append>modules_alias=modules.ali</append> + <append>modules=modules.pci</append> </entry> <!-- keep this entry to create an array ref --> <entry></entry> <tocopy name="pcimap"> - <file>/home/bcd/build_bcd/pieces/iso/dual/isolinux/modules.alias</file> + <file>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux/modules.alias</file> </tocopy> <tocopy name="ids"> <file>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux/pci.ids</file> </tocopy> + <tocopy></tocopy> </isolinux> <installer desc="path to the Mandriva installer (stage1/stage2)"> @@ -94,7 +95,7 @@ --> <pubkey>release/media_info/pubkey</pubkey> <release>yes</release> - <updates>yes</updates> + <updates>no</updates> <backport>no</backport> <testing>no</testing> </list> @@ -145,7 +146,7 @@ </media> <mediainfo desc="All files relatives to media_info dir"> - <version>5</version> + <version>6-dev1</version> <!-- set fullpath if you want to use an files in a non MDV repositery --> <fullpath>/home/bcd/build_bcd/pieces/cauldron/i586/media/media_info</fullpath> <mediainfo_dir>media/media_info</mediainfo_dir> @@ -181,11 +182,11 @@ <synthesis>yes</synthesis> <header desc="Iso header info"> <systemid>Mageia</systemid> - <volumeid>Mageia-5-i586</volumeid> - <volumesetid>Mageia 5 - i586 DVD</volumesetid> + <volumeid>Mageia-6-dev1-i586</volumeid> + <volumesetid>Mageia 6 dev1 - i586 DVD</volumesetid> <publisherid>Mageia</publisherid> <datapreparer>Mageia BCD</datapreparer> - <applicationid>Mageia 5</applicationid> + <applicationid>Mageia 6 dev1</applicationid> <copyrightid>Mageia</copyrightid> </header> <isohybrid> diff --git a/dvd_free-x86_64.xml b/dvd_free-x86_64.xml index de00093..3fc84ff 100644 --- a/dvd_free-x86_64.xml +++ b/dvd_free-x86_64.xml @@ -136,7 +136,7 @@ --> <pubkey>release/media_info/pubkey</pubkey> <release>yes</release> - <updates>yes</updates> + <updates>no</updates> <backport>no</backport> <testing>no</testing> </list> @@ -146,7 +146,7 @@ </media> <mediainfo desc="All files relatives to media_info dir"> - <version>5</version> + <version>6-dev1</version> <!-- set fullpath if you want to use an files in a non MDV repositery --> <fullpath>/home/bcd/build_bcd/pieces/cauldron/x86_64/media/media_info</fullpath> <mediainfo_dir>media/media_info</mediainfo_dir> @@ -182,15 +182,15 @@ <synthesis>yes</synthesis> <header desc="Iso header info"> <systemid>Mageia</systemid> - <volumeid>Mageia-5-x86_64</volumeid> - <volumesetid>Mageia 5 - x86_64 DVD</volumesetid> + <volumeid>Mageia-6-dev1-x86_64</volumeid> + <volumesetid>Mageia 6 dev1 - x86_64 DVD</volumesetid> <publisherid>Mageia</publisherid> <datapreparer>Mageia BCD</datapreparer> - <applicationid>Mageia 5</applicationid> + <applicationid>Mageia 6 dev1</applicationid> <copyrightid>Mageia</copyrightid> </header> <isohybrid> - <options>-o 1</options> + <options>-u</options> </isohybrid> <genisoimage desc="iso generation tool"> <options>-f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4</options> diff --git a/lists/input_cat b/lists/input_cat index c628fc7..8777f78 100644 --- a/lists/input_cat +++ b/lists/input_cat @@ -29,7 +29,7 @@ INSTALL 1 CAT_LXDE 1 CAT_GRAPHICAL_DESKTOP 4 CAT_GNOME 1 -CAT_KDE 1 +CAT_PLASMA5 1 CAT_XFCE 1 CAT_VIDEO 3 CAT_TV 3 @@ -62,8 +62,8 @@ task-3ddesktop-gtk task-3ddesktop-kde task-gnome task-gnome-minimal -task-kde4-minimal -task-kde4 +task-plasma5-minimal +task-plasma5 task-lxde task-cinnamon-minimal task-mate-minimal |