]>
Commit | Line | Data |
---|---|---|
c8b51fec PG |
1 | diff -urN util-vserver-0.30.216-pre3038/distrib/centos6/pkgs/01 util-vserver-0.30.216-centos6/distrib/centos6/pkgs/01 |
2 | --- util-vserver-0.30.216-pre3038/distrib/centos6/pkgs/01 1970-01-01 01:00:00.000000000 +0100 | |
3 | +++ util-vserver-0.30.216-centos6/distrib/centos6/pkgs/01 2013-03-22 16:00:37.018549783 +0100 | |
4 | @@ -0,0 +1 @@ | |
5 | +glibc | |
6 | diff -urN util-vserver-0.30.216-pre3038/distrib/centos6/pkgs/02 util-vserver-0.30.216-centos6/distrib/centos6/pkgs/02 | |
7 | --- util-vserver-0.30.216-pre3038/distrib/centos6/pkgs/02 1970-01-01 01:00:00.000000000 +0100 | |
8 | +++ util-vserver-0.30.216-centos6/distrib/centos6/pkgs/02 2013-03-22 16:00:37.018549783 +0100 | |
9 | @@ -0,0 +1,3 @@ | |
10 | +--reinstall | |
11 | + | |
12 | +filesystem | |
13 | diff -urN util-vserver-0.30.216-pre3038/distrib/centos6/pkgs/03 util-vserver-0.30.216-centos6/distrib/centos6/pkgs/03 | |
14 | --- util-vserver-0.30.216-pre3038/distrib/centos6/pkgs/03 1970-01-01 01:00:00.000000000 +0100 | |
15 | +++ util-vserver-0.30.216-centos6/distrib/centos6/pkgs/03 2013-03-22 16:00:37.018549783 +0100 | |
16 | @@ -0,0 +1,2 @@ | |
17 | +coreutils | |
18 | +setup | |
19 | diff -urN util-vserver-0.30.216-pre3038/distrib/centos6/yum/yum.conf util-vserver-0.30.216-centos6/distrib/centos6/yum/yum.conf | |
20 | --- util-vserver-0.30.216-pre3038/distrib/centos6/yum/yum.conf 1970-01-01 01:00:00.000000000 +0100 | |
21 | +++ util-vserver-0.30.216-centos6/distrib/centos6/yum/yum.conf 2013-03-22 16:00:37.018549783 +0100 | |
22 | @@ -0,0 +1,11 @@ | |
23 | +[main] | |
24 | +cachedir=@YUMCACHEDIR@ | |
25 | +reposdir=@YUMETCDIR@/yum.repos.d | |
26 | +debuglevel=1 | |
27 | +logfile=@YUMLOGDIR@/log | |
28 | +lockfile=@YUMLOCKDIR@/yum.pid | |
29 | +pkgpolicy=newest | |
30 | +distroverpkg=centos-release | |
31 | +installonlypkgs= | |
32 | +exactarch=0 | |
33 | +persistdir=@YUMLIBDIR@ | |
34 | diff -urN util-vserver-0.30.216-pre3038/distrib/centos6/yum.repos.d/CentOS-Base.repo util-vserver-0.30.216-centos6/distrib/centos6/yum.repos.d/CentOS-Base.repo | |
35 | --- util-vserver-0.30.216-pre3038/distrib/centos6/yum.repos.d/CentOS-Base.repo 1970-01-01 01:00:00.000000000 +0100 | |
36 | +++ util-vserver-0.30.216-centos6/distrib/centos6/yum.repos.d/CentOS-Base.repo 2013-03-22 16:02:54.351538808 +0100 | |
37 | @@ -0,0 +1,61 @@ | |
38 | +# CentOS-Base.repo | |
39 | +# | |
40 | +# This file uses a new mirrorlist system developed by Lance Davis for CentOS. | |
41 | +# The mirror system uses the connecting IP address of the client and the | |
42 | +# update status of each mirror to pick mirrors that are updated to and | |
43 | +# geographically close to the client. You should use this for CentOS updates | |
44 | +# unless you are manually picking other mirrors. | |
45 | +# | |
46 | +# If the mirrorlist= does not work for you, as a fall back you can try the | |
47 | +# remarked out baseurl= line instead. | |
48 | +# | |
49 | +# | |
50 | + | |
51 | +[base] | |
52 | +name=CentOS-6 - Base | |
53 | +mirrorlist=http://mirrorlist.centos.org/?release=6&arch=$basearch&repo=os | |
54 | +#baseurl=http://mirror.centos.org/centos/6/os/$basearch/ | |
55 | +gpgcheck=1 | |
56 | +gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6 | |
57 | + | |
58 | +#released updates | |
59 | +[updates] | |
60 | +name=CentOS-6 - Updates | |
61 | +mirrorlist=http://mirrorlist.centos.org/?release=6&arch=$basearch&repo=updates | |
62 | +#baseurl=http://mirror.centos.org/centos/6/updates/$basearch/ | |
63 | +gpgcheck=1 | |
64 | +gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6 | |
65 | + | |
66 | +#packages used/produced in the build but not released | |
67 | +#[addons] | |
68 | +#name=CentOS-6 - Addons | |
69 | +#mirrorlist=http://mirrorlist.centos.org/?release=6&arch=$basearch&repo=addons | |
70 | +##baseurl=http://mirror.centos.org/centos/6/addons/$basearch/ | |
71 | +#gpgcheck=1 | |
72 | +#gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6 | |
73 | + | |
74 | +#additional packages that may be useful | |
75 | +[extras] | |
76 | +name=CentOS-6 - Extras | |
77 | +mirrorlist=http://mirrorlist.centos.org/?release=6&arch=$basearch&repo=extras | |
78 | +#baseurl=http://mirror.centos.org/centos/6/extras/$basearch/ | |
79 | +gpgcheck=1 | |
80 | +gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6 | |
81 | + | |
82 | +#additional packages that extend functionality of existing packages | |
83 | +[centosplus] | |
84 | +name=CentOS-6 - Plus | |
85 | +mirrorlist=http://mirrorlist.centos.org/?release=6&arch=$basearch&repo=centosplus | |
86 | +#baseurl=http://mirror.centos.org/centos/6/centosplus/$basearch/ | |
87 | +gpgcheck=1 | |
88 | +enabled=0 | |
89 | +gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6 | |
90 | + | |
91 | +#contrib - packages by Centos Users | |
92 | +[contrib] | |
93 | +name=CentOS-6 - Contrib | |
94 | +mirrorlist=http://mirrorlist.centos.org/?release=6&arch=$basearch&repo=contrib | |
95 | +#baseurl=http://mirror.centos.org/centos/6/contrib/$basearch/ | |
96 | +gpgcheck=1 | |
97 | +enabled=0 | |
98 | +gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-6 | |
99 | diff -urN util-vserver-0.30.216-pre3038/distrib/Makefile.am util-vserver-0.30.216-centos6/distrib/Makefile.am | |
100 | --- util-vserver-0.30.216-pre3038/distrib/Makefile.am 2013-03-22 16:00:01.130230943 +0100 | |
101 | +++ util-vserver-0.30.216-centos6/distrib/Makefile.am 2013-03-22 15:59:32.985601735 +0100 | |
102 | @@ -92,6 +92,8 @@ | |
103 | centos4/yum/yum.conf $(wildcard $(srcdir)/centos4/yum.repos.d/*.repo) \ | |
104 | centos5/pkgs/01 centos5/pkgs/02 centos5/pkgs/03 \ | |
105 | centos5/yum/yum.conf $(wildcard $(srcdir)/centos5/yum.repos.d/*.repo) \ | |
106 | + centos6/pkgs/01 centos6/pkgs/02 centos6/pkgs/03 \ | |
107 | + centos6/yum/yum.conf $(wildcard $(srcdir)/centos6/yum.repos.d/*.repo) \ | |
108 | sl6/pkgs/01 sl6/pkgs/02 sl6/pkgs/03 \ | |
109 | sl6/yum/yum.conf $(wildcard $(srcdir)/sl6/yum.repos.d/*.repo) \ | |
110 | suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \ | |
111 | @@ -123,7 +125,7 @@ | |
112 | $(nobase_confdistrib_DATA) \ | |
113 | $(defaults_DATA) | |
114 | ||
115 | -redhat_style = rh9 fc1 fc2 fc3 fc4 fc5 fc6 f7 f8 f9 f10 f11 f12 f13 f14 centos4 centos5 sl6 | |
116 | +redhat_style = rh9 fc1 fc2 fc3 fc4 fc5 fc6 f7 f8 f9 f10 f11 f12 f13 f14 centos4 centos5 centos6 sl6 | |
117 | sid_style = etch lenny squeeze wheezy sid | |
118 | ||
119 | install-exec-hook: install-notify-xtra |