Permalink
Browse files

Updates

  • Loading branch information...
1 parent cca04df commit 606289d83306b7d29182418207b88062b9f53a07 @dagwieers committed Apr 29, 2007
Showing with 506 additions and 36 deletions.
  1. +3 −3 commands.txt
  2. +27 −27 dar-kickoff
  3. +154 −0 dar-perl.py
  4. +1 −1 dar-update
  5. +2 −2 dar.conf
  6. +28 −0 dists/el5a/config
  7. +130 −0 dists/el5a/el5a-base.txt
  8. +28 −0 dists/el5i/config
  9. +130 −0 dists/el5i/el5i-base.txt
  10. +1 −1 python/create-pkgdb.py
  11. +2 −2 python/print-info.py
View
@@ -2,13 +2,13 @@
### """"""""
### Install build environment
-old=fc3-i386; new=el4-i386; chr=el4i; diff -u <(cut -d"$(echo -e '\t')" -f1 /dar/pub/rpmforge/persona/dag/state/rpmqa-$old.list) <(cut -d"$(echo -e '\t')" -f1 /dar/pub/rpmforge/persona/dag/state/rpmqa-$new.list) | grep "^-" | sed -e 's|^-||' | xargs dar-update
+old=fc3-i386; new=el4-i386; chr=el4i; diff -u <(cut -f1 /dar/pub/rpmforge/persona/dag/state/rpmqa-$old.list) <(cut -f1 /dar/pub/rpmforge/persona/dag/state/rpmqa-$new.list) | grep "^-" | sed -e 's|^-||' | xargs dar-update -d $chr
### Build missing packages compared to other dist
-old=fc3-i386; new=el4-i386; chr=el4i; diff -u <(cut -d"$(echo -e '\t')" -f1 /dar/pub/rpmforge/persona/dag/state/packages-$old.list) <(cut -d"$(echo -e '\t')" -f1 /dar/pub/rpmforge/persona/dag/state/packages-$new.list) | grep "^-" | sed -e 's|^-||' | xargs dar-build -n -d $chr
+old=fc3-i386; new=el4-i386; chr=el4i; diff -u <(cut -f1 /dar/pub/rpmforge/persona/dag/state/packages-$old.list) <(cut -f1 /dar/pub/rpmforge/persona/dag/state/packages-$new.list) | grep "^-" | sed -e 's|^-||' | xargs dar-build -n -d $chr
### Build library packages first
-old=fc3; chr=fc4i; for pkg in $(echo /dar/packages/*/*-devel-*.$old.rf.i386.rpm); do pkg="$(basename $pkg)"; echo ${pkg%-*-*-*}; done | xargs dar-build -n -d $chr
+old=fc3; chr=fc4i; for pkg in $(echo /dar/packages/*/*-devel-*.$old.rf.i386.rpm); do pkg="$(basename $pkg)"; echo ${pkg%-*-*-*}; done | sort | uniq | xargs dar-build -n -d $chr
### Clean up chroots
#dar-exec
View
@@ -15,33 +15,6 @@ fi
mkdir -p "$ROOT/logs" "$ROOT/home-made" "$ROOT/$DIST"
rpm --initdb --root "$ROOT/$DIST"
-: -<<EOF
-adduser dag
-
-chown dag.dag -R /usr/src/redhat/BUILD /dar/packages/ /dar/logs/
-
-rpm --root -ihvU %
-Install
- util-linux (start)
-
- basesystem-7.0-2.noarch.rpm
- bash-2.05a-13.i386.rpm
- filesystem-2.1.6-2.noarch.rpm
- glibc-2.2.5-42.i686.rpm
- glibc-common-2.2.5-42.i386.rpm
- libtermcap-2.0.8-28.i386.rpm
- mktemp-1.5-14.i386.rpm
- termcap-11.0.1-10.noarch.rpm
-EOF
-
-: -<<EOF #$ROOT$DIST/etc/apt/sources.list
-### Dag Apt Repository for Red Hat 8.0
-rpm file:///dar/apt redhat/8.0/en/i386 dag
-
-### Red Hat Linux 8.0
-rpm http://apt.ccl.kuleuven.ac.be redhat/8.0/en/i386 os updates
-EOF
-
### Disable symbols in builds (for rh90) -g
# perl -pi.orig -e 's|-O2 -g|-O2|' /dar/chroot/*/usr/lib/rpm/{*/macros,macros,rpmrc}
@@ -74,6 +47,33 @@ ln -sf ../proc/self/fd $ROOT/$DIST/dev/fd
mkdir $ROOT/$DIST/dev/shm/
chmod 1777 $ROOT/$DIST/dev/shm/
+: -<<EOF
+adduser dag
+
+chown dag.dag -R /usr/src/redhat/BUILD /dar/packages/ /dar/logs/
+
+rpm --root -ihvU %
+Install
+ util-linux (start)
+
+ basesystem-7.0-2.noarch.rpm
+ bash-2.05a-13.i386.rpm
+ filesystem-2.1.6-2.noarch.rpm
+ glibc-2.2.5-42.i686.rpm
+ glibc-common-2.2.5-42.i386.rpm
+ libtermcap-2.0.8-28.i386.rpm
+ mktemp-1.5-14.i386.rpm
+ termcap-11.0.1-10.noarch.rpm
+EOF
+
+: -<<EOF #$ROOT$DIST/etc/apt/sources.list
+### Dag Apt Repository for Red Hat 8.0
+rpm file:///dar/apt redhat/8.0/en/i386 dag
+
+### Red Hat Linux 8.0
+rpm http://apt.ccl.kuleuven.ac.be redhat/8.0/en/i386 os updates
+EOF
+
#chroot $ROOT/$DIST /bin/nice /usr/bin/apt install
exit 0
View
@@ -0,0 +1,154 @@
+#!/usr/bin/python
+
+import sys, os, time
+
+args = sys.argv[1:]
+logname = os.getlogin()
+noarch = False
+
+try:
+ import getopt
+ opts, args = getopt.getopt (args, 'hnv',
+ ['help', 'noarch', 'version'])
+except getopt.error, exc:
+ print 'dar-perl: %s, try dstat -h for a list of all the options' % str(exc)
+ sys.exit(1)
+
+for opt, arg in opts:
+ if opt in ['-h', '--help']:
+ pass
+ elif opt in ['-v', '--version']:
+ pass
+ elif opt in ['-n', '--noarch']:
+ noarch = True
+
+if args:
+ module = args[0]
+else:
+ module = 'RPMforge-Template'
+
+modparts = module.split('-')
+
+#os.mkdir("/dar/rpms/%s" % module, "0755")
+
+print '# $Id$'
+print '# Authority:', logname
+
+### FIXME: Get Author from CPAN
+print '# Upstream:'
+print
+print '%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)'
+print '%define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)'
+print
+print '%define real_name ', module
+print
+
+### FIXME: Get Summary from CPAN
+print 'Summary: '
+print "Name: perl-%s" % module
+print 'Version: '
+print 'Release: 1'
+
+### FIXME: Get License from CPAN
+print 'License: Artistic'
+print 'Group: Applications/CPAN'
+print "URL: http://search.cpan.org/dist/%s/" % module
+print
+print "Source: http://www.cpan.org/modules/by-module/%s/%s-%%{version}.tar.gz" % (modparts[0], module)
+print 'BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root'
+print
+if noarch:
+ print "BuildArch: noarch"
+print "BuildRequires: perl"
+print "Requires: perl"
+print
+
+### FIXME: Get Description from CPAN
+print "%description"
+print "%s" % module
+print
+print "%prep"
+print "%setup -n %{real_name}-%{version}"
+print
+print "%build"
+if noarch:
+ print '%{__perl} Makefile.PL PREFIX="%{buildroot}%{_prefix}" \ INSTALLDIRS="vendor"'
+ print '%{__make} %{?_smp_mflags}'
+else:
+ print 'CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"'
+ print '%{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"'
+print
+print '%install'
+print '%{__rm} -rf %{buildroot}'
+print '%makeinstall'
+print
+print '### Clean up buildroot'
+if noarch:
+ print '%{__rm} -rf %{buildroot}%{perl_archlib} %{buildroot}%{perl_vendorarch}'
+else:
+ print '%{__rm} -rf %{buildroot}%{perl_archlib} %{buildroot}%{perl_vendorarch}/auto/*{,/*{,/*}}/.packlist'
+print
+print '%clean'
+print '%{__rm} -rf %{buildroot}'
+print
+
+### FIXME: Create filelist based on test-build or source-tree ?
+print '%files'
+print '%defattr(-, root, root, 0755)'
+print '%doc Changes MANIFEST README TODO'
+print '%doc %{_mandir}/man3/*.3pm*'
+#print '%{_bindir}/dave'
+
+if noarch:
+ ### Print directory entries (if any)
+ if modparts[:-1]:
+ str = '%dir %{perl_vendorlib}/'
+ for nr, part in enumerate(modparts[:-1]):
+ str = str + "%s/" % modparts[nr]
+ print str
+
+ ### Print module directory
+ str = '%{perl_vendorlib}/'
+ for nr, part in enumerate(modparts):
+ str = str + "%s/" % modparts[nr]
+ print str
+
+ ### Print module
+ if modparts[:-1]:
+ str = '%{perl_vendorlib}/'
+ for nr, part in enumerate(modparts[:-1]):
+ str = str + "%s/" % modparts[nr]
+ print str + "%s.pm" % modparts[-1]
+else:
+ ### Print directory entries (if any)
+ if modparts[:-1]:
+ str = '%dir %{perl_vendorarch}/'
+ for nr, part in enumerate(modparts[:-1]):
+ str = str + "%s/" % modparts[nr]
+ print str
+
+ ### Print module directory
+ str = '%{perl_vendorarch}/'
+ for nr, part in enumerate(modparts):
+ str = str + "%s/" % modparts[nr]
+ print str
+
+ ### Print auto directory entries (if any)
+ if modparts[:-1]:
+ str = '%dir %{perl_vendorarch}/auto/'
+ for nr, part in enumerate(modparts[:-1]):
+ str = str + "%s/" % modparts[nr]
+ print str
+
+ ### Print auto module directory
+ str = '%{perl_vendorarch}/auto/'
+ for nr, part in enumerate(modparts):
+ str = str + "%s/" % modparts[nr]
+ print str
+
+print
+print '%changelog'
+print '%s Dag Wieers <dag@wieers.com> -' % time.strftime('%a %b %d %Y', time.localtime())
+print '- Initial package. (using DAR)'
+
+sys.exit(0)
View
@@ -27,7 +27,7 @@ for distname in $DISTS; do
# build_repo_yum "$DISTTAG" "$DISTPATH"
fi
- if [ -z "$PKGS" -a "$UPDATECMD" ]; then
+ if [ "$UPDATECMD" ]; then
chroot $CHROOTDIR/$distname $UPDATECMD
fi
View
@@ -11,8 +11,8 @@ BUILDDIR="$ROOT/build"
TEMPDIR="$ROOT/tmp"
#DEFAULT_DISTS="el4a el4i fc3a fc3i fc2a fc2i fc1i el3a el3i rh9i rh7i el2i"
-DEFAULT_DISTS="el4a el4i el3a el3i rh9i rh7i el2i"
-DEFAULT_SOURCE_DISTS="el4i"
+DEFAULT_DISTS="el5a el5i el4a el4i el3a el3i rh9i rh7i el2i"
+DEFAULT_SOURCE_DISTS="el5i"
DEFAULT_ARCHS="i386"
DEFAULT_TAGS="rf dag"
REPO="dag"
View
@@ -0,0 +1,28 @@
+### RED HAT ENTERPRISE LINUX 5
+
+### Distcc compilers
+DISTCC_CC="x86_64-redhat-linux-gcc-3.4.3"
+DISTCC_CXX="x86_64-redhat-linux-g++-3.4.3"
+
+UPDATECMD="apt-get -qq update"
+UPGRADECMD="apt-get -qq -f -y upgrade"
+INSTALLCMD="apt-get -qq -y -m install %p"
+CLEANCMD="apt-get clean"
+
+#UPDATECMD="up2date -u"
+#INSTALLCMD="up2date -if"
+
+RPMBUILDOPTS='--define "rhel 5"'
+
+DISTDESC="Red Hat Enterprise Linux 5 (x86_64)"
+DISTNAME="el5"
+DISTNICK="el5a"
+DISTTAG="2.el5"
+DISTPATH="redhat/el5/en/x86_64"
+DISTARCH="x86_64"
+
+REPO_APT="yes"
+REPO_YUM="yes"
+REPO_CREATEREPO="yes"
+
+export -n LD_ASSUME_KERNEL
Oops, something went wrong.

0 comments on commit 606289d

Please sign in to comment.