From b7908bd6c4b1cb0162d7cbac66716dd74d02b982 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 26 Sep 2008 17:22:00 +0000 Subject: [PATCH] builds libnl and inotify-tools all uses of the 'kexcludes' fields, including in nodeconfig - now defined in build.common reviewed packages list - dismantled fc4, fc6 and f7 --- Makefile | 2 ++ nodeconfig.spec | 24 ++++++++++++--------- yum/centos5/yum.myplc.d/CentOS-Base.repo.in | 10 ++++----- yum/centos5/yum.myplc.d/epel.repo.in | 6 +++--- yum/f8/yum.myplc.d/fedora-updates.repo.in | 12 +++++------ yum/f8/yum.myplc.d/fedora.repo.in | 6 +++--- 6 files changed, 33 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index 61e5690..dce5ef7 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,8 @@ tags: find . -type f | grep -v '/\.svn/' | egrep -v '/(uudecode.gz|tags|TAGS)$$' | xargs etags +.PHONY: tags + ########## make sync PLCHOST=hostname VSERVER=vservername ifdef PLCHOST ifdef VSERVER diff --git a/nodeconfig.spec b/nodeconfig.spec index d7f30a2..a6bcd07 100644 --- a/nodeconfig.spec +++ b/nodeconfig.spec @@ -40,14 +40,14 @@ reasons these scripts get installed in /var/www/html/PlanetLabConf. %setup -q %build -pushd yum +pushd nodeconfig/yum -EXCLUDE="exclude=kernel* util-vserver* iptables iproute" +KEXCLUDE="exclude=$(../../build/getkexcludes.sh)" -# expand list of excludes +# expand list of kexcludes for filein in $(find . -name '*.in') ; do file=$(echo $filein | sed -e "s,\.in$,,") - sed -e "s,@EXCLUDE@,$EXCLUDE,g" $filein > $file + sed -e "s,@KEXCLUDE@,$KEXCLUDE,g" $filein > $file done # scan fcdistros and catenate all repos in 'stock.repo' so db-config can be distro-independant @@ -65,6 +65,8 @@ popd %install rm -rf $RPM_BUILD_ROOT +pushd nodeconfig + echo "* nodeconfig: Installing PlanetLabConf pages" for dir in boot PlanetLabConf PLCAPI ; do @@ -73,12 +75,14 @@ for dir in boot PlanetLabConf PLCAPI ; do done # the yum area -- se db-config -# expose (fixed) myplc.repo.php as https:///yum/myplc.repo.php -install -D -m 644 ./yum/myplc.repo.php $RPM_BUILD_ROOT/var/www/html/yum/myplc.repo.php -# expose the fcdistro-dependant yum.conf as https:///yum/yum.conf -install -D -m 644 ./yum/%{distroname}/yum.conf $RPM_BUILD_ROOT/var/www/html/yum/yum.conf -# expose the (fcdistro-dependant) stock.repo as https:///yum/stock.repo -install -D -m 644 ./yum/%{distroname}/yum.myplc.d/stock.repo $RPM_BUILD_ROOT/var/www/html/yum/stock.repo +# expose (fixed) myplc.repo.php as https:///yum/myplc.repo.php +install -D -m 644 ./yum/myplc.repo.php $RPM_BUILD_ROOT/var/www/html/yum/myplc.repo.php +# expose the fcdistro-dependant yum.conf as https:///yum/yum.conf +install -D -m 644 ./yum/%{distroname}/yum.conf $RPM_BUILD_ROOT/var/www/html/yum/yum.conf +# expose the (fcdistro-dependant) stock.repo as https:///yum/stock.repo +install -D -m 644 ./yum/%{distroname}/yum.myplc.d/stock.repo $RPM_BUILD_ROOT/var/www/html/yum/stock.repo + +popd %clean rm -rf $RPM_BUILD_ROOT diff --git a/yum/centos5/yum.myplc.d/CentOS-Base.repo.in b/yum/centos5/yum.myplc.d/CentOS-Base.repo.in index b7b4f5c..be1e9c2 100644 --- a/yum/centos5/yum.myplc.d/CentOS-Base.repo.in +++ b/yum/centos5/yum.myplc.d/CentOS-Base.repo.in @@ -15,7 +15,7 @@ name=CentOS-$releasever - Base mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os #baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/ -@EXCLUDE@ +@KEXCLUDE@ gpgcheck=1 enabled=1 gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5 @@ -25,7 +25,7 @@ gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5 name=CentOS-$releasever - Updates mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates #baseurl=http://mirror.centos.org/centos/$releasever/updates/$basearch/ -@EXCLUDE@ +@KEXCLUDE@ gpgcheck=1 enabled=1 gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5 @@ -35,7 +35,7 @@ gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5 name=CentOS-$releasever - Addons mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=addons #baseurl=http://mirror.centos.org/centos/$releasever/addons/$basearch/ -@EXCLUDE@ +@KEXCLUDE@ gpgcheck=1 enabled=0 gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5 @@ -45,7 +45,7 @@ gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5 name=CentOS-$releasever - Extras mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras #baseurl=http://mirror.centos.org/centos/$releasever/extras/$basearch/ -@EXCLUDE@ +@KEXCLUDE@ gpgcheck=1 enabled=0 gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5 @@ -55,7 +55,7 @@ gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5 name=CentOS-$releasever - Plus mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus #baseurl=http://mirror.centos.org/centos/$releasever/centosplus/$basearch/ -@EXCLUDE@ +@KEXCLUDE@ gpgcheck=1 enabled=0 gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-5 diff --git a/yum/centos5/yum.myplc.d/epel.repo.in b/yum/centos5/yum.myplc.d/epel.repo.in index 98bc984..1a844c1 100644 --- a/yum/centos5/yum.myplc.d/epel.repo.in +++ b/yum/centos5/yum.myplc.d/epel.repo.in @@ -3,7 +3,7 @@ name=Extra Packages for Enterprise Linux 5 - $basearch #baseurl=http://download.fedoraproject.org/pub/epel/5/$basearch mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch failovermethod=priority -@EXCLUDE@ +@KEXCLUDE@ enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL @@ -13,7 +13,7 @@ name=Extra Packages for Enterprise Linux 5 - $basearch - Debug #baseurl=http://download.fedoraproject.org/pub/epel/5/$basearch/debug mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-5&arch=$basearch failovermethod=priority -@EXCLUDE@ +@KEXCLUDE@ enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL gpgcheck=1 @@ -23,7 +23,7 @@ name=Extra Packages for Enterprise Linux 5 - $basearch - Source #baseurl=http://download.fedoraproject.org/pub/epel/5/SRPMS mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-5&arch=$basearch failovermethod=priority -@EXCLUDE@ +@KEXCLUDE@ enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL gpgcheck=1 diff --git a/yum/f8/yum.myplc.d/fedora-updates.repo.in b/yum/f8/yum.myplc.d/fedora-updates.repo.in index a04d45b..9f9b7f6 100644 --- a/yum/f8/yum.myplc.d/fedora-updates.repo.in +++ b/yum/f8/yum.myplc.d/fedora-updates.repo.in @@ -3,7 +3,7 @@ name=Fedora $releasever - $basearch - Updates failovermethod=priority #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/ mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch -@EXCLUDE@ +@KEXCLUDE@ enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora @@ -13,7 +13,7 @@ name=Fedora $releasever - $basearch - Updates - Debug failovermethod=priority #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/debug/ mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever&arch=$basearch -@EXCLUDE@ +@KEXCLUDE@ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora @@ -23,7 +23,7 @@ name=Fedora $releasever - Updates Source failovermethod=priority #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/SRPMS/ mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever&arch=$basearch -@EXCLUDE@ +@KEXCLUDE@ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora @@ -33,7 +33,7 @@ name=Fedora $releasever - $basearch - Updates Newkey failovermethod=priority #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch.newkey/ mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever.newkey&arch=$basearch -@EXCLUDE@ +@KEXCLUDE@ enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-8-and-9 @@ -43,7 +43,7 @@ name=Fedora $releasever - $basearch - Updates - Debug Newkey failovermethod=priority #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch.newkey/debug/ mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever.newkey&arch=$basearch -@EXCLUDE@ +@KEXCLUDE@ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-8-and-9 @@ -53,7 +53,7 @@ name=Fedora $releasever - Updates Source Newkey failovermethod=priority #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/SRPMS.newkey/ mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever.newkey&arch=$basearch -@EXCLUDE@ +@KEXCLUDE@ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-8-and-9 diff --git a/yum/f8/yum.myplc.d/fedora.repo.in b/yum/f8/yum.myplc.d/fedora.repo.in index f7b37c6..b7cea58 100644 --- a/yum/f8/yum.myplc.d/fedora.repo.in +++ b/yum/f8/yum.myplc.d/fedora.repo.in @@ -3,7 +3,7 @@ name=Fedora $releasever - $basearch failovermethod=priority #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/ mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch -@EXCLUDE@ +@KEXCLUDE@ enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY @@ -13,7 +13,7 @@ name=Fedora $releasever - $basearch - Debug failovermethod=priority #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/ mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-$releasever&arch=$basearch -@EXCLUDE@ +@KEXCLUDE@ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY @@ -23,7 +23,7 @@ name=Fedora $releasever - Source failovermethod=priority #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/ mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch -@EXCLUDE@ +@KEXCLUDE@ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY -- 2.43.0