From 346a24cba41af5285053790978433046055a655a Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 16 Feb 2013 17:08:27 +0100 Subject: [PATCH] Move Fedora keys and base_rpms to scripts_fedora dir --- .gitignore | 2 -- scripts_fedora/.gitignore | 2 ++ scripts_fedora/00_prepare.sh | 2 ++ scripts_fedora/01_install_core.sh | 8 ++++---- .../base_rpms_fc13}/fedora-release-13-1.noarch.rpm | Bin .../filesystem-2.4.31-1.fc13.x86_64.rpm | Bin .../base_rpms_fc13}/setup-2.8.17-1.fc13.noarch.rpm | Bin .../base_rpms_fc14}/fedora-release-14-1.noarch.rpm | Bin .../filesystem-2.4.35-1.fc14.x86_64.rpm | Bin .../base_rpms_fc14}/setup-2.8.23-1.fc14.noarch.rpm | Bin .../base_rpms_fc15}/fedora-release-15-3.noarch.rpm | Bin .../filesystem-2.4.41-1.fc15.x86_64.rpm | Bin .../base_rpms_fc15}/setup-2.8.31-2.fc15.noarch.rpm | Bin .../base_rpms_fc16}/fedora-release-16-1.noarch.rpm | Bin .../filesystem-2.4.44-1.fc16.x86_64.rpm | Bin .../base_rpms_fc16}/setup-2.8.36-2.fc16.noarch.rpm | Bin .../base_rpms_fc17}/fedora-release-17-1.noarch.rpm | Bin .../base_rpms_fc17}/filesystem-3-2.fc17.x86_64.rpm | Bin .../base_rpms_fc17}/setup-2.8.48-1.fc17.noarch.rpm | Bin .../base_rpms_fc18}/fedora-release-18-1.noarch.rpm | Bin .../filesystem-3.1-2.fc18.x86_64.rpm | Bin .../base_rpms_fc18}/setup-2.8.57-1.fc18.noarch.rpm | Bin .../keys_fc13}/RPM-GPG-KEY-fedora-13-primary | 0 .../keys_fc13}/qubes-release-1-signing-key.asc | 0 .../keys_fc14}/RPM-GPG-KEY-fedora-14-primary | 0 .../keys_fc14}/qubes-release-1-signing-key.asc | 0 .../keys_fc15}/RPM-GPG-KEY-fedora-15-primary | 0 .../keys_fc15}/qubes-release-1-signing-key.asc | 0 .../keys_fc16}/RPM-GPG-KEY-Fedora-16-primary | 0 .../keys_fc16}/qubes-release-1-signing-key.asc | 0 .../keys_fc17}/RPM-GPG-KEY-Fedora-17-primary | 0 .../keys_fc17}/qubes-release-1-signing-key.asc | 0 .../keys_fc18}/RPM-GPG-KEY-Fedora-18-primary | 0 .../keys_fc18}/qubes-release-1-signing-key.asc | 0 34 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 scripts_fedora/.gitignore rename {base_rpms_fc13 => scripts_fedora/base_rpms_fc13}/fedora-release-13-1.noarch.rpm (100%) rename {base_rpms_fc13 => scripts_fedora/base_rpms_fc13}/filesystem-2.4.31-1.fc13.x86_64.rpm (100%) rename {base_rpms_fc13 => scripts_fedora/base_rpms_fc13}/setup-2.8.17-1.fc13.noarch.rpm (100%) rename {base_rpms_fc14 => scripts_fedora/base_rpms_fc14}/fedora-release-14-1.noarch.rpm (100%) rename {base_rpms_fc14 => scripts_fedora/base_rpms_fc14}/filesystem-2.4.35-1.fc14.x86_64.rpm (100%) rename {base_rpms_fc14 => scripts_fedora/base_rpms_fc14}/setup-2.8.23-1.fc14.noarch.rpm (100%) rename {base_rpms_fc15 => scripts_fedora/base_rpms_fc15}/fedora-release-15-3.noarch.rpm (100%) rename {base_rpms_fc15 => scripts_fedora/base_rpms_fc15}/filesystem-2.4.41-1.fc15.x86_64.rpm (100%) rename {base_rpms_fc15 => scripts_fedora/base_rpms_fc15}/setup-2.8.31-2.fc15.noarch.rpm (100%) rename {base_rpms_fc16 => scripts_fedora/base_rpms_fc16}/fedora-release-16-1.noarch.rpm (100%) rename {base_rpms_fc16 => scripts_fedora/base_rpms_fc16}/filesystem-2.4.44-1.fc16.x86_64.rpm (100%) rename {base_rpms_fc16 => scripts_fedora/base_rpms_fc16}/setup-2.8.36-2.fc16.noarch.rpm (100%) rename {base_rpms_fc17 => scripts_fedora/base_rpms_fc17}/fedora-release-17-1.noarch.rpm (100%) rename {base_rpms_fc17 => scripts_fedora/base_rpms_fc17}/filesystem-3-2.fc17.x86_64.rpm (100%) rename {base_rpms_fc17 => scripts_fedora/base_rpms_fc17}/setup-2.8.48-1.fc17.noarch.rpm (100%) rename {base_rpms_fc18 => scripts_fedora/base_rpms_fc18}/fedora-release-18-1.noarch.rpm (100%) rename {base_rpms_fc18 => scripts_fedora/base_rpms_fc18}/filesystem-3.1-2.fc18.x86_64.rpm (100%) rename {base_rpms_fc18 => scripts_fedora/base_rpms_fc18}/setup-2.8.57-1.fc18.noarch.rpm (100%) rename {keys_fc13 => scripts_fedora/keys_fc13}/RPM-GPG-KEY-fedora-13-primary (100%) rename {keys_fc13 => scripts_fedora/keys_fc13}/qubes-release-1-signing-key.asc (100%) rename {keys_fc14 => scripts_fedora/keys_fc14}/RPM-GPG-KEY-fedora-14-primary (100%) rename {keys_fc14 => scripts_fedora/keys_fc14}/qubes-release-1-signing-key.asc (100%) rename {keys_fc15 => scripts_fedora/keys_fc15}/RPM-GPG-KEY-fedora-15-primary (100%) rename {keys_fc15 => scripts_fedora/keys_fc15}/qubes-release-1-signing-key.asc (100%) rename {keys_fc16 => scripts_fedora/keys_fc16}/RPM-GPG-KEY-Fedora-16-primary (100%) rename {keys_fc16 => scripts_fedora/keys_fc16}/qubes-release-1-signing-key.asc (100%) rename {keys_fc17 => scripts_fedora/keys_fc17}/RPM-GPG-KEY-Fedora-17-primary (100%) rename {keys_fc17 => scripts_fedora/keys_fc17}/qubes-release-1-signing-key.asc (100%) rename {keys_fc18 => scripts_fedora/keys_fc18}/RPM-GPG-KEY-Fedora-18-primary (100%) rename {keys_fc18 => scripts_fedora/keys_fc18}/qubes-release-1-signing-key.asc (100%) diff --git a/.gitignore b/.gitignore index 7fad1ab..231e332 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ *~ -base_rpms -keys appmenus build_timestamp *.iso diff --git a/scripts_fedora/.gitignore b/scripts_fedora/.gitignore new file mode 100644 index 0000000..da1ecb8 --- /dev/null +++ b/scripts_fedora/.gitignore @@ -0,0 +1,2 @@ +keys +base_rpms diff --git a/scripts_fedora/00_prepare.sh b/scripts_fedora/00_prepare.sh index e2349bf..a351ebf 100755 --- a/scripts_fedora/00_prepare.sh +++ b/scripts_fedora/00_prepare.sh @@ -1,7 +1,9 @@ #!/bin/sh +pushd $SCRIPTSDIR rm -f keys base_rpms ln -sf keys_$DIST keys ln -sf base_rpms_$DIST base_rpms +popd createrepo -q -g $PWD/comps-qubes-template.xml yum_repo_qubes/$DIST -o yum_repo_qubes/$DIST diff --git a/scripts_fedora/01_install_core.sh b/scripts_fedora/01_install_core.sh index a42d30a..fb00e71 100755 --- a/scripts_fedora/01_install_core.sh +++ b/scripts_fedora/01_install_core.sh @@ -2,11 +2,11 @@ echo "-> Initializing RPM database..." rpm --initdb --root=$INSTALLDIR -rpm --import --root=$INSTALLDIR keys/* +rpm --import --root=$INSTALLDIR $SCRIPTSDIR/keys/* echo "-> Installing core RPM packages..." -rpm -i --root=$INSTALLDIR base_rpms/*.rpm || exit 1 +rpm -i --root=$INSTALLDIR $SCRIPTSDIR/base_rpms/*.rpm || exit 1 -cp scripts_"${DIST}"/resolv.conf $INSTALLDIR/etc -cp scripts_"${DIST}"/network $INSTALLDIR/etc/sysconfig +cp $SCRIPTSDIR/resolv.conf $INSTALLDIR/etc +cp $SCRIPTSDIR/network $INSTALLDIR/etc/sysconfig cp -a /dev/null /dev/zero /dev/random /dev/urandom $INSTALLDIR/dev/ diff --git a/base_rpms_fc13/fedora-release-13-1.noarch.rpm b/scripts_fedora/base_rpms_fc13/fedora-release-13-1.noarch.rpm similarity index 100% rename from base_rpms_fc13/fedora-release-13-1.noarch.rpm rename to scripts_fedora/base_rpms_fc13/fedora-release-13-1.noarch.rpm diff --git a/base_rpms_fc13/filesystem-2.4.31-1.fc13.x86_64.rpm b/scripts_fedora/base_rpms_fc13/filesystem-2.4.31-1.fc13.x86_64.rpm similarity index 100% rename from base_rpms_fc13/filesystem-2.4.31-1.fc13.x86_64.rpm rename to scripts_fedora/base_rpms_fc13/filesystem-2.4.31-1.fc13.x86_64.rpm diff --git a/base_rpms_fc13/setup-2.8.17-1.fc13.noarch.rpm b/scripts_fedora/base_rpms_fc13/setup-2.8.17-1.fc13.noarch.rpm similarity index 100% rename from base_rpms_fc13/setup-2.8.17-1.fc13.noarch.rpm rename to scripts_fedora/base_rpms_fc13/setup-2.8.17-1.fc13.noarch.rpm diff --git a/base_rpms_fc14/fedora-release-14-1.noarch.rpm b/scripts_fedora/base_rpms_fc14/fedora-release-14-1.noarch.rpm similarity index 100% rename from base_rpms_fc14/fedora-release-14-1.noarch.rpm rename to scripts_fedora/base_rpms_fc14/fedora-release-14-1.noarch.rpm diff --git a/base_rpms_fc14/filesystem-2.4.35-1.fc14.x86_64.rpm b/scripts_fedora/base_rpms_fc14/filesystem-2.4.35-1.fc14.x86_64.rpm similarity index 100% rename from base_rpms_fc14/filesystem-2.4.35-1.fc14.x86_64.rpm rename to scripts_fedora/base_rpms_fc14/filesystem-2.4.35-1.fc14.x86_64.rpm diff --git a/base_rpms_fc14/setup-2.8.23-1.fc14.noarch.rpm b/scripts_fedora/base_rpms_fc14/setup-2.8.23-1.fc14.noarch.rpm similarity index 100% rename from base_rpms_fc14/setup-2.8.23-1.fc14.noarch.rpm rename to scripts_fedora/base_rpms_fc14/setup-2.8.23-1.fc14.noarch.rpm diff --git a/base_rpms_fc15/fedora-release-15-3.noarch.rpm b/scripts_fedora/base_rpms_fc15/fedora-release-15-3.noarch.rpm similarity index 100% rename from base_rpms_fc15/fedora-release-15-3.noarch.rpm rename to scripts_fedora/base_rpms_fc15/fedora-release-15-3.noarch.rpm diff --git a/base_rpms_fc15/filesystem-2.4.41-1.fc15.x86_64.rpm b/scripts_fedora/base_rpms_fc15/filesystem-2.4.41-1.fc15.x86_64.rpm similarity index 100% rename from base_rpms_fc15/filesystem-2.4.41-1.fc15.x86_64.rpm rename to scripts_fedora/base_rpms_fc15/filesystem-2.4.41-1.fc15.x86_64.rpm diff --git a/base_rpms_fc15/setup-2.8.31-2.fc15.noarch.rpm b/scripts_fedora/base_rpms_fc15/setup-2.8.31-2.fc15.noarch.rpm similarity index 100% rename from base_rpms_fc15/setup-2.8.31-2.fc15.noarch.rpm rename to scripts_fedora/base_rpms_fc15/setup-2.8.31-2.fc15.noarch.rpm diff --git a/base_rpms_fc16/fedora-release-16-1.noarch.rpm b/scripts_fedora/base_rpms_fc16/fedora-release-16-1.noarch.rpm similarity index 100% rename from base_rpms_fc16/fedora-release-16-1.noarch.rpm rename to scripts_fedora/base_rpms_fc16/fedora-release-16-1.noarch.rpm diff --git a/base_rpms_fc16/filesystem-2.4.44-1.fc16.x86_64.rpm b/scripts_fedora/base_rpms_fc16/filesystem-2.4.44-1.fc16.x86_64.rpm similarity index 100% rename from base_rpms_fc16/filesystem-2.4.44-1.fc16.x86_64.rpm rename to scripts_fedora/base_rpms_fc16/filesystem-2.4.44-1.fc16.x86_64.rpm diff --git a/base_rpms_fc16/setup-2.8.36-2.fc16.noarch.rpm b/scripts_fedora/base_rpms_fc16/setup-2.8.36-2.fc16.noarch.rpm similarity index 100% rename from base_rpms_fc16/setup-2.8.36-2.fc16.noarch.rpm rename to scripts_fedora/base_rpms_fc16/setup-2.8.36-2.fc16.noarch.rpm diff --git a/base_rpms_fc17/fedora-release-17-1.noarch.rpm b/scripts_fedora/base_rpms_fc17/fedora-release-17-1.noarch.rpm similarity index 100% rename from base_rpms_fc17/fedora-release-17-1.noarch.rpm rename to scripts_fedora/base_rpms_fc17/fedora-release-17-1.noarch.rpm diff --git a/base_rpms_fc17/filesystem-3-2.fc17.x86_64.rpm b/scripts_fedora/base_rpms_fc17/filesystem-3-2.fc17.x86_64.rpm similarity index 100% rename from base_rpms_fc17/filesystem-3-2.fc17.x86_64.rpm rename to scripts_fedora/base_rpms_fc17/filesystem-3-2.fc17.x86_64.rpm diff --git a/base_rpms_fc17/setup-2.8.48-1.fc17.noarch.rpm b/scripts_fedora/base_rpms_fc17/setup-2.8.48-1.fc17.noarch.rpm similarity index 100% rename from base_rpms_fc17/setup-2.8.48-1.fc17.noarch.rpm rename to scripts_fedora/base_rpms_fc17/setup-2.8.48-1.fc17.noarch.rpm diff --git a/base_rpms_fc18/fedora-release-18-1.noarch.rpm b/scripts_fedora/base_rpms_fc18/fedora-release-18-1.noarch.rpm similarity index 100% rename from base_rpms_fc18/fedora-release-18-1.noarch.rpm rename to scripts_fedora/base_rpms_fc18/fedora-release-18-1.noarch.rpm diff --git a/base_rpms_fc18/filesystem-3.1-2.fc18.x86_64.rpm b/scripts_fedora/base_rpms_fc18/filesystem-3.1-2.fc18.x86_64.rpm similarity index 100% rename from base_rpms_fc18/filesystem-3.1-2.fc18.x86_64.rpm rename to scripts_fedora/base_rpms_fc18/filesystem-3.1-2.fc18.x86_64.rpm diff --git a/base_rpms_fc18/setup-2.8.57-1.fc18.noarch.rpm b/scripts_fedora/base_rpms_fc18/setup-2.8.57-1.fc18.noarch.rpm similarity index 100% rename from base_rpms_fc18/setup-2.8.57-1.fc18.noarch.rpm rename to scripts_fedora/base_rpms_fc18/setup-2.8.57-1.fc18.noarch.rpm diff --git a/keys_fc13/RPM-GPG-KEY-fedora-13-primary b/scripts_fedora/keys_fc13/RPM-GPG-KEY-fedora-13-primary similarity index 100% rename from keys_fc13/RPM-GPG-KEY-fedora-13-primary rename to scripts_fedora/keys_fc13/RPM-GPG-KEY-fedora-13-primary diff --git a/keys_fc13/qubes-release-1-signing-key.asc b/scripts_fedora/keys_fc13/qubes-release-1-signing-key.asc similarity index 100% rename from keys_fc13/qubes-release-1-signing-key.asc rename to scripts_fedora/keys_fc13/qubes-release-1-signing-key.asc diff --git a/keys_fc14/RPM-GPG-KEY-fedora-14-primary b/scripts_fedora/keys_fc14/RPM-GPG-KEY-fedora-14-primary similarity index 100% rename from keys_fc14/RPM-GPG-KEY-fedora-14-primary rename to scripts_fedora/keys_fc14/RPM-GPG-KEY-fedora-14-primary diff --git a/keys_fc14/qubes-release-1-signing-key.asc b/scripts_fedora/keys_fc14/qubes-release-1-signing-key.asc similarity index 100% rename from keys_fc14/qubes-release-1-signing-key.asc rename to scripts_fedora/keys_fc14/qubes-release-1-signing-key.asc diff --git a/keys_fc15/RPM-GPG-KEY-fedora-15-primary b/scripts_fedora/keys_fc15/RPM-GPG-KEY-fedora-15-primary similarity index 100% rename from keys_fc15/RPM-GPG-KEY-fedora-15-primary rename to scripts_fedora/keys_fc15/RPM-GPG-KEY-fedora-15-primary diff --git a/keys_fc15/qubes-release-1-signing-key.asc b/scripts_fedora/keys_fc15/qubes-release-1-signing-key.asc similarity index 100% rename from keys_fc15/qubes-release-1-signing-key.asc rename to scripts_fedora/keys_fc15/qubes-release-1-signing-key.asc diff --git a/keys_fc16/RPM-GPG-KEY-Fedora-16-primary b/scripts_fedora/keys_fc16/RPM-GPG-KEY-Fedora-16-primary similarity index 100% rename from keys_fc16/RPM-GPG-KEY-Fedora-16-primary rename to scripts_fedora/keys_fc16/RPM-GPG-KEY-Fedora-16-primary diff --git a/keys_fc16/qubes-release-1-signing-key.asc b/scripts_fedora/keys_fc16/qubes-release-1-signing-key.asc similarity index 100% rename from keys_fc16/qubes-release-1-signing-key.asc rename to scripts_fedora/keys_fc16/qubes-release-1-signing-key.asc diff --git a/keys_fc17/RPM-GPG-KEY-Fedora-17-primary b/scripts_fedora/keys_fc17/RPM-GPG-KEY-Fedora-17-primary similarity index 100% rename from keys_fc17/RPM-GPG-KEY-Fedora-17-primary rename to scripts_fedora/keys_fc17/RPM-GPG-KEY-Fedora-17-primary diff --git a/keys_fc17/qubes-release-1-signing-key.asc b/scripts_fedora/keys_fc17/qubes-release-1-signing-key.asc similarity index 100% rename from keys_fc17/qubes-release-1-signing-key.asc rename to scripts_fedora/keys_fc17/qubes-release-1-signing-key.asc diff --git a/keys_fc18/RPM-GPG-KEY-Fedora-18-primary b/scripts_fedora/keys_fc18/RPM-GPG-KEY-Fedora-18-primary similarity index 100% rename from keys_fc18/RPM-GPG-KEY-Fedora-18-primary rename to scripts_fedora/keys_fc18/RPM-GPG-KEY-Fedora-18-primary diff --git a/keys_fc18/qubes-release-1-signing-key.asc b/scripts_fedora/keys_fc18/qubes-release-1-signing-key.asc similarity index 100% rename from keys_fc18/qubes-release-1-signing-key.asc rename to scripts_fedora/keys_fc18/qubes-release-1-signing-key.asc