Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

See ChangeLog

  • Loading branch information...
commit 9a3158a84d8dd1385b0643ffc0c784bcb2db04f3 1 parent 2b80944
Dag Wieers authored
2  ChangeLog
View
@@ -16,6 +16,8 @@ Version 0.6.1 # Probably the last version using bash
- dar-build: Use rpmdb -E if possible for resolving macros (thanks to Jeff Pitman)
- dar-build: Check for existance of distribution build environment
- dar-functions: Use lftpget instead of wget
+- dar-build: Added support for nodist packages
+- dar-functions: Fixed a small bug in rpmconf()
Version 0.6.0
- dar.conf: Removed DISTSMAP, added it to dists specific section
9 dar-build
View
@@ -95,6 +95,13 @@ for app in $PKGS; do
continue
fi
+ if [ "$NODIST" ]; then
+ DISTTAG="0"
+ DISTNAME="nodist"
+# ARCHS="noarch"
+ fi
+
+
if [ ! -d "$CHROOTDIR/$DISTNICK" ]; then
warning "Distribution $DISTNICK has no build environment ($CHROOTDIR/$DISTNICK). Aborting."
continue
@@ -125,7 +132,7 @@ for app in $PKGS; do
set_archs
- ### Check if etc/rpm/macros exists with proper content
+ ### TODO: Check if etc/rpm/macros exists with proper content
for arch in $ARCHS; do
VERSION="$(rpmconf Version)"
19 dar-functions
View
@@ -69,8 +69,12 @@ function rpmconf {
return 1
fi
+ if [ "$DISTNICK" ]; then
+ local RPMVER="$(chroot $CHROOTDIR/$DISTNICK rpm --version | cut -d' ' -f3)"
+ fi
+
(
- if [ -z "$DISTNICK" ] || [ "$RPMVER" \< "4.1" ] || ! chroot "$CHROOTDIR/$DISTNICK" /bin/su - -m $BUILD_USER -c "rpmdb -D \"dist $DISTNICK\" -D \"$DISTNICK 1\" -D \"$DISTNAME 1\" -E \"%{expand:%(head -n64 $SPECFILE)}\"" | grep -i "^ *$CONFIG *:" | sed -e "s/^ *$CONFIG *: *//i" | head -1; then
+ if [ -z "$DISTNICK" ] || [ "$RPMVER" \< "4.1" ] || ! chroot "$CHROOTDIR/$DISTNICK" /bin/su - -m $BUILD_USER -c "rpmdb -D \"dist $DISTNAME\" -D \"$DISTNICK 1\" -D \"$DISTNAME 1\" -E \"%{expand:%(head -n128 $SPECFILE)}\"" | grep -i "^ *$CONFIG *:" | sed -e "s/^ *$CONFIG *: *//i" | head -1; then
if ! grep -i "^ *$CONFIG *:" $SPECFILE | sed -e "s/^ *$CONFIG *: *//i" | head -1; then
debug "Config $CONFIG not found in $SPECFILE"
fi
@@ -158,11 +162,16 @@ function set_archs {
}
function set_dists {
+ unset NODIST
if [ "$FORCE_DISTS" ]; then
DISTS="${FORCE_DISTS//[,:;]/ }"
else
DISTS="$(metaconf Dists)"
fi
+ if [ "$(metaconf Dist)" == "nodist" ]; then
+ NODIST="nodist"
+ DISTS="$(echo "$DISTS" | cut -f1)"
+ fi
if [ -z "$DISTS" ]; then DISTS="$DEFAULT_DISTS"; fi
}
@@ -325,11 +334,11 @@ function build_repo_apt {
case "$DISTARCH" in
i386)
echo $PACKAGEDIR/*/*.$REPO.$tag.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null # Backward compatibility
- echo $PACKAGEDIR/*/*.$tag.$REPO.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null
+ echo $PACKAGEDIR/*/*.{$tag,0}.$REPO.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null
;;
x86_64)
echo $PACKAGEDIR/*/*.$REPO.$tag.{noarch,x86_64}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null # Backward compatibility
- echo $PACKAGEDIR/*/*.$tag.$REPO.{noarch,x86_64}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null
+ echo $PACKAGEDIR/*/*.{$tag,0}.$REPO.{noarch,x86_64}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null
;;
esac
done
@@ -358,11 +367,11 @@ function build_repo_yum {
case "$DISTARCH" in
i386)
echo $PACKAGEDIR/*/*.$REPO.$tag.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null # Backward compatibility
- echo $PACKAGEDIR/*/*.$tag.$REPO.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null
+ echo $PACKAGEDIR/*/*.{$tag,0}.$REPO.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null
;;
x86_64)
echo $PACKAGEDIR/*/*.$REPO.$tag.{noarch,x86_64}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null # Backward compatibility
- echo $PACKAGEDIR/*/*.$tag.$REPO.{noarch,x86_64}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null
+ echo $PACKAGEDIR/*/*.{$tag,0}.$REPO.{noarch,x86_64}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null
;;
esac
done
17 dists/el3a/config
View
@@ -0,0 +1,17 @@
+### RED HAT ENTERPRISE LINUX 3
+
+### Distcc compilers
+DISTCC_CC="x86_64-redhat-linux-gcc-3.2.3"
+DISTCC_CXX="x86_64-redhat-linux-g++-3.2.3"
+
+UPDATECMD="up2date -u"
+#UPDATECMD="apt-get -qq update"
+#UPGRADECMD="apt-get -qq -f -y upgrade"
+#INSTALLCMD="up2date -i %p"
+INSTALLCMD="apt-get -qq -y -m install %p"
+
+DISTNAME="el3"
+DISTNICK="el3a"
+DISTTAG="1.el3 rhel3"
+DISTPATH="redhat/el3/en/x86_64"
+DISTARCH="x86_64"
55 dists/el3a/rhel3-base.txt
View
@@ -0,0 +1,55 @@
+basesystem-8.0-2
+bash-2.05b-29
+beecrypt-3.0.1-0.20030630
+bzip2-1.0.2-11
+bzip2-libs-1.0.2-11
+chkconfig-1.3.8-3
+coreutils-4.5.3-26
+cracklib-2.7-22
+cracklib-dicts-2.7-22
+db4-4.1.25-8
+dev-3.3.8-1
+e2fsprogs-1.32-15
+elfutils-0.89-1
+elfutils-libelf-0.89-1
+ethtool-1.8-2
+filesystem-2.2.1-3
+findutils-4.1.7-9
+gawk-3.1.1-9
+glib-1.2.10-11.1
+glibc-2.3.2-95.3
+glibc-common-2.3.2-95.3
+gpm-1.19.3-27.2
+grep-2.5.1-16
+info-4.5-3
+initscripts-7.31.6.EL-1
+iproute-2.4.7-10
+iputils-20020927-11
+less-378-11
+libacl-2.2.3-1
+libattr-2.2.0-1
+libgcc-3.2.3-20
+libtermcap-2.0.8-35
+mingetty-1.06-1
+mktemp-1.5-18
+modutils-2.4.25-9.EL
+mount-2.11y-31.1
+ncurses-5.3-9.3
+net-tools-1.60-20
+pam-0.75-51
+pcre-3.9-10
+popt-1.8.1-4.2
+procps-2.0.13-9.2E
+psmisc-21.3-1.RHEL.0
+rpm-4.2.1-4.2
+sed-4.0.7-3
+setup-2.5.27-1
+shadow-utils-4.0.3-7
+sysklogd-1.4.1-12
+SysVinit-2.85-4
+termcap-11.0.1-17.1
+tzdata-2003c-1
+util-linux-2.11y-31.1
+which-2.14-7
+words-2-21
+zlib-1.1.4-8.1
Please sign in to comment.
Something went wrong with that request. Please try again.