Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

A few updates from the past.

  • Loading branch information...
commit 4f47e0410108075e2ad9aee8f360abaf0fc30fd1 1 parent df882dd
@dagwieers authored
View
4 dar-build
@@ -176,6 +176,7 @@ for arg in $PKGS; do
export origspecfile="$SPECFILE" specfile="$NEWSPECFILE" builddir="$BUILDDIR" chrootdir="$CHROOTDIR/$dist"
export app buildarch="$arch" distarch="$DISTARCH" disttag="$DISTNAME" repotag="$TAG" release="$RELEASE"
+ export force="$FORCE_OVERWRITE"
for script in $CONFIGDIR/scripts/pre-*.sh; do
source "$script"
done
@@ -275,6 +276,9 @@ for arg in $PKGS; do
unset SETARCH
fi
+ ### Disable ExtUtils::AutoInstall in perl packages
+ export PERL_EXTUTILS_AUTOINSTALL="--skipdeps --skip"
+
### Remove buildroot
rm -rf "$TEMPDIR/root-$app-$VERSION"
View
9 dar-functions
@@ -450,6 +450,7 @@ function build_repo_yum {
function build_repo {
local DISTPATH="$1"
local REPODATA="$FTPDIR/$DISTPATH/$REPO/repodata/"
+ local DISTDESC="$2"
if [ "$DISTNICK" ]; then
local RPMVER="$(chroot $CHROOTDIR/$DISTNICK rpm --version | cut -d' ' -f3)"
@@ -463,7 +464,10 @@ function build_repo {
if [ -d "$FTPDIR/$DISTPATH/$REPO/.olddata/" ]; then
rm -rf "$FTPDIR/$DISTPATH/$REPO/.olddata/"
fi
- createrepo -q $OPTIONS --update -c "$TEMPDIR/.cache/createrepo/" "$FTPDIR/$DISTPATH/$REPO"
+ if [ ! -d "$TEMPDIR/.cache/createrepo/$DISTNICK/$REPO" ]; then
+ mkdir -p "$TEMPDIR/.cache/createrepo/$DISTNICK/$REPO"
+ fi
+ createrepo -q $OPTIONS --checkts -c "$TEMPDIR/.cache/createrepo/$DISTNICK/$REPO" "$FTPDIR/$DISTPATH/$REPO"
sync
echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" >"$REPODATA/repomd.xml"
echo "<repomd xmlns=\"http://linux.duke.edu/metadata/repo\">" >>"$REPODATA/repomd.xml"
@@ -479,6 +483,9 @@ function build_repo {
echo " </data>" >>"$REPODATA/repomd.xml"
done
echo "</repomd>" >>"$REPODATA/repomd.xml"
+
+ repoview --quiet --title="RPMforge: $DISTDESC" "$FTPDIR/$DISTPATH/$REPO"
+ repoview --quiet --url="http://apt.sw.be/$DISTPATH/" "$FTPDIR/$DISTPATH/$REPO"
}
function build_repo_srpms {
View
2  dar-sync
@@ -61,7 +61,7 @@ for distname in $DISTS; do
fi
if [ "$REPO_CREATEREPO" == "yes" ]; then
- build_repo "$DISTPATH"
+ build_repo "$DISTPATH" "$DISTDESC"
fi
fi
build_env "$DISTNICK" "$DISTNAME"
View
3  dists/el2i/config
@@ -9,6 +9,7 @@ INSTALLCMD="up2date -if"
RPMBUILDOPTS='--define "rhel 2"'
+DISTDESC="Red Hat Enterprise Linux 2.1 (i386)"
DISTNAME="el2"
DISTNICK="el2i"
DISTTAG="0.el2 rhel2.1"
@@ -16,7 +17,7 @@ DISTPATH="redhat/el2.1/en/i386"
DISTARCH="i386"
REPO_APT="yes"
-REPO_YUM="no"
+REPO_YUM="yes"
REPO_CREATEREPO="yes"
export LD_ASSUME_KERNEL="2.4.1"
View
1  dists/el3a/config
@@ -9,6 +9,7 @@ INSTALLCMD="up2date -if"
RPMBUILDOPTS='--define "rhel 3"'
+DISTDESC="Red Hat Enterprise Linux 3 (x86_64)"
DISTNAME="el3"
DISTNICK="el3a"
DISTTAG="1.el3 rhel3"
View
1  dists/el3i/config
@@ -9,6 +9,7 @@ INSTALLCMD="up2date -if"
RPMBUILDOPTS='--define "rhel 3"'
+DISTDESC="Red Hat Enterprise Linux 3 (i386)"
DISTNAME="el3"
DISTNICK="el3i"
DISTTAG="1.el3 rhel3"
View
1  dists/el4a/config
@@ -9,6 +9,7 @@ INSTALLCMD="up2date -if"
RPMBUILDOPTS='--define "rhel 4"'
+DISTDESC="Red Hat Enterprise Linux 4 (x86_64)"
DISTNAME="el4"
DISTNICK="el4a"
DISTTAG="2.el4"
View
1  dists/el4i/config
@@ -9,6 +9,7 @@ INSTALLCMD="up2date -if"
RPMBUILDOPTS='--define "rhel 4"'
+DISTDESC="Red Hat Enterprise Linux 4 (i386)"
DISTNAME="el4"
DISTNICK="el4i"
DISTTAG="2.el4"
View
1  dists/fc1i/config
@@ -11,6 +11,7 @@ CLEANCMD="apt-get clean"
RPMBUILDOPTS='--define "fedora 1"'
+DISTDESC="Fedora Core 1 (i386)"
DISTNAME="fc1"
DISTNICK="fc1i"
DISTTAG="1.fc1 rhfc1"
View
1  dists/fc2a/config
@@ -14,6 +14,7 @@ CLEANCMD="apt-get clean"
RPMBUILDOPTS='--define "fedora 2"'
+DISTDESC="Fedora Core 2 (x86_64)"
DISTNAME="fc2"
DISTNICK="fc2a"
DISTTAG="1.fc2"
View
1  dists/fc2i/config
@@ -11,6 +11,7 @@ CLEANCMD="apt-get clean"
RPMBUILDOPTS='--define "fedora 2"'
+DISTDESC="Fedora Core 2 (i386)"
DISTNAME="fc2"
DISTNICK="fc2i"
DISTTAG="1.fc2"
View
1  dists/fc3a/config
@@ -11,6 +11,7 @@ CLEANCMD="apt-get clean"
RPMBUILDOPTS='--define "fedora 3"'
+DISTDESC="Fedora Core 3 (x86_64)"
DISTNAME="fc3"
DISTNICK="fc3a"
DISTTAG="1.fc3"
View
1  dists/fc3i/config
@@ -11,6 +11,7 @@ CLEANCMD="apt-get clean"
RPMBUILDOPTS='--define "fedora 3"'
+DISTDESC="Fedora Core 3 (i386)"
DISTNAME="fc3"
DISTNICK="fc3i"
DISTTAG="1.fc3"
View
1  dists/fc4i/config
@@ -13,6 +13,7 @@ CLEANCMD="apt-get clean"
RPMBUILDOPTS='--define "fedora 3"'
+DISTDESC="Fedora Core 4 (i386)"
DISTNAME="fc4"
DISTNICK="fc4i"
DISTTAG="2.fc4"
View
1  dists/rh6i/config
@@ -11,6 +11,7 @@ CLEANCMD="apt-get clean"
RPMBUILDOPTS='--define "rhl 6"'
+DISTDESC="Red Hat Linux 6.2 (i386)"
DISTNAME="rh6"
DISTNICK="rh6i"
DISTTAG="0.rh6 rh62"
View
1  dists/rh7i/config
@@ -11,6 +11,7 @@ CLEANCMD="apt-get clean"
RPMBUILDOPTS='--define "rhl 7"'
+DISTDESC="Red Hat Linux 7.3 (i386)"
DISTNAME="rh7"
DISTNICK="rh7i"
DISTTAG="0.rh7 rh73"
View
1  dists/rh8i/config
@@ -11,6 +11,7 @@ CLEANCMD="apt-get clean"
RPMBUILDOPTS='--define "rhl 8"'
+DISTDESC="Red Hat Linux 8.0 (i386)"
DISTNAME="rh8"
DISTNICK="rh8i"
DISTTAG="0.rh8 rh80"
View
1  dists/rh9i/config
@@ -13,6 +13,7 @@ CLEANCMD="apt-get clean"
RPMBUILDOPTS='--define "rhl 9"'
+DISTDESC="Red Hat Linux 9 (i386)"
DISTNAME="rh9"
DISTNICK="rh9i"
DISTTAG="0.rh9 rh90"
View
2  scripts/pre-new-release.sh
@@ -5,7 +5,7 @@
script="pre-new-release"
release_regex="\b\.2$"
-if [ "$disttag" != "fc5" ] && echo $release | grep -q -E "$release_regex"; then
+if [ -z "$force" ] && [ "$disttag" != "fc5" -a "$disttag" != "fc6" -a "$disttag" != "el5" ] && echo $release | grep -q -E "$release_regex"; then
echo "** $script: Not building $app for $disttag/$arch since $release matches new release scheme."
continue 2
fi
Please sign in to comment.
Something went wrong with that request. Please try again.