diff options
| -rwxr-xr-x | create_dvd.sh | 2 | ||||
| -rw-r--r-- | dual.xml | 42 | ||||
| -rw-r--r-- | dvd_free-i586.xml | 42 | ||||
| -rw-r--r-- | dvd_free-x86_64.xml | 38 |
4 files changed, 117 insertions, 7 deletions
diff --git a/create_dvd.sh b/create_dvd.sh index aa5d3f5..d19f20e 100755 --- a/create_dvd.sh +++ b/create_dvd.sh @@ -2,7 +2,7 @@ arch=$1 distrib=Mageia -version=3-alpha3 +version=3-beta1 homebcd=/home/bcd/build_bcd bin=$homebcd/bcd pieces=$homebcd/pieces/iso @@ -5,8 +5,8 @@ <nb_fork>10</nb_fork> <!-- you must specify on wich distrib this iso will be built --> <based_on>cauldron</based_on> - <!-- --> - <checktool>rpmcheck</checktool> + <!-- + <checktool>rpmcheck</checktool>--> <arch>i586</arch> <repo desc="Where is the repositery of the distribution"> <path>/home/bcd/build_bcd/pieces</path> @@ -87,6 +87,42 @@ <backport>no</backport> <testing>no</testing> </list> + <list name="nonfree" desc="nonfree media"> + <!-- MANDATORY list of wanted packages on the iso --> + <input name="base"> + <file>lists/input_cat</file> + </input> + <input> + <file>lists/nonfree_mini</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_tofix</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> @@ -126,7 +162,7 @@ <size>700</size> <!-- media.cfg will be stored on genisoimage->{builddir}/{nameid}/{arch} --> <mediacfg>media/media_info/media.cfg</mediacfg> - <hdlist>no</hdlist> + <hdlist>yes</hdlist> <synthesis>yes</synthesis> <header desc="Iso header info"> <systemid>Mageia</systemid> diff --git a/dvd_free-i586.xml b/dvd_free-i586.xml index e73018a..fc288de 100644 --- a/dvd_free-i586.xml +++ b/dvd_free-i586.xml @@ -59,7 +59,7 @@ <first_media>core</first_media> <!-- <update_prefix>Updates</update_prefix> --> <update_prefix>Updates</update_prefix> - <list name="core" desc="core media"> + <list name="core" desc="Core Release"> <!-- MANDATORY list of wanted packages on the iso --> <input name="theme"> <file>lists/theme-free</file> @@ -99,6 +99,44 @@ <testing>no</testing> </list> + <list name="nonfree" desc="Nonfree Release"> + <!-- MANDATORY list of wanted packages on the iso --> + <input name="base"> + <file>lists/input_cat</file> + </input> + <input> + <file>lists/input_nonfree</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_tofix</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> @@ -136,7 +174,7 @@ <size>4000</size> <!-- media.cfg will be stored on genisoimage->{builddir}/{nameid}/{arch} --> <mediacfg>media/media_info/media.cfg</mediacfg> - <hdlist>no</hdlist> + <hdlist>yes</hdlist> <synthesis>yes</synthesis> <header desc="Iso header info"> <systemid>Mageia</systemid> diff --git a/dvd_free-x86_64.xml b/dvd_free-x86_64.xml index 3b944da..f604927 100644 --- a/dvd_free-x86_64.xml +++ b/dvd_free-x86_64.xml @@ -59,7 +59,7 @@ <first_media>core</first_media> <!-- <update_prefix>Updates</update_prefix> --> <update_prefix>Updates</update_prefix> - <list name="core" desc="core media"> + <list name="core" desc="Core Release"> <!-- MANDATORY list of wanted packages on the iso --> <input name="theme"> <file>lists/theme-free</file> @@ -101,6 +101,42 @@ <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/input_cat</file> + </input> + <input> + <file>lists/input_nonfree</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_tofix</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> |