Author: tha-guest
Date: 2006-02-16 23:57:15 +0000 (Thu, 16 Feb 2006)
New Revision: 8
Added:
trunk/scripts/
trunk/scripts/create-kernel-patch.sh
Modified:
trunk/debian/changelog
trunk/debian/linux-patch-xen.kpatches
trunk/debian/rules
Log:
- removed the patch generation from source and instead added the kernel patch
staticly.
- removed some now useless lines in debian/rules & updated
debian/linux-patch-xen.kpatches.
- updated debian/changelog
- added trunk/scripts/create-kernel-patch.sh for easier kernel-patch-generation
(not for release!)
Modified: trunk/debian/changelog
==================================================================---
trunk/debian/changelog 2006-02-16 22:38:27 UTC (rev 7)
+++ trunk/debian/changelog 2006-02-16 23:57:15 UTC (rev 8)
@@ -7,8 +7,13 @@
- Add dpatch structure to the package
* Ralph Passgang <ralph@debianbase.de>
- Added changes from 3.0.1-0tha3
+ - Removed patch generation from kernel source in debian/rules
+ - added the static file debian/linux-2.6.12-xen.patch (which
+ patches a vanilla 2.6.12 to 2.6.12.6-xen, but still with the
+ extraversion stripped off)
+ - Changed debian/linux-patch-xen.kpatches
- -- Ralph Passgang <ralph@debianbase.de> Thu, 16 Feb 2006 23:28:00 +0100
+ -- Ralph Passgang <ralph@debianbase.de> Fri, 17 Feb 2006 00:55:00 +0100
xen (3.0.1-0tha3) unstable; urgency=low
Modified: trunk/debian/linux-patch-xen.kpatches
==================================================================---
trunk/debian/linux-patch-xen.kpatches 2006-02-16 22:38:27 UTC (rev 7)
+++ trunk/debian/linux-patch-xen.kpatches 2006-02-16 23:57:15 UTC (rev 8)
@@ -2,10 +2,10 @@
Patch-id: xen
Path-strip-level: 1
-Patch-file: linux-2.6.12-xen.patch
+Patch-file: debian/linux-2.6.12-xen.patch
Architecture: i386
Kernel-version: 2.6.12
-Patch-file: linux-2.6.12-xen.patch
+Patch-file: debian/linux-2.6.12-xen.patch
Architecture: amd64
Kernel-version: 2.6.12
Modified: trunk/debian/rules
==================================================================---
trunk/debian/rules 2006-02-16 22:38:27 UTC (rev 7)
+++ trunk/debian/rules 2006-02-16 23:57:15 UTC (rev 8)
@@ -5,8 +5,6 @@
LINUX_VERSIONS := 2.6.12
ALLSPARSETREES := $(patsubst %,linux-%,$(LINUX_VERSIONS))
PAE := n
-OLDEXTRAVERSION := $(shell cat patches/linux-$(LINUX_VERSIONS)/*.patch |grep
"+EXTRAVERSION" | sed s/+//)\$$(XENGUEST)
-#ALLSPARSETREES := linux-2.4.29 linux-2.6.10
#DH_VERBOSE := -v
export KERNELS ALLSPARSETREES DH_VERBOSE
@@ -24,10 +22,10 @@
really-clean:
$(MAKE) mrproper
- rm debian/install debian/stamps debian/linux-source
linux-$(LINUX_VERSIONS)-xen linux-${LINUX_VERSIONS}-xen-sparse
linux-${LINUX_VERSIONS}.tar.bz2 linux-$(LINUX_VERSIONS)-xen.patch -rf
+ rm debian/install debian/stamps -rf
dh_clean
-build: patch-stamp debian/stamps/build $(addsuffix
-xen.patch,$(ALLSPARSETREES))
+build: patch-stamp debian/stamps/build
debian/stamps/build:
mkdir -p $(@D)
@@ -53,35 +51,7 @@
debian/install/usr/lib/python2.3/site-packages/xen/xend/sxp.py \
# debian/install/usr/lib/python2.3/site-packages/xen/util/console_client.py
-$(patsubst %,linux-%-xen.patch,$(LINUX_VERSIONS)): linux-%-xen.patch:
debian/linux-source/linux/%.unpatched
-$(patsubst %,debian/linux-source/linux/%.patched,$(LINUX_VERSIONS)):
debian/linux-source/linux/%.patched: debian/linux-source/linux/%.extracted
-
-$(patsubst %,debian/linux-source/linux/%.extracted,$(LINUX_VERSIONS)):
debian/linux-source/linux/%.extracted:
- rm -rf $(@D)
- mkdir -p $(@D)
-# bzcat $< | tar -C $(@D) -x
- touch $@
-
-$(patsubst %,debian/linux-source/linux/%.unpatched,$(LINUX_VERSIONS)):
debian/linux-source/linux/%.unpatched: debian/linux-source/linux/%.extracted
- rm -f pristine-linux-$*
-# cd $(@D)/linux-source-$*; if ! /usr/src/kernel-patches/all/$*/unpatch/debian;
then rm -f $<; exit 1; fi
-# touch $(@D)/linux-source-$*/.valid-pristine
-# mv $(@D)/linux-source-$* pristine-linux-$*
-# touch linux-$*.tar.bz2
- touch $@
-
-
-kernel-patches: $(addsuffix -xen.patch,$(ALLSPARSETREES))
-$(addsuffix -xen.patch,$(ALLSPARSETREES)):
-# wget
ftp://ftp.de.kernel.org/pub/linux/kernel/v2.6/linux-${LINUX_VERSIONS}.tar.bz2
-# ln -s linux-2.6-xen-sparse linux-${LINUX_VERSIONS}-xen-sparse
- $(MAKE) linux-2.6-xen-config CONFIGMODE=oldconfig XEN_TARGET_X86_PAE=$(PAE)
- cp linux-$(LINUX_VERSIONS)-xen/Makefile Makefile.sav
- cat Makefile.sav | sed "s/$(OLDEXTRAVERSION)/EXTRAVERSION =/"
>linux-$(LINUX_VERSIONS)-xen/Makefile
- diff -Nurp pristine-linux-$(LINUX_VERSIONS)/ linux-$(LINUX_VERSIONS)-xen/
>linux-$(LINUX_VERSIONS)-xen.patch ; \
- mv Makefile.sav linux-$(LINUX_VERSIONS)-xen/Makefile
-
-binary: install $(addsuffix -xen.patch,$(ALLSPARSETREES))
+binary: install
@echo "DEB_VERSION=''$(DEB_VERSION)''
DEB_REVISION=''$(DEB_REVISION)''
UP_VERSION=''$(UP_VERSION)''
DEB_BUILD_ARCH=''$(DEB_BUILD_ARCH)''"
dh_clean -k
dh_testdir
Added: trunk/scripts/create-kernel-patch.sh
==================================================================---
trunk/scripts/create-kernel-patch.sh 2006-02-16 22:38:27 UTC (rev 7)
+++ trunk/scripts/create-kernel-patch.sh 2006-02-16 23:57:15 UTC (rev 8)
@@ -0,0 +1,6 @@
+#!/bin/bash
+LINUX_VERSION=2.6.12
+
+make linux-2.6-xen-config CONFIGMODE=oldconfig
+cat linux-$LINUX_VERSION-xen/Makefile | grep -v "EXTRAVERSION =" |
sed ''/SUBLEVEL\ =/a EXTRAVERSION\ ='' >
linux-$LINUX_VERSION-xen/Makefile
+diff -Nurp pristine-linux-$LINUX_VERSION/ linux-$LINUX_VERSION-xen/
>linux-$LINUX_VERSION-xen.patch
Property changes on: trunk/scripts/create-kernel-patch.sh
___________________________________________________________________
Name: svn:executable
+ *