diff options
| author | Eugeni Dodonov <eugeni@mandriva.org> | 2010-12-18 00:58:10 +0000 |
|---|---|---|
| committer | Eugeni Dodonov <eugeni@mandriva.org> | 2010-12-18 00:58:10 +0000 |
| commit | 19f610bba8a7b2e9dd942b09b955b4d7cc18e036 (patch) | |
| tree | 2f24dae8033e6c2d49591b196b8e2b817892a9f5 | |
| parent | ecc9c5b5cf2278cf6a2b3e307443e394557e7cc4 (diff) | |
| download | bcd-19f610bba8a7b2e9dd942b09b955b4d7cc18e036.tar bcd-19f610bba8a7b2e9dd942b09b955b4d7cc18e036.tar.gz bcd-19f610bba8a7b2e9dd942b09b955b4d7cc18e036.tar.bz2 bcd-19f610bba8a7b2e9dd942b09b955b4d7cc18e036.tar.xz bcd-19f610bba8a7b2e9dd942b09b955b4d7cc18e036.zip | |
Removed references to 2010.2 media and using correct path for update key.
| -rw-r--r-- | dvd_free32.xml | 27 | ||||
| -rw-r--r-- | dvd_free64.xml | 27 | ||||
| -rw-r--r-- | dvd_pwp32.xml | 27 | ||||
| -rw-r--r-- | dvd_pwp64.xml | 23 |
4 files changed, 6 insertions, 98 deletions
diff --git a/dvd_free32.xml b/dvd_free32.xml index 5c5e4df..ecf264b 100644 --- a/dvd_free32.xml +++ b/dvd_free32.xml @@ -103,35 +103,12 @@ </input> <input name="lang"> </input> - <mediadir>updates</mediadir> + <mediadir>main</mediadir> <destmedia>updates</destmedia> <external name="2010.2"> <fullpath_mediadir>/home/bcd/2010.1/updates/release</fullpath_mediadir> </external> - <pubkey>media_info/pubkey</pubkey> - <release>yes</release> - <updates>no</updates> - <backport>no</backport> - <testing>no</testing> - </list> - <list name="2010.2" desc="2010.2 media"> - <input name="base"> - <file>lists/basesystem_mini</file> - </input> - <input name="kernel"> - </input> - <input name="lang"> - </input> - <!-- will be taken in {repo}{version}{arch}/media --> - <mediadir>main2</mediadir> - <destmedia>main</destmedia> - <!-- - <fullpath_mediadir>/home/plop/iso/final/t/i586/media/main</fullpath_mediadir> - --> - <external name="2010.2"> - <fullpath_mediadir>/home/images/bcd/2010.1/i586/release</fullpath_mediadir> - </external> - <pubkey>media_info/pubkey</pubkey> + <pubkey>updates/media_info/pubkey</pubkey> <release>yes</release> <updates>no</updates> <backport>no</backport> diff --git a/dvd_free64.xml b/dvd_free64.xml index 3801312..881a656 100644 --- a/dvd_free64.xml +++ b/dvd_free64.xml @@ -96,29 +96,6 @@ <backport>no</backport> <testing>no</testing> </list> - <list name="2010.2" desc="2010.2 media"> - <input name="base"> - <file>lists/basesystem_mini</file> - </input> - <input name="kernel"> - </input> - <input name="lang"> - </input> - <!-- will be taken in {repo}{version}{arch}/media --> - <mediadir>main2</mediadir> - <destmedia>main</destmedia> - <!-- - <fullpath_mediadir>/home/plop/iso/final/t/i586/media/main</fullpath_mediadir> - --> - <external name="2010.2"> - <fullpath_mediadir>/home/images/bcd/2010.1/x86_64/release</fullpath_mediadir> - </external> - <pubkey>media_info/pubkey</pubkey> - <release>yes</release> - <updates>no</updates> - <backport>no</backport> - <testing>no</testing> - </list> <list name="updates" desc="updates media"> <input name="base"> </input> @@ -126,12 +103,12 @@ </input> <input name="lang"> </input> - <mediadir>updates</mediadir> + <mediadir>main</mediadir> <destmedia>updates</destmedia> <external name="2010.2"> <fullpath_mediadir>/home/bcd/2010.1/updates/release</fullpath_mediadir> </external> - <pubkey>media_info/pubkey</pubkey> + <pubkey>updates/media_info/pubkey</pubkey> <release>yes</release> <updates>no</updates> <backport>no</backport> diff --git a/dvd_pwp32.xml b/dvd_pwp32.xml index 701162a..3a5ff9f 100644 --- a/dvd_pwp32.xml +++ b/dvd_pwp32.xml @@ -92,29 +92,6 @@ <backport>no</backport> <testing>no</testing> </list> - <list name="2010.2" desc="2010.2 media"> - <input name="base"> - <file>lists/basesystem_mini</file> - </input> - <input name="kernel"> - </input> - <input name="lang"> - </input> - <!-- will be taken in {repo}{version}{arch}/media --> - <mediadir>main2</mediadir> - <destmedia>main</destmedia> - <!-- - <fullpath_mediadir>/home/plop/iso/final/t/i586/media/main</fullpath_mediadir> - --> - <external name="2010.2"> - <fullpath_mediadir>/home/images/bcd/2010.1/i586/release</fullpath_mediadir> - </external> - <pubkey>media_info/pubkey</pubkey> - <release>yes</release> - <updates>no</updates> - <backport>no</backport> - <testing>no</testing> - </list> <list name="updates" desc="updates media"> <input name="base"> </input> @@ -122,12 +99,12 @@ </input> <input name="lang"> </input> - <mediadir>updates</mediadir> + <mediadir>main</mediadir> <destmedia>updates</destmedia> <external name="2010.2"> <fullpath_mediadir>/home/bcd/2010.1/updates/release</fullpath_mediadir> </external> - <pubkey>media_info/pubkey</pubkey> + <pubkey>updates/media_info/pubkey</pubkey> <release>yes</release> <updates>yes</updates> <backport>no</backport> diff --git a/dvd_pwp64.xml b/dvd_pwp64.xml index b1707dc..351efb3 100644 --- a/dvd_pwp64.xml +++ b/dvd_pwp64.xml @@ -89,29 +89,6 @@ <backport>no</backport> <testing>no</testing> </list> - <list name="2010.2" desc="2010.2 media"> - <input name="base"> - <file>lists/basesystem_mini</file> - </input> - <input name="kernel"> - </input> - <input name="lang"> - </input> - <!-- will be taken in {repo}{version}{arch}/media --> - <mediadir>main2</mediadir> - <destmedia>main</destmedia> - <!-- - <fullpath_mediadir>/home/plop/iso/final/t/i586/media/main</fullpath_mediadir> - --> - <external name="2010.2"> - <fullpath_mediadir>/home/images/bcd/2010.1/i586/release</fullpath_mediadir> - </external> - <pubkey>media_info/pubkey</pubkey> - <release>yes</release> - <updates>no</updates> - <backport>no</backport> - <testing>no</testing> - </list> <list name="updates" desc="updates media"> <input name="base"> </input> |