From: S.Çağlar Onur Date: Thu, 10 Mar 2011 22:57:25 +0000 (-0500) Subject: support SL6 X-Git-Tag: util-vserver-0.30.216-15~1 X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=commitdiff_plain;h=f393b4a4caba43ecedc96b0b7baff85e51e34099 support SL6 --- diff --git a/sl.patch b/sl.patch new file mode 100644 index 0000000..af40600 --- /dev/null +++ b/sl.patch @@ -0,0 +1,149 @@ +Index: distrib/sl6/yum.repos.d/sl.repo +=================================================================== +--- distrib/sl6/yum.repos.d/sl.repo (revision 0) ++++ distrib/sl6/yum.repos.d/sl.repo (revision 0) +@@ -0,0 +1,41 @@ ++[sl] ++name=Scientific Linux 6 - $basearch ++baseurl=http://ftp.scientificlinux.org/linux/scientific/6/$basearch/os/ ++ http://ftp1.scientificlinux.org/linux/scientific/6/$basearch/os/ ++ http://ftp2.scientificlinux.org/linux/scientific/6/$basearch/os/ ++ ftp://ftp.scientificlinux.org/linux/scientific/6/$basearch/os/ ++#mirrorlist=http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-base-6.txt ++enabled=1 ++gpgcheck=1 ++gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson ++ ++[sl-testing] ++name=Scientific Linux 6 Testing - $basearch ++baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/ ++ http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/ ++ http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/ ++ ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/ ++enabled=0 ++gpgcheck=0 ++gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson ++ ++[sl-source] ++name=Scientific Linux 6 Alpha - Source ++baseurl=http://ftp.scientificlinux.org/linux/scientific/6/SRPMS/ ++ http://ftp1.scientificlinux.org/linux/scientific/6/SRPMS/ ++ http://ftp2.scientificlinux.org/linux/scientific/6/SRPMS/ ++ ftp://ftp.scientificlinux.org/linux/scientific/6/SRPMS/ ++enabled=0 ++gpgcheck=1 ++gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson ++ ++[sl-testing-source] ++name=Scientific Linux 6 Testing - Source ++baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/ ++ http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/ ++ http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/ ++ ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/ ++enabled=0 ++gpgcheck=0 ++gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson ++ +Index: distrib/sl6/yum.repos.d/sl-updates.repo +=================================================================== +--- distrib/sl6/yum.repos.d/sl-updates.repo (revision 0) ++++ distrib/sl6/yum.repos.d/sl-updates.repo (revision 0) +@@ -0,0 +1,22 @@ ++[sl-security] ++name=Scientific Linux 6 - $basearch - security updates ++baseurl=http://ftp.scientificlinux.org/linux/scientific/6/$basearch/updates/security/ ++ http://ftp1.scientificlinux.org/linux/scientific/6/$basearch/updates/security/ ++ http://ftp2.scientificlinux.org/linux/scientific/6/$basearch/updates/security/ ++ ftp://ftp.scientificlinux.org/linux/scientific/6/$basearch/updates/security/ ++#mirrorlist=http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-security-6.txt ++enabled=1 ++gpgcheck=1 ++gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson ++ ++[sl-fastbugs] ++name=Scientific Linux 6 - $basearch - fastbug updates ++baseurl=http://ftp.scientificlinux.org/linux/scientific/6/$basearch/updates/fastbugs/ ++ http://ftp1.scientificlinux.org/linux/scientific/6/$basearch/updates/fastbugs/ ++ http://ftp2.scientificlinux.org/linux/scientific/6/$basearch/updates/fastbugs/ ++ ftp://ftp.scientificlinux.org/linux/scientific/6/$basearch/updates/fastbugs/ ++#mirrorlist=http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-fastbugs-6.txt ++enabled=0 ++gpgcheck=1 ++gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson ++ +Index: distrib/sl6/pkgs/01 +=================================================================== +--- distrib/sl6/pkgs/01 (revision 0) ++++ distrib/sl6/pkgs/01 (revision 0) +@@ -0,0 +1 @@ ++glibc +Index: distrib/sl6/pkgs/02 +=================================================================== +--- distrib/sl6/pkgs/02 (revision 0) ++++ distrib/sl6/pkgs/02 (revision 0) +@@ -0,0 +1,3 @@ ++--reinstall ++ ++filesystem +Index: distrib/sl6/pkgs/03 +=================================================================== +--- distrib/sl6/pkgs/03 (revision 0) ++++ distrib/sl6/pkgs/03 (revision 0) +@@ -0,0 +1,2 @@ ++coreutils ++initscripts +Index: distrib/sl6/yum/yum.conf +=================================================================== +--- distrib/sl6/yum/yum.conf (revision 0) ++++ distrib/sl6/yum/yum.conf (revision 0) +@@ -0,0 +1,11 @@ ++[main] ++cachedir=@YUMCACHEDIR@ ++persistdir=@YUMLIBDIR@ ++reposdir=@YUMETCDIR@/yum.repos.d ++debuglevel=1 ++logfile=@YUMLOGDIR@/log ++lockfile=@YUMLOCKDIR@/yum.pid ++pkgpolicy=newest ++distroverpkg=sl-release ++installonlypkgs= ++exactarch=0 +Index: distrib/sl6/rpmlist.d/00.lst +=================================================================== +--- distrib/sl6/rpmlist.d/00.lst (revision 0) ++++ distrib/sl6/rpmlist.d/00.lst (revision 0) +@@ -0,0 +1,11 @@ ++glibc-[0-9]*.rpm ++basesystem-*.rpm ++bash-[0-9]*.rpm ++filesystem-*.rpm ++glibc-common-*.rpm ++libgcc-[0-9]*.rpm ++ncurses-base-[0-9]*.rpm ++ncurses-libs-*.rpm ++nss-softokn-freebl-*.rpm ++setup-*.rpm ++tzdata-*.rpm +Index: distrib/Makefile.am +=================================================================== +--- distrib/Makefile.am (revision 2939) ++++ distrib/Makefile.am (working copy) +@@ -93,6 +93,9 @@ + centos5/yum/yum.conf $(wildcard $(srcdir)/centos5/yum.repos.d/*.repo) \ + suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \ + suse91/rpm/macros \ ++ sl6/pkgs/01 sl6/pkgs/02 sl6/pkgs/03 sl6/yum/yum.conf \ ++ $(wildcard $(srcdir)/sl6/yum.repos.d/*.repo) \ ++ $(wildcard $(srcdir)/sl6/rpmlist.d/*.lst) $(wildcard $(srcdir)/sl6/rpmlist.d/*.opt) \ + gentoo/init-vserver.sh gentoo/net.vserver \ + gentoo/reboot.sh gentoo/shutdown.sh + +@@ -114,7 +117,7 @@ + $(nobase_confdistrib_DATA) \ + $(defaults_DATA) + +-redhat_style = rh9 fc1 fc2 fc3 fc4 fc5 fc6 f7 f8 f9 f10 f11 f12 f13 f14 centos4 centos5 ++redhat_style = rh9 fc1 fc2 fc3 fc4 fc5 fc6 f7 f8 f9 f10 f11 f12 f13 f14 centos4 centos5 sl6 + sid_style = etch lenny squeeze wheezy sid + + install-exec-hook: install-notify-xtra diff --git a/util-vserver.spec b/util-vserver.spec index 037c4cc..8f9f3b0 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -40,6 +40,7 @@ Source1: fstab Source2: vprocunhide-files Patch1: nomtab.patch Patch2: upstart.patch +Patch3: sl.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) Requires: %name-core = %version-%release @@ -199,6 +200,7 @@ Linux-VServer API from Python. %setup -q -n %name-%fullver %patch1 -p1 %patch2 -p1 +%patch3 -p0 autoreconf -fi %build