Sync with HEAD.

5 files changed, 27 insertions, 14 deletions

diff --git a/contrib/repo-conf/Makefile.am b/contrib/repo-conf/Makefile.am
index 5600057773..a24476f414 100644
--- a/contrib/repo-conf/Makefile.am
+++ b/contrib/repo-conf/Makefile.am
@@ -10,6 +10,7 @@ nobase_aptconf_DATA += apt/vendors.list.d/rtems.list
 apt/sources.list.d/rtems-@RTEMS_API@.list: apt/sources.list.d/rtems.list.in
 	@$(mkdir_p) apt/sources.list.d
 	sed -e 's,[@]RTEMS_API[@],@RTEMS_API@,' \
+	  -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
 	  < $(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
@@ -24,6 +25,7 @@ yum.repos.d/rtems-@RTEMS_API@.repo: yum.repos.d/rtems.repo.in
 	@$(mkdir_p) yum.repos.d
 	sed -e 's,[@]sysconfdir[@],$(sysconfdir),' \
 	  -e 's,[@]RTEMS_API[@],@RTEMS_API@,' \
+	  -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
 	  < $(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 ca2b01c498..114da93e0b 100644
--- a/contrib/repo-conf/apt/sources.list.d/rtems.list.in
+++ b/contrib/repo-conf/apt/sources.list.d/rtems.list.in
@@ -1,21 +1,21 @@
 ## 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@ fedora/$(VERSION)/$(ARCH)
+repomd ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@$(VERSION)/$(ARCH)
 
 ## uncomment the line below if you want to access the *.src.rpms
-# repomd-src ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ fedora/$(VERSION)/SRPMS
+# repomd-src ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@$(VERSION)/SRPMS
 
 ## uncomment the line below if you want to access the *-debuginfo*.rpms
-# repomd-debug ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ fedora/$(VERSION)/$(ARCH)/debug
+# repomd-debug ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@$(VERSION)/$(ARCH)/debug
 
 
 ## rtems/testing repos
 
-# repomd ftp://ftp.rtems.org/pub/rtems/linux/testing/@RTEMS_API@ fedora/$(VERSION)/$(ARCH)
+# repomd ftp://ftp.rtems.org/pub/rtems/linux/testing/@RTEMS_API@ @OS_SUBDIR@$(VERSION)/$(ARCH)
 
 ## uncomment the line below if you want to access the *.src.rpms
-# repomd-src ftp://ftp.rtems.org/pub/rtems/linux/testing/@RTEMS_API@ fedora/$(VERSION)/SRPMS
+# repomd-src ftp://ftp.rtems.org/pub/rtems/linux/testing/@RTEMS_API@ @OS_SUBDIR@$(VERSION)/SRPMS
 
 ## uncomment the line below if you want to access the *-debuginfo*.rpms
-# repomd-debug ftp://ftp.rtems.org/pub/rtems/linux/testing/@RTEMS_API@ fedora/$(VERSION)/$(ARCH)/debug
+# repomd-debug ftp://ftp.rtems.org/pub/rtems/linux/testing/@RTEMS_API@ @OS_SUBDIR@$(VERSION)/$(ARCH)/debug
diff --git a/contrib/repo-conf/configure.ac b/contrib/repo-conf/configure.ac
index 0d1889003c..7554edccc6 100644
--- a/contrib/repo-conf/configure.ac
+++ b/contrib/repo-conf/configure.ac
@@ -2,12 +2,17 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.60)
-AC_INIT([rtems-]_RTEMS_API[-repo-conf],[0.5],[http://www.rtems.org/bugzilla],
+AC_INIT([rtems-]_RTEMS_API[-repo-conf],[0.6],[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_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/contrib/repo-conf/rtems-repo-conf.spec.in b/contrib/repo-conf/rtems-repo-conf.spec.in
index 97c5863299..fcaeeb73e0 100644
--- a/contrib/repo-conf/rtems-repo-conf.spec.in
+++ b/contrib/repo-conf/rtems-repo-conf.spec.in
@@ -16,7 +16,13 @@ Apt/yum configuration files to access the apt/yum repositories at ftp://ftp.rtem
 %setup -q
 
 %build
-%configure
+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/";;
+*) extra_arg=--enable-os-subdir="redhat/";;
+esac
+%configure $extra_arg
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/contrib/repo-conf/yum.repos.d/rtems.repo.in b/contrib/repo-conf/yum.repos.d/rtems.repo.in
index 33cb13ed94..d1aa84e51b 100644
--- a/contrib/repo-conf/yum.repos.d/rtems.repo.in
+++ b/contrib/repo-conf/yum.repos.d/rtems.repo.in
@@ -1,6 +1,6 @@
 [rtems-@RTEMS_API@]
 name=RTEMS $releasever - $basearch - RTEMS
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@/fedora/$releasever/$basearch
+baseurl=ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@$releasever/$basearch
 # metadata_expire=0
 enabled=1
 gpgcheck=1
@@ -9,7 +9,7 @@ gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30
 
 [rtems-@RTEMS_API@-source]
 name=Fedora $releasever - $basearch - RTEMS sources
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@/fedora/$releasever/SRPMS
+baseurl=ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@$releasever/SRPMS
 # metadata_expire=0
 enabled=0
 gpgcheck=1
@@ -18,7 +18,7 @@ gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30
 
 [rtems-@RTEMS_API@-debug]
 name=Fedora $releasever - $basearch - RTEMS sources
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@/fedora/$releasever/$basearch/debug
+baseurl=ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@$releasever/$basearch/debug
 # metadata_expire=0
 enabled=0
 gpgcheck=1
@@ -28,7 +28,7 @@ gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30
 # rtems-testing add-on repository
 [rtems-@RTEMS_API@-testing]
 name=RTEMS $releasever - $basearch - RTEMS
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/testing/@RTEMS_API@/fedora/$releasever/$basearch
+baseurl=ftp://ftp.rtems.org/pub/rtems/linux/testing/@RTEMS_API@/@OS_SUBDIR@$releasever/$basearch
 # metadata_expire=0
 enabled=0
 gpgcheck=1
@@ -37,7 +37,7 @@ gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30
 
 [rtems-@RTEMS_API@-testing-source]
 name=Fedora $releasever - $basearch - RTEMS sources
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/testing/@RTEMS_API@/fedora/$releasever/SRPMS
+baseurl=ftp://ftp.rtems.org/pub/rtems/linux/testing/@RTEMS_API@/@OS_SUBDIR@$releasever/SRPMS
 # metadata_expire=0
 enabled=0
 gpgcheck=1
@@ -46,7 +46,7 @@ gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30
 
 [rtems-@RTEMS_API@-testing-debug]
 name=Fedora $releasever - $basearch - RTEMS sources
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/testing/@RTEMS_API@/fedora/$releasever/$basearch/debug
+baseurl=ftp://ftp.rtems.org/pub/rtems/linux/testing/@RTEMS_API@/@OS_SUBDIR@$releasever/$basearch/debug
 # metadata_expire=0
 enabled=0
 gpgcheck=1