From dc84eda507bfa6a4bf76d8392ca92ff50c53fefb Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 7 Jun 2010 00:02:00 -0500 Subject: [PATCH] Get rid of the sym linked files. The building block spins were getting included twice. But rather than change them to sym links have the ks files use ../ so they can just be dropped. --- Makefile.am | 10 +++------- custom/README | 4 ++-- custom/fedora-live-base.ks | 1 - custom/fedora-live-desktop.ks | 1 - custom/fedora-live-mini.ks | 1 - custom/fedora-live-minimization.ks | 1 - custom/fedora-livecd-desktop.ks | 1 - custom/fedora-livecd-kde.ks | 1 - custom/fedora-livedvd-haskell.ks | 2 +- custom/qa-test-day.ks | 2 +- 10 files changed, 7 insertions(+), 17 deletions(-) delete mode 120000 custom/fedora-live-base.ks delete mode 120000 custom/fedora-live-desktop.ks delete mode 120000 custom/fedora-live-mini.ks delete mode 120000 custom/fedora-live-minimization.ks delete mode 120000 custom/fedora-livecd-desktop.ks delete mode 120000 custom/fedora-livecd-kde.ks diff --git a/Makefile.am b/Makefile.am index 456df60..f841005 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,13 +21,9 @@ fedora_DATA = \ customdir = ${pkgdatadir}/custom/ custom_DATA = \ - custom/README \ - custom/fedora-livedvd-haskell.ks \ - custom/qa-test-day.ks \ - fedora-live-base.ks \ - fedora-live-mini.ks \ - fedora-livecd-desktop.ks \ - fedora-livecd-kde.ks + custom/README \ + custom/fedora-livedvd-haskell.ks \ + custom/qa-test-day.ks \ l10ndir = ${pkgdatadir}/l10n/ l10n_DATA = \ diff --git a/custom/README b/custom/README index d13cf88..dfa621b 100644 --- a/custom/README +++ b/custom/README @@ -3,5 +3,5 @@ This directory contains unofficial kickstarts. These have been technically approved by the Fedora Spins SIG, but have no trademark approval. -Included in this directory is also a few symbolic links to official Fedora -kickstarts, used by the other kickstarts in this directory. +If these kickstart files include standard kickstarts (such as live-base), +they should use ../ for the directory name. diff --git a/custom/fedora-live-base.ks b/custom/fedora-live-base.ks deleted file mode 120000 index f283971..0000000 --- a/custom/fedora-live-base.ks +++ /dev/null @@ -1 +0,0 @@ -../fedora-live-base.ks \ No newline at end of file diff --git a/custom/fedora-live-desktop.ks b/custom/fedora-live-desktop.ks deleted file mode 120000 index 077ea4b..0000000 --- a/custom/fedora-live-desktop.ks +++ /dev/null @@ -1 +0,0 @@ -../fedora-live-desktop.ks \ No newline at end of file diff --git a/custom/fedora-live-mini.ks b/custom/fedora-live-mini.ks deleted file mode 120000 index 656fcdd..0000000 --- a/custom/fedora-live-mini.ks +++ /dev/null @@ -1 +0,0 @@ -../fedora-live-mini.ks \ No newline at end of file diff --git a/custom/fedora-live-minimization.ks b/custom/fedora-live-minimization.ks deleted file mode 120000 index aa6adeb..0000000 --- a/custom/fedora-live-minimization.ks +++ /dev/null @@ -1 +0,0 @@ -../fedora-live-minimization.ks \ No newline at end of file diff --git a/custom/fedora-livecd-desktop.ks b/custom/fedora-livecd-desktop.ks deleted file mode 120000 index 5466f3f..0000000 --- a/custom/fedora-livecd-desktop.ks +++ /dev/null @@ -1 +0,0 @@ -../fedora-livecd-desktop.ks \ No newline at end of file diff --git a/custom/fedora-livecd-kde.ks b/custom/fedora-livecd-kde.ks deleted file mode 120000 index 77a5924..0000000 --- a/custom/fedora-livecd-kde.ks +++ /dev/null @@ -1 +0,0 @@ -../fedora-livecd-kde.ks \ No newline at end of file diff --git a/custom/fedora-livedvd-haskell.ks b/custom/fedora-livedvd-haskell.ks index 173f896..4b29e96 100644 --- a/custom/fedora-livedvd-haskell.ks +++ b/custom/fedora-livedvd-haskell.ks @@ -1,4 +1,4 @@ -%include fedora-live-base.ks +%include ../fedora-live-base.ks part / --size 6000 diff --git a/custom/qa-test-day.ks b/custom/qa-test-day.ks index fc8e4e9..8ec8118 100644 --- a/custom/qa-test-day.ks +++ b/custom/qa-test-day.ks @@ -1,4 +1,4 @@ -%include fedora-livecd-desktop.ks +%include ../fedora-livecd-desktop.ks %packages gdb