summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2009-04-30 03:26:10 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2009-04-30 03:26:10 +0000
commit24cdb7d29897d5e2e8471ef841916dd3cb95495f (patch)
tree6033c399080a03885b68ce0476d006ce2300d9bb /contrib
parent2009-04-29 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff)
downloadrtems-24cdb7d29897d5e2e8471ef841916dd3cb95495f.tar.bz2
Strip / off from @OS_SUBDIR@.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/repo-conf/apt/sources.list.d/rtems.list.in6
-rw-r--r--contrib/repo-conf/configure.ac8
-rw-r--r--contrib/repo-conf/yum.repos.d/rtems.repo.in12
3 files changed, 13 insertions, 13 deletions
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 e3c1a595be..e70ab7604b 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@@APT_VERDIR@/$(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@@APT_VERDIR@/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@@APT_VERDIR@/$(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 cf33dd8000..9a9cd72b70 100644
--- a/contrib/repo-conf/configure.ac
+++ b/contrib/repo-conf/configure.ac
@@ -19,25 +19,25 @@ AC_ARG_ENABLE(osname,AS_HELP_STRING(
case $osname in
fedora-9* | fedora-10* | fedora-11* )
os_name="Fedora"
- os_subdir="fedora/"
+ os_subdir="fedora"
yum_verdir="\$\$releasever"
apt_verdir="\$\$(VERSION)"
;;
centos-5* | redhat-el5* | fedora-7* | fedora-8* )
os_name="CentOS"
- os_subdir="centos/"
+ os_subdir="centos"
yum_verdir="5"
apt_verdir="5"
;;
centos-4* | redhat-el4* | fedora-5* | fedora-6* )
os_name="CentOS"
- os_subdir="centos/"
+ os_subdir="centos"
yum_verdir="4"
apt_verdir="4"
;;
suse-*)
os_name="openSUSE"
- os_subdir="suse/"
+ os_subdir="suse"
yum_verdir="\$\$releasever"
apt_verdir="\$\$(VERSION)"
;;
diff --git a/contrib/repo-conf/yum.repos.d/rtems.repo.in b/contrib/repo-conf/yum.repos.d/rtems.repo.in
index 7d34d7c8d9..0e22c4eb27 100644
--- a/contrib/repo-conf/yum.repos.d/rtems.repo.in
+++ b/contrib/repo-conf/yum.repos.d/rtems.repo.in
@@ -1,7 +1,7 @@
[rtems-@RTEMS_API@]
name=RTEMS-@RTEMS_API@ for @OS_NAME@ @YUM_VERDIR@ - $basearch
-# baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/$basearch
-mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/mirrorlist
+# baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/$basearch
+mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/mirrorlist
# metadata_expire=0
enabled=1
gpgcheck=1
@@ -10,8 +10,8 @@ gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30
[rtems-@RTEMS_API@-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@@YUM_VERDIR@/SRPMS
-mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/mirrorlist-source
+# baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/SRPMS
+mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/mirrorlist-source
# metadata_expire=0
enabled=0
gpgcheck=1
@@ -20,8 +20,8 @@ gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30
[rtems-@RTEMS_API@-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@@YUM_VERDIR@/$basearch/debug
-mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/mirrorlist-debuginfo
+# baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/$basearch/debug
+mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/mirrorlist-debuginfo
# metadata_expire=0
enabled=0
gpgcheck=1