update.

6 files changed, 57 insertions, 29 deletions

diff --git a/contrib/repo-conf/INSTALL b/contrib/repo-conf/INSTALL
index 5458714e1e..d3c5b40a94 100644
--- a/contrib/repo-conf/INSTALL
+++ b/contrib/repo-conf/INSTALL
@@ -2,7 +2,7 @@ Installation Instructions
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -67,6 +67,9 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
 Compilers and Options
 =====================
 
diff --git a/contrib/repo-conf/Makefile.am b/contrib/repo-conf/Makefile.am
index 8e4b7b6d58..30fc819c9d 100644
--- a/contrib/repo-conf/Makefile.am
+++ b/contrib/repo-conf/Makefile.am
@@ -12,6 +12,7 @@ apt/sources.list.d/rtems-@RTEMS_API@.list: apt/sources.list.d/rtems.list.in
 	sed -e 's,[@]RTEMS_API[@],@RTEMS_API@,' \
 	  -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
 	  -e 's,[@]OS_NAME[@],@OS_NAME@,' \
+	  -e 's,[@]APT_VERDIR[@],@APT_VERDIR@,' \
 	  < $(srcdir)/apt/sources.list.d/rtems.list.in \
 	  > apt/sources.list.d/rtems-@RTEMS_API@.list
 CLEANFILES += apt/sources.list.d/rtems-@RTEMS_API@.list
@@ -28,6 +29,7 @@ yum.repos.d/rtems-@RTEMS_API@.repo: yum.repos.d/rtems.repo.in
 	  -e 's,[@]RTEMS_API[@],@RTEMS_API@,' \
 	  -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
 	  -e 's,[@]OS_NAME[@],@OS_NAME@,' \
+	  -e 's,[@]YUM_VERDIR[@],@YUM_VERDIR@,' \
 	  < $(srcdir)/yum.repos.d/rtems.repo.in \
 	  > yum.repos.d/rtems-@RTEMS_API@.repo
 CLEANFILES += yum.repos.d/rtems-@RTEMS_API@.repo
diff --git a/contrib/repo-conf/apt/sources.list.d/rtems.list.in b/contrib/repo-conf/apt/sources.list.d/rtems.list.in
index b214c4ea5f..e3c1a595be 100644
--- a/contrib/repo-conf/apt/sources.list.d/rtems.list.in
+++ b/contrib/repo-conf/apt/sources.list.d/rtems.list.in
@@ -1,10 +1,10 @@
 ## rtems-@RTEMS_API@ sources.list entries for apt-rpm with repomd support,
 ## http://apt-rpm.laiskiainen.org/
 
-repomd ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@$(VERSION)/$(ARCH)
+repomd ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@@APT_VERDIR@/$(ARCH)
 
 ## uncomment the line below if you want to access the *.src.rpms
-# repomd-src ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@$(VERSION)/SRPMS
+# repomd-src ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@@APT_VERDIR@/SRPMS
 
 ## uncomment the line below if you want to access the *-debuginfo*.rpms
-# repomd-debug ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@$(VERSION)/$(ARCH)/debug
+# repomd-debug ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@@APT_VERDIR@/$(ARCH)/debug
diff --git a/contrib/repo-conf/configure.ac b/contrib/repo-conf/configure.ac
index eec0e47cd4..afda6ae05b 100644
--- a/contrib/repo-conf/configure.ac
+++ b/contrib/repo-conf/configure.ac
@@ -2,27 +2,52 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([rtems-]_RTEMS_API[-repo-conf],[0.12],[http://www.rtems.org/bugzilla],
+AC_INIT([rtems-]_RTEMS_API[-repo-conf],[0.13],[http://www.rtems.org/bugzilla],
   [rtems-]_RTEMS_API[-repo-conf])
 RTEMS_VERSIONING
+
 AC_CONFIG_SRCDIR([gpg])
 AC_CONFIG_AUX_DIR([.])
 AC_SUBST([RTEMS_API],[_RTEMS_API])
 AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip 1.10])
 
-AC_ARG_ENABLE(os_subdir,AS_HELP_STRING(
-[--enable-os-subdir=<dir> ... os subdirectory]),
-[os_subdir="$enable_os_subdir"],
-[os_subdir="fedora/"])
-AC_SUBST([OS_SUBDIR],[$os_subdir])
+AC_ARG_ENABLE(osname,AS_HELP_STRING(
+[--enable-osname=<dir> ... os name]),
+[osname="$enable_osname"],
+[osname="fedora-10"])
 
-case "$os_subdir" in
-fedora/ ) os_name="Fedora";;
-redhat/el ) os_name="CentOS";;
-suse/ ) os_name="openSUSE";;
-*) AC_MSG_ERROR([Invalid os-name])
+case $osname in
+fedora-[89]* | fedora-10* )
+  os_name="Fedora"
+  os_subdir="fedora/"
+  yum_verdir="\$\$releasever"
+  apt_verdir="\$\$(VERSION)"
+  ;;
+centos-5* | redhat-el5* | fedora-[7]* )
+  os_name="CentOS"
+  os_subdir="centos/"
+  yum_verdir="5"
+  apt_verdir="5"
+  ;;
+centos-4* | redhat-el4* | fedora-[56]* )
+  os_name="CentOS"
+  os_subdir="centos/"
+  yum_verdir="4"
+  apt_verdir="4"
   ;;
+suse-*)
+  os_name="openSUSE"
+  os_subdir="suse/"
+  yum_verdir="\$\$releasever"
+  apt_verdir="\$\$(VERSION)"
+  ;;
+*)
+  AC_MSG_ERROR([Unsupported OS])
 esac
+
+AC_SUBST([OS_SUBDIR],[$os_subdir])
+AC_SUBST([YUM_VERDIR],[$yum_verdir])
+AC_SUBST([APT_VERDIR],[$apt_verdir])
 AC_SUBST([OS_NAME],[$os_name])
 
 AC_CONFIG_FILES([Makefile])
diff --git a/contrib/repo-conf/rtems-repo-conf.spec.in b/contrib/repo-conf/rtems-repo-conf.spec.in
index 1dff8847ce..cefff99e94 100644
--- a/contrib/repo-conf/rtems-repo-conf.spec.in
+++ b/contrib/repo-conf/rtems-repo-conf.spec.in
@@ -17,11 +17,9 @@ Apt/yum configuration files to access the apt/yum repositories at ftp://ftp.rtem
 
 %build
 case "%{?dist}" in
-.el*) extra_arg=--enable-os-subdir="redhat/el";;
-.fc*) extra_arg=--enable-os-subdir="fedora/";;
-.rh*) extra_arg=--enable-os-subdir="redhat/";;
-.suse*) extra_arg=--enable-os-subdir="suse/";;
-*) extra_arg=--enable-os-subdir="redhat/";;
+.el*) extra_arg=--enable-osname="centos-%{rhel}";;
+.fc*) extra_arg=--enable-osname="fedora-%{fedora}";;
+.suse*) extra_arg=--enable-osname="suse-%{suse}";;
 esac
 %configure $extra_arg
 
diff --git a/contrib/repo-conf/yum.repos.d/rtems.repo.in b/contrib/repo-conf/yum.repos.d/rtems.repo.in
index fc2f8ee408..efe37ec6b6 100644
--- a/contrib/repo-conf/yum.repos.d/rtems.repo.in
+++ b/contrib/repo-conf/yum.repos.d/rtems.repo.in
@@ -1,8 +1,8 @@
 [rtems-@RTEMS_API@]
-name=RTEMS-@RTEMS_API@ for @OS_NAME@ $releasever - $basearch
+name=RTEMS-@RTEMS_API@ for @OS_NAME@ @YUM_VERDIR@ - $basearch
 baseurl=
-	http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@$releasever/$basearch
-	http://www.rtems.info/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@$releasever/$basearch
+	http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/$basearch
+	http://www.rtems.info/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/$basearch
 # metadata_expire=0
 enabled=1
 gpgcheck=1
@@ -10,10 +10,10 @@ gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30
 	file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458
 
 [rtems-@RTEMS_API@-source]
-name=RTEMS-@RTEMS_API@ for @OS_NAME@ $releasever - $basearch - source
+name=RTEMS-@RTEMS_API@ for @OS_NAME@ @YUM_VERDIR@ - $basearch - source
 baseurl=
-	http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@$releasever/SRPMS
-	http://www.rtems.info/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@$releasever/SRPMS
+	http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/SRPMS
+	http://www.rtems.info/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/SRPMS
 # metadata_expire=0
 enabled=0
 gpgcheck=1
@@ -21,10 +21,10 @@ gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30
 	file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458
 
 [rtems-@RTEMS_API@-debuginfo]
-name=RTEMS-@RTEMS_API@ for @OS_NAME@ $releasever - $basearch - debuginfo
+name=RTEMS-@RTEMS_API@ for @OS_NAME@ @YUM_VERDIR@ - $basearch - debuginfo
 baseurl=
-	http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@$releasever/$basearch/debug
-	http://www.rtems.info/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@$releasever/$basearch/debug
+	http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/$basearch/debug
+	http://www.rtems.info/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/$basearch/debug
 # metadata_expire=0
 enabled=0
 gpgcheck=1