All pastes #1251258 Raw Edit

ant git-diffs

public text v1 · immutable
#1251258 ·published 2008-11-10 22:54 UTC
rendered paste body
From 7aa6ee3a49168b7ac00c8576e94a56d72a4244a5 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Sun, 26 Oct 2008 22:20:41 +0100
Subject: [PATCH] Kexecboot: don't call if_down (temporary hack, we disabled networking
 support)

---
 packages/kexecboot/files/kexecboot-rewrite.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packages/kexecboot/files/kexecboot-rewrite.patch b/packages/kexecboot/files/kexecboot-rewrite.patch
index 4f25206..0f0c376 100644
--- a/packages/kexecboot/files/kexecboot-rewrite.patch
+++ b/packages/kexecboot/files/kexecboot-rewrite.patch
@@ -239,7 +239,7 @@
 +	char *const envp[] = { NULL };
 +
 +	const char *kexec_load_argv[] = { NULL, "-l", NULL, NULL, NULL };
-+	const char *kexec_exec_argv[] = { NULL, "-e", NULL};
++	const char *kexec_exec_argv[] = { NULL, "-e", "-x", NULL};
 +
 +	char extra_cmdline_buffer[COMMAND_LINE_SIZE];
 +	char *extra_cmdline, *cmdline_arg = NULL;
-- 
1.5.6.4

From 38a89de0592411386e91e8ed561ce2a14ccd61af Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Sun, 26 Oct 2008 22:34:20 +0100
Subject: [PATCH] Unlock modern kernels for Zaurus clamshells

---
 packages/linux/linux-rp_2.6.24.bb |    3 +++
 packages/linux/linux-rp_2.6.26.bb |    2 ++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb
index b19111e..a6da686 100644
--- a/packages/linux/linux-rp_2.6.24.bb
+++ b/packages/linux/linux-rp_2.6.24.bb
@@ -6,6 +6,9 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_collie = "1"
 DEFAULT_PREFERENCE_qemux86 = "1"
 DEFAULT_PREFERENCE_tosa = "1"
+DEFAULT_PREFERENCE_akita = "1"
+DEFAULT_PREFERENCE_c7x0 = "1"
+DEFAULT_PREFERENCE_spitz = "1"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
diff --git a/packages/linux/linux-rp_2.6.26.bb b/packages/linux/linux-rp_2.6.26.bb
index dd12628..b977cf3 100644
--- a/packages/linux/linux-rp_2.6.26.bb
+++ b/packages/linux/linux-rp_2.6.26.bb
@@ -7,6 +7,8 @@ DEFAULT_PREFERENCE_qemuarm = "-1"
 DEFAULT_PREFERENCE_qemux86 = "-1"
 DEFAULT_PREFERENCE_spitz = "1"
 DEFAULT_PREFERENCE_collie = "1"
+DEFAULT_PREFERENCE_akita = "1"
+DEFAULT_PREFERENCE_c7x0 = "1"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
-- 
1.5.6.4

From 2c427058b503418eb7ac106852c38d55d34f3019 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Sun, 26 Oct 2008 22:40:21 +0100
Subject: [PATCH] Build kernel with ext3 extensions (akita and c7x0)

---
 packages/linux/linux-rp-2.6.24/defconfig-akita |    4 ++--
 packages/linux/linux-rp-2.6.24/defconfig-c7x0  |    4 ++--
 packages/linux/linux-rp-2.6.26/defconfig-akita |    4 ++--
 packages/linux/linux-rp-2.6.26/defconfig-c7x0  |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/linux/linux-rp-2.6.24/defconfig-akita b/packages/linux/linux-rp-2.6.24/defconfig-akita
index 32bfa9d..cbbd7ae 100644
--- a/packages/linux/linux-rp-2.6.24/defconfig-akita
+++ b/packages/linux/linux-rp-2.6.24/defconfig-akita
@@ -1444,10 +1444,10 @@ CONFIG_RTC_DRV_SA1100=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
 # CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=m
+CONFIG_JBD=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
diff --git a/packages/linux/linux-rp-2.6.24/defconfig-c7x0 b/packages/linux/linux-rp-2.6.24/defconfig-c7x0
index 4b54f9f..36f1d52 100644
--- a/packages/linux/linux-rp-2.6.24/defconfig-c7x0
+++ b/packages/linux/linux-rp-2.6.24/defconfig-c7x0
@@ -1450,10 +1450,10 @@ CONFIG_RTC_DRV_SA1100=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
 # CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=m
+CONFIG_JBD=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
diff --git a/packages/linux/linux-rp-2.6.26/defconfig-akita b/packages/linux/linux-rp-2.6.26/defconfig-akita
index 0106fa5..3ffa36f 100644
--- a/packages/linux/linux-rp-2.6.26/defconfig-akita
+++ b/packages/linux/linux-rp-2.6.26/defconfig-akita
@@ -1445,10 +1445,10 @@ CONFIG_RTC_DRV_SA1100=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
 # CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=m
+CONFIG_JBD=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
diff --git a/packages/linux/linux-rp-2.6.26/defconfig-c7x0 b/packages/linux/linux-rp-2.6.26/defconfig-c7x0
index b9b653c..93e480c 100644
--- a/packages/linux/linux-rp-2.6.26/defconfig-c7x0
+++ b/packages/linux/linux-rp-2.6.26/defconfig-c7x0
@@ -1451,10 +1451,10 @@ CONFIG_RTC_DRV_SA1100=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
 # CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=m
+CONFIG_JBD=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
-- 
1.5.6.4

From e1401aca293d9a31b38085710aedf5aa55fa5141 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Sun, 26 Oct 2008 22:48:10 +0100
Subject: [PATCH] Deploy a rootfs with kernel in /boot as default

---
 conf/machine/akita.conf |    3 +++
 conf/machine/c7x0.conf  |    8 ++++++--
 conf/machine/spitz.conf |    3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 0f5eaca..fa02b86 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -5,6 +5,9 @@
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/zaurus-clamshell.inc
 
+# uncomment to build initramfs-kexecboot kernel
+require conf/machine/include/kexecboot.inc
+
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
 MACHINE_FEATURES += "iwmmxt"
 
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 18c9db1..e2cd8d3 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -5,10 +5,14 @@
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/zaurus-clamshell.inc
 
+# uncomment to build initramfs-kexecboot kernel
+require conf/machine/include/kexecboot.inc
+
 IMAGE_FSTYPES += "jffs2"
 
-ROOT_FLASH_SIZE = "25"
-# yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
+#ROOT_FLASH_SIZE = "25"
+# yes, we are aware that the husky and boxer (c760,c860) have 53MB rootfs, but we don't make a special image for them.
+ROOT_FLASH_SIZE = "53"
 
 XSERVER = "xserver-kdrive-imageon"
 
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 32060d0..6dea064 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -5,6 +5,9 @@
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/zaurus-clamshell.inc
 
+# uncomment to build initramfs-kexecboot kernel
+require conf/machine/include/kexecboot.inc
+
 MACHINE_FEATURES += "iwmmxt"
 
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
-- 
1.5.6.4