]> git.ipfire.org Git - people/ms/ipfire-3.x.git/blob - pakfire/patches/0010-Remove-testingbay-repository-from-example-configurat.patch
pakfire: Rebase on latest development status.
[people/ms/ipfire-3.x.git] / pakfire / patches / 0010-Remove-testingbay-repository-from-example-configurat.patch
1 From 2b40137a3bfb1b8a31d5acbba32bd5e285599ba3 Mon Sep 17 00:00:00 2001
2 From: Michael Tremer <michael.tremer@ipfire.org>
3 Date: Tue, 1 May 2012 14:30:30 +0200
4 Subject: [PATCH 10/16] Remove testingbay repository from example
5 configuration.
6
7 ---
8 Makefile | 4 ++--
9 examples/distros/ipfire3.conf | 8 +-------
10 examples/repos/ipfire.repo | 22 ----------------------
11 3 files changed, 3 insertions(+), 31 deletions(-)
12 delete mode 100644 examples/repos/ipfire.repo
13
14 diff --git a/Makefile b/Makefile
15 index 492d068..0361af6 100644
16 --- a/Makefile
17 +++ b/Makefile
18 @@ -32,8 +32,8 @@ install: build
19 cp -vf macros/*.macro $(DESTDIR)$(PREFIX)/lib/pakfire/macros
20
21 # Install example configuration.
22 - -mkdir -pv $(DESTDIR)/etc/pakfire
23 - for file in general.conf builder.conf client.conf daemon.conf distros repos; do \
24 + -mkdir -pv $(DESTDIR)/etc/pakfire/repos
25 + for file in general.conf builder.conf client.conf daemon.conf distros; do \
26 [ -e "$(DESTDIR)/etc/pakfire/$${file}" ] && continue; \
27 cp -rvf examples/$${file} $(DESTDIR)/etc/pakfire/; \
28 done
29 diff --git a/examples/distros/ipfire3.conf b/examples/distros/ipfire3.conf
30 index aed95ce..9d15bf0 100644
31 --- a/examples/distros/ipfire3.conf
32 +++ b/examples/distros/ipfire3.conf
33 @@ -1,5 +1,5 @@
34
35 -# Configuration of IPFire 3-
36 +# Configuration of IPFire 3.
37
38 [distro]
39 name = IPFire
40 @@ -28,9 +28,3 @@ description = IPFire 3 - This is a repository for testing stuff.
41 enabled = 0
42 baseurl = http://pakfire.ipfire.org/repositories/ipfire3/testing/%{arch}
43 mirrors = https://pakfire.ipfire.org/distro/ipfire3/repo/testing/mirrorlist?arch=%{arch}
44 -
45 -[repo:testingbay]
46 -description = IPFire 3 - Temporary bootstrap repository.
47 -enabled = 1
48 -baseurl = http://people.ipfire.org/~ms/testingbay-%{arch}
49 -mirrors = http://people.ipfire.org/~ms/testingbay-%{arch}/mirrors
50 diff --git a/examples/repos/ipfire.repo b/examples/repos/ipfire.repo
51 deleted file mode 100644
52 index 8c9f50a..0000000
53 --- a/examples/repos/ipfire.repo
54 +++ /dev/null
55 @@ -1,22 +0,0 @@
56 -;[repo:ipfire]
57 -;description = IPFire Main Repository
58 -;
59 -;url = http://mirror0.ipfire.org/pakfire3/$name/$arch
60 -;
61 -;gpgkey = /not/yet/existant
62 -
63 -;[repo:ipfire-development]
64 -;description = IPFire Development Repository
65 -
66 -#url = http://mirror0.ipfire.org/pakfire3/$name/$arch
67 -#url = file:///ipfire-3.x/build/packages/i686
68 -;url = file:///tmp/pakfire3
69 -
70 -;gpgkey = /not/yet/existant
71 -
72 -[repo:testingbay]
73 -description = IPFire Testing Repository for %{arch}
74 -enabled = 1
75 -
76 -mirrors = http://people.ipfire.org/~ms/testingbay-%{arch}/mirrors
77 -baseurl = http://people.ipfire.org/~ms/testingbay-%{arch}
78 --
79 1.7.10.4
80