[SM-Commit] GIT changes to master grimoire by Pieter Lenaerts (2a49cd3aa084b751d56eb0b3a34e2bcd4b8ec5a8)

Pieter Lenaerts scm at mail.sourcemage.org
Thu Nov 9 11:41:47 EST 2006


GIT changes to master grimoire by Pieter Lenaerts <e-type at sourcemage.org>:

 kernels/xen-kernel/CONFIGURE               |    3 +--
 kernels/xen-kernel/DETAILS                 |   16 ++++++++++------
 kernels/xen-kernel/HISTORY                 |    7 +++++++
 kernels/xen-kernel/PRE_BUILD               |   22 +++++++++++-----------
 kernels/xen-kernel/patch.makefile          |   19 ++++++++++---------
 kernels/xen-kernel/patch.mklinux           |   20 ++++++++++----------
 kernels/xen-kernel/xen-3.0.3_0-src.tgz.sig |binary
 utils/xen/DETAILS                          |   16 +++++++++++-----
 utils/xen/HISTORY                          |    4 ++++
 utils/xen/PRE_BUILD                        |    3 +++
 utils/xen/xen-3.0.3_0-src.tgz.sig          |binary
 11 files changed, 67 insertions(+), 43 deletions(-)

New commits:
commit 2a49cd3aa084b751d56eb0b3a34e2bcd4b8ec5a8
Author: Pieter Lenaerts <e-type at sourcemage.org>
Commit: Pieter Lenaerts <e-type at sourcemage.org>

    xen: updated to 3.0.3_0

commit 385d0ec9fb1f999490eeabfd42765435ddb1203e
Author: Pieter Lenaerts <e-type at sourcemage.org>
Commit: Pieter Lenaerts <e-type at sourcemage.org>

    xen-kernel: updated and pimped a little to avoid unnecessary downloading of linux src

diff --git a/kernels/xen-kernel/CONFIGURE b/kernels/xen-kernel/CONFIGURE
index 9417dd0..f367f81 100755
--- a/kernels/xen-kernel/CONFIGURE
+++ b/kernels/xen-kernel/CONFIGURE
@@ -1,2 +1 @@
-config_query  XEN0  "Run kernel config for supervisor kernel"  n  &&
-config_query  XENU  "Run kernel config for user kernel"        n
+config_query XEN_CONFIG "Run kernel config?" n
diff --git a/kernels/xen-kernel/DETAILS b/kernels/xen-kernel/DETAILS
index 0ad50eb..8d55c4b 100755
--- a/kernels/xen-kernel/DETAILS
+++ b/kernels/xen-kernel/DETAILS
@@ -1,11 +1,15 @@
            SPELL=xen-kernel
-         VERSION=3.0.0
+         VERSION=3.0.3_0
+        XEN_KVER=2.6.16.29
           SOURCE=xen-${VERSION}-src.tgz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/xen-${VERSION}
-   SOURCE_URL[0]=http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/${SOURCE}
-   SOURCE_URL[1]=${SOURCEFORGE_URL}/xen/${SOURCE}
-        XEN_KVER=2.6.12
-	SOURCE_HASH=sha512:d57d48382304241b989d138aae7d3745c530d062b7e7dca4956a40cf948e8f5a2b3c3c79bba0c74460b28b33906dd0d94e252c4caa88b1aef383281c8d10b880
+         SOURCE2=linux-${XEN_KVER}.tar.bz2
+         SOURCE3=${SOURCE2}.sign
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/xen-${VERSION}-src
+   SOURCE_URL[0]=http://bits.xensource.com/oss-xen/release/3.0.3-0/src.tgz/${SOURCE}
+     SOURCE2_URL=http://www.kernel.org/pub/linux/kernel/v2.6/${SOURCE2}
+     SOURCE3_URL=${SOURCE2_URL}.sign
+      SOURCE_GPG=gurus.gpg:${SOURCE}.sig
+     SOURCE2_GPG=kernel.gpg:${SOURCE2}.sig
         WEB_SITE=http://xen.sourceforge.net/
          ENTERED=20041110
          UPDATED=20041206
diff --git a/kernels/xen-kernel/HISTORY b/kernels/xen-kernel/HISTORY
index f803de0..98c9031 100644
--- a/kernels/xen-kernel/HISTORY
+++ b/kernels/xen-kernel/HISTORY
@@ -1,3 +1,10 @@
+2006-11-09 Pieter Lenaerts <e-type at sourcemage.org>
+	* DETAILS: updated to 3.0.3_0, added linux source to avoid downloading
+	* CONFIGURE: there's only one menuconfig now
+	* PRE_BUILD: added sed line to find linux source in $SOURCE_CACHEs,
+	  removed unused tests and function
+	* updated path.Makefile and patch.mklinux 
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/kernels/xen-kernel/PRE_BUILD b/kernels/xen-kernel/PRE_BUILD
index 82b7244..60564d4 100755
--- a/kernels/xen-kernel/PRE_BUILD
+++ b/kernels/xen-kernel/PRE_BUILD
@@ -1,16 +1,9 @@
-function  make_menuconfig()  {
-  if  [  -r  $CONFIG_CACHE/kconfig-${XEN_KVER}-$1  ];  then
-    cp  $CONFIG_CACHE/kconfig-${XEN_KVER}-$1  linux-${XEN_KVER}-$1/.config
-  fi  &&
-  make  -C  linux-${XEN_KVER}-$1/  menuconfig  ARCH=xen  &&
-  cp  linux-${XEN_KVER}-$1/.config  $CONFIG_CACHE/kconfig-${XEN_KVER}-$1 
-}
-
-
 default_pre_build                                 &&
 cd  $SOURCE_DIRECTORY                             &&
 patch  -p0  <  $SCRIPT_DIRECTORY/patch.makefile   &&
 patch  -p0  <  $SCRIPT_DIRECTORY/patch.mklinux    &&
+sedit "s_LINUX\_SRC\_PATH\t?=\ \.:\.\._LINUX\_SRC\_PATH\t?=\ ${SOURCE_CACHE}_g"\
+    ${SOURCE_DIRECTORY}/buildconfigs/Rules.mk
  
 if  [  -r  $SOURCE_CACHE/linux-${XEN_KVER}.tar.bz2  ];  then
   cp  $SOURCE_CACHE/linux-${XEN_KVER}.tar.bz2  .
@@ -18,5 +11,12 @@ fi  &&
 
 make  patchkrn  &&
   
-if  [  $XEN0  =  "y"  ];  then  make_menuconfig  xen0;  fi  &&
-if  [  $XENU  =  "y"  ];  then  make_menuconfig  xenU;  fi
+if [[ "${XEN_CONFIG}" == "y" ]] ; then
+
+  if  [  -r  $CONFIG_CACHE/kconfig-${XEN_KVER}-xen ];  then
+    cp  $CONFIG_CACHE/kconfig-${XEN_KVER}-xen linux-${XEN_KVER}-xen/.config
+  fi  &&
+  make linux-2.6-xen-config CONFIGMODE=menuconfig &&
+  cp  linux-${XEN_KVER}-xen/.config  $CONFIG_CACHE/kconfig-${XEN_KVER}-xen
+
+fi
diff --git a/kernels/xen-kernel/patch.makefile b/kernels/xen-kernel/patch.makefile
index 05ff5d7..84564ca 100644
--- a/kernels/xen-kernel/patch.makefile
+++ b/kernels/xen-kernel/patch.makefile
@@ -1,30 +1,31 @@
---- Makefile.org	2005-12-26 11:32:13.000000000 +0100
-+++ Makefile	2005-12-26 11:33:45.000000000 +0100
-@@ -43,7 +43,7 @@ test:
- 
+--- Makefile.orig	2006-11-09 09:59:55.000000000 +0100
++++ Makefile	2006-11-09 10:13:03.000000000 +0100
+@@ -45,7 +45,7 @@ test:
  # build and install everything into local dist directory
+ .PHONY: dist
  dist: DESTDIR=$(DISTDIR)/install
 -dist: dist-xen dist-kernels dist-tools dist-docs
 +dist: dist-xen dist-kbuild dist-tools dist-docs
  	$(INSTALL_DIR) $(DISTDIR)/check
  	$(INSTALL_DATA) ./COPYING $(DISTDIR)
  	$(INSTALL_DATA) ./README $(DISTDIR)
-@@ -68,6 +68,9 @@ install-tools:
+@@ -78,6 +78,10 @@ install-tools:
  install-kernels:
  	for i in $(XKERNELS) ; do $(MAKE) $$i-install || exit 1; done
  
++.PHONY: patchkrn
 +patchkrn:
 +	for i in $(KERNELS) ; do $(MAKE) -f buildconfigs/mk.$$i xenify ; done
 +
+ .PHONY: install-docs
  install-docs:
  	sh ./docs/check_pkgs && $(MAKE) -C docs install || true
- 
-@@ -75,7 +78,7 @@ dev-docs:
- 	$(MAKE) -C docs dev-docs
+@@ -88,7 +92,7 @@ dev-docs:
  
  # Build all the various kernels and modules
+ .PHONY: kbuild
 -kbuild: kernels
 +kbuild: patchkrn kernels
  
  # Delete the kernel build trees entirely
- kdelete:
+ .PHONY: kdelete
diff --git a/kernels/xen-kernel/patch.mklinux b/kernels/xen-kernel/patch.mklinux
index 7c9242b..5f041d0 100644
--- a/kernels/xen-kernel/patch.mklinux
+++ b/kernels/xen-kernel/patch.mklinux
@@ -1,25 +1,25 @@
---- buildconfigs/mk.linux-2.6-xen.org	2005-12-26 11:35:20.000000000 +0100
-+++ buildconfigs/mk.linux-2.6-xen	2005-12-26 11:36:33.000000000 +0100
-@@ -10,16 +10,20 @@ LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTR
- 
+--- buildconfigs/mk.linux-2.6-xen.orig	2006-11-09 10:04:46.000000000 +0100
++++ buildconfigs/mk.linux-2.6-xen	2006-11-09 10:09:29.000000000 +0100
+@@ -13,8 +13,10 @@ LINUX_VER3  := $(LINUX_SERIES).$(word 3,
  include buildconfigs/Rules.mk
  
--.PHONY: build clean delete
-+.PHONY: build clean delete xenify
- 
  # The real action starts here!
+-.PHONY: build
 -build: $(LINUX_DIR)/include/linux/autoconf.h
++.PHONY: build xenify
 +build: $(LINUX_DIR)/include/linux/autoconf.h $(INSTALL_DIR)/boot/vmlinuz-$(FULLVERSION)
 +
 +$(INSTALL_DIR)/boot/vmlinuz-$(FULLVERSION):
  	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
  	    $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) modules ; \
  	    $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
- 	fi
- 	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR) install
+@@ -23,6 +25,9 @@ build: $(LINUX_DIR)/include/linux/autoco
+ 	mkdir -p $(INSTALL_BOOT_PATH)
+ 	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(INSTALL_BOOT_PATH) install
  
 +xenify: $(LINUX_DIR)/include/linux/autoconf.h
 +
- $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
++
+ $(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)/.valid-ref
  	rm -rf $(LINUX_DIR)
  	cp -al $(<D) $(LINUX_DIR)
diff --git a/kernels/xen-kernel/xen-3.0.3_0-src.tgz.sig b/kernels/xen-kernel/xen-3.0.3_0-src.tgz.sig
new file mode 100644
index 0000000..14f1b6b
Binary files /dev/null and b/kernels/xen-kernel/xen-3.0.3_0-src.tgz.sig differ
diff --git a/utils/xen/DETAILS b/utils/xen/DETAILS
index d0cf074..979055b 100755
--- a/utils/xen/DETAILS
+++ b/utils/xen/DETAILS
@@ -1,10 +1,16 @@
            SPELL=xen
-         VERSION=3.0.0
+         VERSION=3.0.3_0
+        XEN_KVER=2.6.16.29
           SOURCE=${SPELL}-${VERSION}-src.tgz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-   SOURCE_URL[0]=http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/${SOURCE}
-   SOURCE_URL[1]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-SOURCE_HASH=sha512:d57d48382304241b989d138aae7d3745c530d062b7e7dca4956a40cf948e8f5a2b3c3c79bba0c74460b28b33906dd0d94e252c4caa88b1aef383281c8d10b880
+         SOURCE2=linux-${XEN_KVER}.tar.bz2
+         SOURCE3=${SOURCE2}.sign
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src
+   SOURCE_URL[0]=http://bits.xensource.com/oss-xen/release/3.0.3-0/src.tgz/${SOURCE}
+     SOURCE2_URL=http://www.kernel.org/pub/linux/kernel/v2.6/${SOURCE2}
+     SOURCE3_URL=${SOURCE2_URL}.sign
+      SOURCE_GPG=gurus.gpg:${SOURCE}.sig
+     SOURCE2_GPG=kernel.gpg:${SOURCE2}.sig	
+  SOURCE3_IGNORE=signature
         WEB_SITE=http://xen.sourceforge.net/
          ENTERED=20041110
          UPDATED=20041206
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index 50e4db9..f83eb58 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,7 @@
+2006-11-09 Pieter Lenaerts <e-type at sourcemage.org>
+	* DETAILS: updated to 3.0.3_0, added SOURCE2 for linux src
+	* added PRE_BUILD: sed line pointing make to SOURCE_CACHE
+
 2006-06-28 Eric Sandall <eric at sandall.us>
 	* DETAILS: Removed BUILD_API=2, set grimoire-wide
 
diff --git a/utils/xen/PRE_BUILD b/utils/xen/PRE_BUILD
new file mode 100755
index 0000000..abace8a
--- /dev/null
+++ b/utils/xen/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+sedit "s_LINUX\_SRC\_PATH\t?=\ \.:\.\._LINUX\_SRC\_PATH\t?=\ ${SOURCE_CACHE}_g"\
+    ${SOURCE_DIRECTORY}/buildconfigs/Rules.mk
diff --git a/utils/xen/xen-3.0.3_0-src.tgz.sig b/utils/xen/xen-3.0.3_0-src.tgz.sig
new file mode 100644
index 0000000..14f1b6b
Binary files /dev/null and b/utils/xen/xen-3.0.3_0-src.tgz.sig differ



More information about the SM-Commit mailing list