From 6ad0539c5f00b80f229e5fcf7bb89e9e9f74df85 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 1 Feb 2007 17:10:49 +0000
Subject: linphone: removed default_preference=-1 from the 1.6.0 console-only
 version

---
 packages/linphone/linphone_1.6.0.bb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'packages')

diff --git a/packages/linphone/linphone_1.6.0.bb b/packages/linphone/linphone_1.6.0.bb
index 99ba3878a2..f483368c79 100644
--- a/packages/linphone/linphone_1.6.0.bb
+++ b/packages/linphone/linphone_1.6.0.bb
@@ -1,5 +1,3 @@
-DEFAULT_PREFERENCE = "-1"
-
 DESCRIPTION = "SIP-based IP phone (console edition)"
 HOMEPAGE = "http://www.linphone.org/?lang=us"
 LICENSE = "GPL-2"
-- 
cgit v1.2.3


From 18338970d6b0f87856fa6c7a6b31c93d00adeb70 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 4 Feb 2007 20:58:12 +0000
Subject: ixp4xx-kernel: Updated to 2.6.20

---
 packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb | 25 ---------------
 packages/linux/ixp4xx-kernel_2.6.19.bb            | 15 ++++++++-
 packages/linux/ixp4xx-kernel_2.6.20.bb            | 38 +++++++++++++++++++++++
 3 files changed, 52 insertions(+), 26 deletions(-)
 delete mode 100644 packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb
 create mode 100644 packages/linux/ixp4xx-kernel_2.6.20.bb

(limited to 'packages')

diff --git a/packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb b/packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb
deleted file mode 100644
index 5ab6d5c6e7..0000000000
--- a/packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-# Kernel for IXP4xx
-#
-# This bitbake file pulls patches and the defconfig straight
-# from the NSLU2-Linux SVN repository. Information about this
-# repository can be found at:
-# http://trac.nslu2-linux.org/kernel/
-#
-# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "681"
-#
-# The directory containing the patches to be applied is
-# specified below
-IXP4XX_KERNEL_PATCH_DIR = "2.6.20"
-#
-# Increment the number below (i.e. the digits after PR) when
-# the changes in SVN between revisions include changes in the
-# patches applied to the kernel, rather than simply defconfig
-# changes
-PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
-
-require ixp4xx-kernel.inc
-require ixp4xx-kernel-svnpatch.inc
-
-SRC_URI += "file://defconfig"
-SRC_URI += "file://series"
diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb
index 3be13fd971..6841c93d00 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "681"
+IXP4XX_KERNEL_SVN_REV = "682"
 #
 # The directory containing the patches to be applied is
 # specified below
@@ -23,3 +23,16 @@ require ixp4xx-kernel-svnpatch.inc
 
 SRC_URI += "file://defconfig"
 SRC_URI += "file://series"
+
+# Remove the specific cmdline hacking patches if we are not building for nslu2.
+addtask remove_cmdline_hacks before do_patch after do_unpack
+do_remove_cmdline_hacks() {
+
+#	if [ "${MACHINE}" != "nslu2" ] ; then
+		sed	-e '/88-nas100d-dflt-cmdline.patch/d' \
+			-e '/88-nslu2-dflt-cmdline.patch/d' \
+			'${WORKDIR}/series' > '${WORKDIR}/series.new'
+		mv '${WORKDIR}/series.new' '${WORKDIR}/series'
+#	fi
+
+}
diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb
new file mode 100644
index 0000000000..0cc6b387f7
--- /dev/null
+++ b/packages/linux/ixp4xx-kernel_2.6.20.bb
@@ -0,0 +1,38 @@
+# Kernel for IXP4xx
+#
+# This bitbake file pulls patches and the defconfig straight
+# from the NSLU2-Linux SVN repository. Information about this
+# repository can be found at:
+# http://trac.nslu2-linux.org/kernel/
+#
+# The revision that is pulled from SVN is specified below
+IXP4XX_KERNEL_SVN_REV = "682"
+#
+# The directory containing the patches to be applied is
+# specified below
+IXP4XX_KERNEL_PATCH_DIR = "2.6.20"
+#
+# Increment the number below (i.e. the digits after PR) when
+# the changes in SVN between revisions include changes in the
+# patches applied to the kernel, rather than simply defconfig
+# changes
+PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
+
+require ixp4xx-kernel.inc
+require ixp4xx-kernel-svnpatch.inc
+
+SRC_URI += "file://defconfig"
+SRC_URI += "file://series"
+
+# Remove the specific cmdline hacking patches if we are not building for nslu2.
+addtask remove_cmdline_hacks before do_patch after do_unpack
+do_remove_cmdline_hacks() {
+
+	if [ "${MACHINE}" != "nslu2" ] ; then
+		sed	-e '/88-nas100d-dflt-cmdline.patch/d' \
+			-e '/88-nslu2-dflt-cmdline.patch/d' \
+			'${WORKDIR}/series' > '${WORKDIR}/series.new'
+		mv '${WORKDIR}/series.new' '${WORKDIR}/series'
+	fi
+
+}
-- 
cgit v1.2.3