diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-02-04 22:20:51 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-02-04 22:20:51 +0000 |
| commit | b700150f3b093619d104a2a3e24b856e5a2f4dbf (patch) | |
| tree | 48c465ec4f9762781f5eaa8c7fce94e0a65a270f /packages | |
| parent | b18e1767e1d0f6bc4b6f6e8f319569711a8685da (diff) | |
| parent | 3c687d1dbfd455c79126341112c381cd24f86bdb (diff) | |
merge of '355cafb7c6689b944b0668d7b743dff6ad6889ec'
and '9c738861989606d0fa4e37315bc94abc74cd3078'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linphone/linphone_1.6.0.bb | 2 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.19.bb | 15 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.20.bb (renamed from packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb) | 15 |
3 files changed, 28 insertions, 4 deletions
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" 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.19+2.6.20-rc6.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb index 5ab6d5c6e7..0cc6b387f7 100644 --- a/packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc6.bb +++ b/packages/linux/ixp4xx-kernel_2.6.20.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 + +} |