Author: ultrotter
Date: 2006-02-20 08:57:03 +0000 (Mon, 20 Feb 2006)
New Revision: 27
Removed:
trunk/debian/patches/30xenchangeset.dpatch
Modified:
trunk/debian/patches/00list
trunk/debian/rules
Log:
Remove my useless changeset patch
Modified: trunk/debian/patches/00list
==================================================================---
trunk/debian/patches/00list 2006-02-19 18:38:10 UTC (rev 26)
+++ trunk/debian/patches/00list 2006-02-20 08:57:03 UTC (rev 27)
@@ -1,3 +1,2 @@
10sysconfig
20lib64
-30xenchangeset
Deleted: trunk/debian/patches/30xenchangeset.dpatch
==================================================================---
trunk/debian/patches/30xenchangeset.dpatch 2006-02-19 18:38:10 UTC (rev 26)
+++ trunk/debian/patches/30xenchangeset.dpatch 2006-02-20 08:57:03 UTC (rev 27)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30xenchangeset.dpatch by Guido Trotter <ultrotter@debian.org>
-##
-## All lines beginning with `## DP:'' are a description of the patch.
-## DP: Make the changeset configurable, defaulting to the old value
-
-@DPATCH@
-diff -urNad xen-3.0.1+hg8743/xen/Makefile
/tmp/dpep.Ek3jgb/xen-3.0.1+hg8743/xen/Makefile
---- xen-3.0.1+hg8743/xen/Makefile 2006-02-18 19:57:57.971524368 +0100
-+++ /tmp/dpep.Ek3jgb/xen-3.0.1+hg8743/xen/Makefile 2006-02-19
19:20:15.000000000 +0100
-@@ -8,6 +8,7 @@
- export XEN_SUBVERSION = 0
- export XEN_EXTRAVERSION = .1
- export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-+export XEN_CHANGESET ?= $(shell ((hg parents || head -n 7 ../ChangeLog || echo
date: unavailable) | awk ''{FS="changeset:[
]+"}/^changeset/{CS=$$2};{FS="date:[ ]+"}/^date/{D=$$2}; END
{print D, CS}'') 2>/dev/null)
-
- export BASEDIR := $(CURDIR)
-
-@@ -96,7 +97,7 @@
- -e ''s/@@version@@/$(XEN_VERSION)/g'' \
- -e ''s/@@subversion@@/$(XEN_SUBVERSION)/g'' \
- -e ''s/@@extraversion@@/$(XEN_EXTRAVERSION)/g'' \
-- -e ''s!@@changeset@@!$(shell ((hg parents || head -n 7
../ChangeLog || echo date: unavailable) | awk ''{FS="changeset:[
]+"}/^changeset/{CS=$$2};{FS="date:[ ]+"}/^date/{D=$$2}; END
{print D, CS}'') 2>/dev/null)!g'' \
-+ -e ''s/@@changeset@@/$(XEN_CHANGESET)/g'' \
- < include/xen/compile.h.in > $@.new
- @cat include/xen/banner.h >> $@.new
- @mv -f $@.new $@
Modified: trunk/debian/rules
==================================================================---
trunk/debian/rules 2006-02-19 18:38:10 UTC (rev 26)
+++ trunk/debian/rules 2006-02-20 08:57:03 UTC (rev 27)
@@ -15,8 +15,6 @@
UP_VERSION := $(shell echo "$(DEB_VERSION)" | sed
''s/-[^-]*$$//'')
DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-XEN_CHANGESET := "Thu Feb 2 12:28:53 2006 +0100 8743:2804be3661ba"
-
include /usr/share/dpatch/dpatch.make
clean: really-clean unpatch
@@ -36,10 +34,10 @@
install: debian/stamps/build
rm -rf debian/install
- $(MAKE) dist DESTDIR=$(CURDIR)/debian/install KERNELS=
XEN_PYTHON_NATIVE_INSTALL=1 CC=$(CC) GCC=$(CC) HOSTCC=$(CC)
XEN_CHANGESET=$(XEN_CHANGESET)
+ $(MAKE) dist DESTDIR=$(CURDIR)/debian/install KERNELS=
XEN_PYTHON_NATIVE_INSTALL=1 CC=$(CC) GCC=$(CC) HOSTCC=$(CC)
ifeq ($(DEB_BUILD_ARCH),i386)
$(MAKE) mrproper
- $(MAKE) xen DESTDIR=$(CURDIR)/debian/install KERNELS= GCC=$(CC) CC=$(CC)
HOSTCC=$(CC) XEN_TARGET_X86_PAE=y TARGET=$(CURDIR)/xen/xen_pae
XEN_CHANGESET=$(XEN_CHANGESET)
+ $(MAKE) xen DESTDIR=$(CURDIR)/debian/install KERNELS= GCC=$(CC) CC=$(CC)
HOSTCC=$(CC) XEN_TARGET_X86_PAE=y TARGET=$(CURDIR)/xen/xen_pae
endif
$(MAKE) -C tools/examples install-udev DESTDIR=$(CURDIR)/debian/install
find $(CURDIR)/debian/install -name ''*.pyc'' | xargs rm