On Fri, Feb 02, 2007 at 10:47:24AM -0500, geoffroy vallee wrote: > Hi all, > > I integrated systemimager-3.7.6 in systemimager-debian. Currently these > modifications allow one to create packages for systemimager-3.7.6 on Debian > Sarge x86 (platform i need to support for OSCAR). One patch is in attachment > beause it is a pretty big patch; if you want me to send the patch into an > email, let me know.
In general, I'd prefer the patch inline, and one patch per-email. > Please note these modifications do not allow the creation of Debian packages > that match the RPMs. However, i did these modifications for > systemimager-3.7.5, it should be simple to do the same thing for > systemimager-3.7.6, i will send the patches when they will be ready. ok > I also plan to do the same thing for Sarge unstable. sarge is currently stable, sid is unstable > Please also note that i do not have yet access to the SVN repository for > systemimager-debian, so if you think these modifications are good, please > can you check them in? > Removed files: > patches/07_remove-old-ia64-patches.patch > patches/06_ia64-linux-config-update.patch > patches/15_getimage-custom-boot-in-var.patch > patches/10_disable-mkbootmedia.patch > patches/11_util-linux-buildfix.patch > patches/13_no_uclibc.patch Why are all of these removed? > Updated files: > device-mapper.1.02.11.tgz > LVM2.2.02.12.tgz > discover1_1.7.18ubuntu1.tar.gz updated > linux-source-2.6.17.tar.bz2 We should be build-depending on linux-source-2.6.18, not providing our own tarball > discover-data_2.2006.10.29.tar.gz > systemimager-3.7.6.tar.bz2 > rsync-2.6.8.tar.gz updated > Added files (available in attachment): > 03_i386-linux-config-update.patch > > Patches: > Index: trunk/debian/control.in > =================================================================== > --- trunk/debian/control.in (revision 1) > +++ trunk/debian/control.in (revision 4) > @@ -3,5 +3,5 @@ > Priority: optional > Maintainer: dann frazier <[EMAIL PROTECTED]> > -Build-Depends: bc, bin86 [i386], bison, bzip2, cramfsprogs (>= 1.1-4), > debhelper (>= 4.0.0), flex, gettext, groff-base, libpopt-dev, libtool, > libreadline5-dev, libssl-dev, module-init-tools, rsync, tofrodos, texinfo, > uuid-dev, zlib1g-dev > +Build-Depends: bc, bin86 [i386], bison, bzip2, cramfsprogs (>= 1.1-4), > debhelper (>= 4.0.0), flex, gettext, groff-base, libpopt-dev, libtool, > libreadline5-dev, libssl-dev, module-init-tools, rsync, texinfo, uuid-dev, > zlib1g-dev It looks like you removed a build-depend? why? This should be a separate patch. > Index: trunk/debian/rules > =================================================================== > --- trunk/debian/rules (revision 1) > +++ trunk/debian/rules (revision 5) > @@ -9,5 +9,5 @@ > #VERSION = $(shell dpkg-parsechangelog | grep ^Version: | \ > # cut -d " " -f 2 | cut -d "-" -f 1) > -VERSION = 3.6.3 > +VERSION = 3.7.6 > BUILD_DIR = $(PKG)-$(VERSION) > UPSTREAM_TARBALL = $(PKG)-$(VERSION).tar.bz2 I went back to extracting VERSION from dpkg-parsechangelog instead > Index: trunk/patches/08_dhclient-dfsg.patch > =================================================================== > --- trunk/patches/08_dhclient-dfsg.patch (revision 1) > +++ trunk/patches/08_dhclient-dfsg.patch (revision 5) > @@ -1,11 +1,11 @@ > ---- systemimager-3.6.3/initrd_source/make.d/dhclient.rul.orig 2005-12-15 > 21:35:34.000000000 -0700 > -+++ systemimager-3.6.3/initrd_source/make.d/dhclient.rul 2006-10-26 > 19:29:27.000000000 -0600 > -@@ -1,7 +1,7 @@ > +--- systemimager-3.7.5/initrd_source/make.d/dhclient.rul.orig 2006-11-29 > 18:24:14.000000000 -0500 > ++++ systemimager-3.7.5/initrd_source/make.d/dhclient.rul 2006-11-29 > 18:24:48.000000000 -0500 > +@@ -3,7 +3,7 @@ > + # vi: set filetype=make: > # > - # $Id: dhclient.rul 3304 2005-12-16 04:35:34Z finley $ > - # > --DHCLIENT_VERSION = 2.0pl5 > -+DHCLIENT_VERSION = 2.0pl5+dfsg0 > - DHCLIENT_TARBALL = dhcp-$(DHCLIENT_VERSION).tar.gz > + > +-DHCLIENT_VERSION = 2.0pl5 > ++DHCLIENT_VERSION = 2.0pl5+dfsg0 > + DHCLIENT_TARBALL = dhcp-$(DHCLIENT_VERSION).tar.gz > # SOURCE_URL -> ftp://ftp.epix.net/pub/isc/dhcp/ > - DHCLIENT_URL = > http://download.systemimager.org/pub/dhcp/$(DHCLIENT_TARBALL) > + DHCLIENT_URL = > http://download.systemimager.org/pub/dhcp/$(DHCLIENT_TARBALL) What's going on in this patch? > Index: trunk/patches/02_use-pruned-kernel.patch > =================================================================== > --- trunk/patches/02_use-pruned-kernel.patch (revision 1) > +++ trunk/patches/02_use-pruned-kernel.patch (revision 5) > @@ -1,11 +1,10 @@ > -diff -urN systemimager-3.6.2.orig/make.d/kernel.rul systemimager-3.6.2 > /make.d/kernel.rul > ---- systemimager-3.6.2.orig/make.d/kernel.rul 2005-12-15 21:35: > 34.000000000 -0700 > -+++ systemimager-3.6.2/make.d/kernel.rul 2006-01-19 > 09:41:30.000000000-0700 > +--- systemimager-3.7.5/make.d/kernel.rul.orig 2006-10-17 14:17: > 24.000000000 -0400 > ++++ systemimager-3.7.5/make.d/kernel.rul 2006-12-07 > 16:58:35.911120160-0500 > @@ -12,17 +12,17 @@ > # > > ifeq ($(ARCH),i386) > -- LINUX_VERSION = 2.6.12.2 > -+ LINUX_VERSION = 2.6.12 > +- LINUX_VERSION = 2.6.18.1 > ++ LINUX_VERSION = 2.6.17 > LINUX_IMAGE = $(LINUX_SRC)/arch/i386/boot/bzImage > LINUX_TARGET = bzImage > @@ -15,6 +14,6 @@ > > ifeq ($(ARCH),ia64) > -- LINUX_VERSION = 2.6.10 > -+ LINUX_VERSION = 2.6.12 > +- LINUX_VERSION = 2.6.16.5 > ++ LINUX_VERSION = 2.6.17 > LINUX_IMAGE = $(LINUX_SRC)/vmlinux.gz > LINUX_TARGET = compressed > @@ -24,5 +23,5 @@ > > ifeq ($(ARCH),parisc) > -@@ -84,7 +84,7 @@ > +@@ -76,7 +76,7 @@ > endif We should use 2.6.18 -- dann frazier ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier. Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ sisuite-devel mailing list sisuite-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/sisuite-devel
