upgrade 2.6.5-jl and fix SRC_URI

BKrev: 408ff306HvaT2IkqHwFIkbU0cW7YTA

diff --git a/linux/openzaurus-2.6.5-jl1/defconfig-collie b/linux/openzaurus-2.6.5-jl2/defconfig-collie
similarity index 100%
rename from linux/openzaurus-2.6.5-jl1/defconfig-collie
rename to linux/openzaurus-2.6.5-jl2/defconfig-collie

diff --git a/linux/openzaurus-2.6.5-jl1/defconfig-shepherd b/linux/openzaurus-2.6.5-jl2/defconfig-shepherd
similarity index 100%
rename from linux/openzaurus-2.6.5-jl1/defconfig-shepherd
rename to linux/openzaurus-2.6.5-jl2/defconfig-shepherd

diff --git a/linux/openzaurus_2.6.5-jl1.oe b/linux/openzaurus_2.6.5-jl1.oe
deleted file mode 100644 (file)
index aa425da..0000000
--- a/linux/openzaurus_2.6.5-jl1.oe
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "Linux kernel for Zaurus devices."
-LICENSE = "GPL"
-KV = "2.6.5"
-JLV = "jl1"
-PV = "${KV}-${JLV}"
-
-FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-${PV}"
-
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2               \
-           http://www.cs.wisc.edu/~lenz/zaurus/files/patch-${KV}-${JLV}.diff.gz;patch=1 \
-           http://sit.wisc.edu/~bjlarson2/oztesting/patch-${KV}-jlv2.diff.gz;patch=1    "
-S = "${WORKDIR}/linux-${KV}"
-
-inherit kernel
-
-#FIXME: Use configuration system
-export MEM = "32"
-export RD = "32"
-export CMDLINE = "noinitrd root=/dev/mtdblock2 rootfstype=jffs2 console=tty0 jffs2_orphand_inodes=delete"
-EXTRA_OEMAKE = ""
-
-do_configure_prepend() {
-        install -m 0644 ${FILESDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
-
-        mem=${MEM}
-        rd=${RD}
-        mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
-        rdsize=`echo "$rd * 1024" | bc`
-        total=`expr $mem + $rd`
-        addr=`echo "obase=16; ibase=16; C000000 + $mempos" | bc`
-        if [ "$rd" == "0" ]
-        then
-                echo "# CONFIG_MTD_MTDRAM_SA1100 is not set" >> ${S}/.config
-        else
-                echo "CONFIG_MTD_MTDRAM_SA1100=y"           >> ${S}/.config
-                echo "CONFIG_MTDRAM_TOTAL_SIZE=$rdsize"     >> ${S}/.config
-                echo "CONFIG_MTDRAM_ERASE_SIZE=1"           >> ${S}/.config
-                echo "CONFIG_MTDRAM_ABS_POS=$addr"          >> ${S}/.config
-        fi
-       echo "CONFIG_CMDLINE=\"$CMDLINE mem=${mem}M\"" >> ${S}/.config
-        oe_runmake oldconfig
-}
-
-do_compile() {
-        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-        oe_runmake
-}
-

diff --git a/linux/openzaurus_2.6.5-jl2.oe b/linux/openzaurus_2.6.5-jl2.oe
new file mode 100644 (file)
index 0000000..e69de29