Skip to content

Commit

Permalink
A few updates from the past.
Browse files Browse the repository at this point in the history
  • Loading branch information
dagwieers committed Nov 22, 2006
1 parent df882dd commit 4f47e04
Show file tree
Hide file tree
Showing 19 changed files with 30 additions and 4 deletions.
4 changes: 4 additions & 0 deletions dar-build
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ for arg in $PKGS; do


export origspecfile="$SPECFILE" specfile="$NEWSPECFILE" builddir="$BUILDDIR" chrootdir="$CHROOTDIR/$dist" export origspecfile="$SPECFILE" specfile="$NEWSPECFILE" builddir="$BUILDDIR" chrootdir="$CHROOTDIR/$dist"
export app buildarch="$arch" distarch="$DISTARCH" disttag="$DISTNAME" repotag="$TAG" release="$RELEASE" export app buildarch="$arch" distarch="$DISTARCH" disttag="$DISTNAME" repotag="$TAG" release="$RELEASE"
export force="$FORCE_OVERWRITE"
for script in $CONFIGDIR/scripts/pre-*.sh; do for script in $CONFIGDIR/scripts/pre-*.sh; do
source "$script" source "$script"
done done
Expand Down Expand Up @@ -275,6 +276,9 @@ for arg in $PKGS; do
unset SETARCH unset SETARCH
fi fi


### Disable ExtUtils::AutoInstall in perl packages
export PERL_EXTUTILS_AUTOINSTALL="--skipdeps --skip"

### Remove buildroot ### Remove buildroot
rm -rf "$TEMPDIR/root-$app-$VERSION" rm -rf "$TEMPDIR/root-$app-$VERSION"


Expand Down
9 changes: 8 additions & 1 deletion dar-functions
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -450,6 +450,7 @@ function build_repo_yum {
function build_repo { function build_repo {
local DISTPATH="$1" local DISTPATH="$1"
local REPODATA="$FTPDIR/$DISTPATH/$REPO/repodata/" local REPODATA="$FTPDIR/$DISTPATH/$REPO/repodata/"
local DISTDESC="$2"


if [ "$DISTNICK" ]; then if [ "$DISTNICK" ]; then
local RPMVER="$(chroot $CHROOTDIR/$DISTNICK rpm --version | cut -d' ' -f3)" local RPMVER="$(chroot $CHROOTDIR/$DISTNICK rpm --version | cut -d' ' -f3)"
Expand All @@ -463,7 +464,10 @@ function build_repo {
if [ -d "$FTPDIR/$DISTPATH/$REPO/.olddata/" ]; then if [ -d "$FTPDIR/$DISTPATH/$REPO/.olddata/" ]; then
rm -rf "$FTPDIR/$DISTPATH/$REPO/.olddata/" rm -rf "$FTPDIR/$DISTPATH/$REPO/.olddata/"
fi 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 sync
echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" >"$REPODATA/repomd.xml" echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" >"$REPODATA/repomd.xml"
echo "<repomd xmlns=\"http://linux.duke.edu/metadata/repo\">" >>"$REPODATA/repomd.xml" echo "<repomd xmlns=\"http://linux.duke.edu/metadata/repo\">" >>"$REPODATA/repomd.xml"
Expand All @@ -479,6 +483,9 @@ function build_repo {
echo " </data>" >>"$REPODATA/repomd.xml" echo " </data>" >>"$REPODATA/repomd.xml"
done done
echo "</repomd>" >>"$REPODATA/repomd.xml" 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 { function build_repo_srpms {
Expand Down
2 changes: 1 addition & 1 deletion dar-sync
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ for distname in $DISTS; do
fi fi


if [ "$REPO_CREATEREPO" == "yes" ]; then if [ "$REPO_CREATEREPO" == "yes" ]; then
build_repo "$DISTPATH" build_repo "$DISTPATH" "$DISTDESC"
fi fi
fi fi
build_env "$DISTNICK" "$DISTNAME" build_env "$DISTNICK" "$DISTNAME"
Expand Down
3 changes: 2 additions & 1 deletion dists/el2i/config
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ INSTALLCMD="up2date -if"


RPMBUILDOPTS='--define "rhel 2"' RPMBUILDOPTS='--define "rhel 2"'


DISTDESC="Red Hat Enterprise Linux 2.1 (i386)"
DISTNAME="el2" DISTNAME="el2"
DISTNICK="el2i" DISTNICK="el2i"
DISTTAG="0.el2 rhel2.1" DISTTAG="0.el2 rhel2.1"
DISTPATH="redhat/el2.1/en/i386" DISTPATH="redhat/el2.1/en/i386"
DISTARCH="i386" DISTARCH="i386"


REPO_APT="yes" REPO_APT="yes"
REPO_YUM="no" REPO_YUM="yes"
REPO_CREATEREPO="yes" REPO_CREATEREPO="yes"


export LD_ASSUME_KERNEL="2.4.1" export LD_ASSUME_KERNEL="2.4.1"
1 change: 1 addition & 0 deletions dists/el3a/config
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ INSTALLCMD="up2date -if"


RPMBUILDOPTS='--define "rhel 3"' RPMBUILDOPTS='--define "rhel 3"'


DISTDESC="Red Hat Enterprise Linux 3 (x86_64)"
DISTNAME="el3" DISTNAME="el3"
DISTNICK="el3a" DISTNICK="el3a"
DISTTAG="1.el3 rhel3" DISTTAG="1.el3 rhel3"
Expand Down
1 change: 1 addition & 0 deletions dists/el3i/config
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ INSTALLCMD="up2date -if"


RPMBUILDOPTS='--define "rhel 3"' RPMBUILDOPTS='--define "rhel 3"'


DISTDESC="Red Hat Enterprise Linux 3 (i386)"
DISTNAME="el3" DISTNAME="el3"
DISTNICK="el3i" DISTNICK="el3i"
DISTTAG="1.el3 rhel3" DISTTAG="1.el3 rhel3"
Expand Down
1 change: 1 addition & 0 deletions dists/el4a/config
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ INSTALLCMD="up2date -if"


RPMBUILDOPTS='--define "rhel 4"' RPMBUILDOPTS='--define "rhel 4"'


DISTDESC="Red Hat Enterprise Linux 4 (x86_64)"
DISTNAME="el4" DISTNAME="el4"
DISTNICK="el4a" DISTNICK="el4a"
DISTTAG="2.el4" DISTTAG="2.el4"
Expand Down
1 change: 1 addition & 0 deletions dists/el4i/config
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ INSTALLCMD="up2date -if"


RPMBUILDOPTS='--define "rhel 4"' RPMBUILDOPTS='--define "rhel 4"'


DISTDESC="Red Hat Enterprise Linux 4 (i386)"
DISTNAME="el4" DISTNAME="el4"
DISTNICK="el4i" DISTNICK="el4i"
DISTTAG="2.el4" DISTTAG="2.el4"
Expand Down
1 change: 1 addition & 0 deletions dists/fc1i/config
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ CLEANCMD="apt-get clean"


RPMBUILDOPTS='--define "fedora 1"' RPMBUILDOPTS='--define "fedora 1"'


DISTDESC="Fedora Core 1 (i386)"
DISTNAME="fc1" DISTNAME="fc1"
DISTNICK="fc1i" DISTNICK="fc1i"
DISTTAG="1.fc1 rhfc1" DISTTAG="1.fc1 rhfc1"
Expand Down
1 change: 1 addition & 0 deletions dists/fc2a/config
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ CLEANCMD="apt-get clean"


RPMBUILDOPTS='--define "fedora 2"' RPMBUILDOPTS='--define "fedora 2"'


DISTDESC="Fedora Core 2 (x86_64)"
DISTNAME="fc2" DISTNAME="fc2"
DISTNICK="fc2a" DISTNICK="fc2a"
DISTTAG="1.fc2" DISTTAG="1.fc2"
Expand Down
1 change: 1 addition & 0 deletions dists/fc2i/config
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ CLEANCMD="apt-get clean"


RPMBUILDOPTS='--define "fedora 2"' RPMBUILDOPTS='--define "fedora 2"'


DISTDESC="Fedora Core 2 (i386)"
DISTNAME="fc2" DISTNAME="fc2"
DISTNICK="fc2i" DISTNICK="fc2i"
DISTTAG="1.fc2" DISTTAG="1.fc2"
Expand Down
1 change: 1 addition & 0 deletions dists/fc3a/config
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ CLEANCMD="apt-get clean"


RPMBUILDOPTS='--define "fedora 3"' RPMBUILDOPTS='--define "fedora 3"'


DISTDESC="Fedora Core 3 (x86_64)"
DISTNAME="fc3" DISTNAME="fc3"
DISTNICK="fc3a" DISTNICK="fc3a"
DISTTAG="1.fc3" DISTTAG="1.fc3"
Expand Down
1 change: 1 addition & 0 deletions dists/fc3i/config
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ CLEANCMD="apt-get clean"


RPMBUILDOPTS='--define "fedora 3"' RPMBUILDOPTS='--define "fedora 3"'


DISTDESC="Fedora Core 3 (i386)"
DISTNAME="fc3" DISTNAME="fc3"
DISTNICK="fc3i" DISTNICK="fc3i"
DISTTAG="1.fc3" DISTTAG="1.fc3"
Expand Down
1 change: 1 addition & 0 deletions dists/fc4i/config
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ CLEANCMD="apt-get clean"


RPMBUILDOPTS='--define "fedora 3"' RPMBUILDOPTS='--define "fedora 3"'


DISTDESC="Fedora Core 4 (i386)"
DISTNAME="fc4" DISTNAME="fc4"
DISTNICK="fc4i" DISTNICK="fc4i"
DISTTAG="2.fc4" DISTTAG="2.fc4"
Expand Down
1 change: 1 addition & 0 deletions dists/rh6i/config
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ CLEANCMD="apt-get clean"


RPMBUILDOPTS='--define "rhl 6"' RPMBUILDOPTS='--define "rhl 6"'


DISTDESC="Red Hat Linux 6.2 (i386)"
DISTNAME="rh6" DISTNAME="rh6"
DISTNICK="rh6i" DISTNICK="rh6i"
DISTTAG="0.rh6 rh62" DISTTAG="0.rh6 rh62"
Expand Down
1 change: 1 addition & 0 deletions dists/rh7i/config
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ CLEANCMD="apt-get clean"


RPMBUILDOPTS='--define "rhl 7"' RPMBUILDOPTS='--define "rhl 7"'


DISTDESC="Red Hat Linux 7.3 (i386)"
DISTNAME="rh7" DISTNAME="rh7"
DISTNICK="rh7i" DISTNICK="rh7i"
DISTTAG="0.rh7 rh73" DISTTAG="0.rh7 rh73"
Expand Down
1 change: 1 addition & 0 deletions dists/rh8i/config
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ CLEANCMD="apt-get clean"


RPMBUILDOPTS='--define "rhl 8"' RPMBUILDOPTS='--define "rhl 8"'


DISTDESC="Red Hat Linux 8.0 (i386)"
DISTNAME="rh8" DISTNAME="rh8"
DISTNICK="rh8i" DISTNICK="rh8i"
DISTTAG="0.rh8 rh80" DISTTAG="0.rh8 rh80"
Expand Down
1 change: 1 addition & 0 deletions dists/rh9i/config
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ CLEANCMD="apt-get clean"


RPMBUILDOPTS='--define "rhl 9"' RPMBUILDOPTS='--define "rhl 9"'


DISTDESC="Red Hat Linux 9 (i386)"
DISTNAME="rh9" DISTNAME="rh9"
DISTNICK="rh9i" DISTNICK="rh9i"
DISTTAG="0.rh9 rh90" DISTTAG="0.rh9 rh90"
Expand Down
2 changes: 1 addition & 1 deletion scripts/pre-new-release.sh
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
script="pre-new-release" script="pre-new-release"
release_regex="\b\.2$" 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." echo "** $script: Not building $app for $disttag/$arch since $release matches new release scheme."
continue 2 continue 2
fi fi
Expand Down

0 comments on commit 4f47e04

Please sign in to comment.