diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
| commit | 293b05335ab540c4c8402e0a5caf2886b786a318 (patch) | |
| tree | 11e5a7c2dce338058f150e08d1ff47c9d4d8eccd /recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb | |
| parent | 1ee2156592ba17f64f3c9b8970285a259730b871 (diff) | |
| parent | e9aacc4ce4784c91cb4908145b8fb7b3ec8aa6e0 (diff) | |
| download | openembedded-293b05335ab540c4c8402e0a5caf2886b786a318.tar.gz | |
Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010
Conflicts:
recipes/linux/linux-openmoko-devel_git.bb
recipes/openmoko-3rdparty/pisi_0.5.2.bb
recipes/openmoko-3rdparty/pisi_0.5.3.bb
recipes/openmoko-3rdparty/pisi_0.5.bb
recipes/uclibc/uclibc_nptl.bb
Diffstat (limited to 'recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb')
| -rw-r--r-- | recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb b/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb index fa77dbd108..a59806d7e6 100644 --- a/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb +++ b/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb @@ -7,10 +7,10 @@ KERNEL_CCSUFFIX = "-3.3.3" COMPATIBLE_HOST = "arm.*-linux" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2;name=kernel \ - ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-2.4.25-vrs1.bz2;patch=1;name=patch1 \ - http://www.simtec.co.uk/products/SWLINUX/files/patch-2.4.25-vrs1-bast1.bz2;patch=1;name=patch2 \ + ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-2.4.25-vrs1.bz2;apply=yes;name=patch1 \ + http://www.simtec.co.uk/products/SWLINUX/files/patch-2.4.25-vrs1-bast1.bz2;apply=yes;name=patch2 \ file://defconfig \ - file://mkdep.patch;patch=1 \ + file://mkdep.patch \ file://defconfig" S = "${WORKDIR}/linux-${KV}" |