From cfe31ca7acca396c4f2744114c08fc0802cef5c3 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Wed, 15 Aug 2007 15:36:56 +0000 Subject: * switched from perl-based distro-configuration files to "real" configuration files (handled by Config::General) * removed most version specific distribution modules (only Debian-3.1 remains as it requires some special treatment). For all the other distributions, the specific info is now contained in the configuration files * added configuration files (settings.default) for every supported distribution (only Fedora is still missing some info) * added support for inclusion of (externally generated) mirror lists and automatic selection of the five best (fastest) mirrors from that list (20 are tried). For each repository, a mirror configuration file is created (in /etc/opt/openslx/distro-info//mirrors/) after that info has been gathered. * added current mirror lists for each distribution repository to the distro-info hierarchy * updated settings.example to reflect new configuration syntax git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1322 95ad53e4-c205-0410-b2fa-d234c58c8868 --- Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bf86652e..ce334290 100644 --- a/Makefile +++ b/Makefile @@ -157,12 +157,6 @@ supported."; \ cp os-plugins/slx* $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/bin/; \ tar --exclude=.svn -cp -C lib OpenSLX \ | tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/lib; \ - tar --exclude=.svn --exclude *.example \ - -cp -C lib distro-info \ - | tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share; \ - tar --exclude=.svn --exclude prereqfiles --exclude trusted-package-keys/* \ - -cp -C lib distro-info \ - | tar -xp -C $(SLX_BUILD_PATH)$(SLX_CONFIG_PATH); \ tar --exclude=.svn -cp -C config-db OpenSLX \ | tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/lib; \ tar --exclude=.svn -cp -C installer OpenSLX \ @@ -172,6 +166,15 @@ supported."; \ tar --exclude=.svn -cp -C os-plugins plugins \ | tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/lib; \ + @ # copy distro-info (some parts into /opt, others into /etc + @tar --exclude=.svn --exclude=*.example \ + -cp -C lib distro-info \ + | tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share; \ + tar --exclude=.svn --exclude=prereqfiles --exclude=trusted-package-keys/* \ + --exclude=*.default --exclude=mirrors \ + -cp -C lib distro-info \ + | tar -xp -C $(SLX_BUILD_PATH)$(SLX_CONFIG_PATH); \ + @ # link all binaries & scripts into user-path: @ln -sf $(SLX_BASE_PATH)/bin/slx* $(SLX_BUILD_PATH)$(USR_BIN_PATH)/; \ ln -sf $(SLX_BASE_PATH)/bin/mkdxsinitrd $(SLX_BUILD_PATH)$(USR_BIN_PATH)/; \ -- cgit v1.2.3-55-g7522