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. 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.
I also plan to do the same thing for Sarge 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 Updated files: device-mapper.1.02.11.tgz LVM2.2.02.12.tgz discover1_1.7.18ubuntu1.tar.gz linux-source-2.6.17.tar.bz2 discover-data_2.2006.10.29.tar.gz systemimager-3.7.6.tar.bz2 rsync-2.6.8.tar.gz 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 Build-Conflicts: libc-pic Build-Depends-Indep: bc, bzip2, debhelper (>= 4.0.0), docbook-to-man, docbook-utils, jadetex, sgmltools-lite Index: trunk/debian/changelog =================================================================== --- trunk/debian/changelog (revision 1) +++ trunk/debian/changelog (revision 3) @@ -1,2 +1,8 @@ +systemimager (3.7.6-0gv1) UNRELEASED; urgency=low + + * New upstream release + + -- Geoffroy Vallee <[EMAIL PROTECTED]> Thu, 18 Jan 2007 10:23:49 -0500 + systemimager (3.7.5-1) UNRELEASED; urgency=low 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 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) 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 @@ -33,86 +32,11 @@ #LINUX_URL = http://www.kernel.org/pub/linux/kernel/v2.4/$(LINUX_TARBALL) LINUX_URL = http://download.systemimager.org/pub/linux/$(LINUX_TARBALL) -diff -urN systemimager-3.6.2.orig/patches/linux.i386.config systemimager-3.6.2/patches/linux.i386.config ---- systemimager-3.6.2.orig/patches/linux.i386.config 2005-11-21 13:57: 29.000000000 -0700 -+++ systemimager-3.6.2/patches/linux.i386.config 2006-01-19 09:40: 11.000000000 -0700 -@@ -1,7 +1,7 @@ - # - # Automatically generated make config: don't edit --# Linux kernel version: 2.6.12-boel_v3.5.4 --# Mon Nov 21 11:38:50 2005 -+# Linux kernel version: 2.6.12-boel_v3.6.2 -+# Thu Jan 19 09:38:28 2006 - # - CONFIG_X86=y - CONFIG_MMU=y -@@ -351,6 +351,7 @@ - # CONFIG_CHR_DEV_OSST is not set - # CONFIG_BLK_DEV_SR is not set - # CONFIG_CHR_DEV_SG is not set -+# CONFIG_CHR_DEV_SCH is not set +@@ -143,7 +143,7 @@ + echo -n Applying `basename $(patch)`... && cat $(patch) | patch -s -p1 && echo done. &&) /bin/true + cp -a $(LINUX_CONFIG) $(LINUX_SRC)/.config + perl -pi -e "s/^EXTRAVERSION =.*/EXTRAVERSION = -boel_v$(VERSION)/" $(LINUX_SRC)/Makefile +- $(MAKE) -C $(LINUX_SRC) oldconfig dep ++ $(MAKE) -C $(LINUX_SRC) oldconfig + touch $(SRC_DIR)/patched_kernel-stamp - # - # Some SCSI devices (e.g. CD jukebox) support multiple LUNs -@@ -395,6 +396,7 @@ - CONFIG_MEGARAID_NEWGEN=y - CONFIG_MEGARAID_MM=m - CONFIG_MEGARAID_MAILBOX=m -+# CONFIG_MEGARAID_LEGACY is not set - CONFIG_SCSI_SATA=y - CONFIG_SCSI_SATA_AHCI=m - CONFIG_SCSI_SATA_SVW=m -@@ -440,12 +442,6 @@ - # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set - CONFIG_SCSI_QLOGIC_1280=m - # CONFIG_SCSI_QLOGIC_1280_1040 is not set --CONFIG_SCSI_QLA2XXX=m --CONFIG_SCSI_QLA21XX=m --CONFIG_SCSI_QLA22XX=m --CONFIG_SCSI_QLA2300=m --CONFIG_SCSI_QLA2322=m --CONFIG_SCSI_QLA6312=m - CONFIG_SCSI_LPFC=m - CONFIG_SCSI_SYM53C416=m - CONFIG_SCSI_DC395x=m -@@ -630,7 +626,6 @@ - CONFIG_B44=y - CONFIG_FORCEDETH=y - # CONFIG_CS89x0 is not set --CONFIG_DGRS=y - CONFIG_EEPRO100=y - CONFIG_E100=y - CONFIG_FEALNX=y -@@ -654,8 +649,6 @@ - # - # Ethernet (1000 Mbit) - # --CONFIG_ACENIC=y --# CONFIG_ACENIC_OMIT_TIGON_I is not set - CONFIG_DL2K=y - CONFIG_E1000=y - CONFIG_E1000_NAPI=y -@@ -1006,7 +999,6 @@ - # - # USB Multimedia devices - # --# CONFIG_USB_DABUSB is not set - - # - # Video4Linux support is needed for USB Multimedia device support -@@ -1034,8 +1026,6 @@ - # - # USB Miscellaneous drivers - # --# CONFIG_USB_EMI62 is not set --# CONFIG_USB_EMI26 is not set - # CONFIG_USB_AUERSWALD is not set - # CONFIG_USB_RIO500 is not set - # CONFIG_USB_LEGOTOWER is not set -@@ -1152,6 +1142,7 @@ - # - # CONFIG_ADFS_FS is not set - # CONFIG_AFFS_FS is not set -+# CONFIG_ASFS_FS is not set - # CONFIG_HFS_FS is not set - # CONFIG_HFSPLUS_FS is not set - # CONFIG_BEFS_FS is not set + PHONY += get_kernel_source
03_i386-linux-config-update.patch
Description: Binary data
------------------------------------------------------------------------- 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
