summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-02 17:16:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-02 17:19:18 +0000
commit8b5b3cca7dd096680ce16b02e35399cd12d487f9 (patch)
tree0848269939452a46104344f3a387fb459e2b82ca
parent0e837e6844be449659bb96a1498e54a8b9442d13 (diff)
downloadpoky-8b5b3cca7dd096680ce16b02e35399cd12d487f9.tar.gz
linux-yocto/linux-libc-headers-yocto: Adjust to git fetcher improvements
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-yocto.bbclass4
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb3
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_git.bb3
3 files changed, 4 insertions, 6 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 70521a4fb3..9ca7758bb8 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -89,11 +89,11 @@ do_patch() {
89} 89}
90 90
91do_kernel_checkout() { 91do_kernel_checkout() {
92 if [ -d ${WORKDIR}/.git/refs/remotes/origin ]; then 92 if [ -d ${WORKDIR}/git/.git/refs/remotes/origin ]; then
93 echo "Fixing up git directory for ${LINUX_KERNEL_TYPE}/${KMACHINE}" 93 echo "Fixing up git directory for ${LINUX_KERNEL_TYPE}/${KMACHINE}"
94 rm -rf ${S} 94 rm -rf ${S}
95 mkdir ${S} 95 mkdir ${S}
96 mv ${WORKDIR}/.git ${S} 96 mv ${WORKDIR}/git/.git ${S}
97 97
98 if [ -e ${S}/.git/packed-refs ]; then 98 if [ -e ${S}/.git/packed-refs ]; then
99 cd ${S} 99 cd ${S}
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
index 762b6a8d24..0d5835401e 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
@@ -10,8 +10,7 @@ PV = "2.6.37+git-${SRCPV}"
10PR = "r2" 10PR = "r2"
11 11
12SRCREV_FORMAT = "meta_machine" 12SRCREV_FORMAT = "meta_machine"
13SRC_URI = "git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \ 13SRC_URI = "git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
14 git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;noclone=1;branch=meta;name=meta"
15 14
16set_arch() { 15set_arch() {
17 case ${TARGET_ARCH} in 16 case ${TARGET_ARCH} in
diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb
index b1486bce18..1757c5532a 100644
--- a/meta/recipes-kernel/linux/linux-yocto_git.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_git.bb
@@ -17,8 +17,7 @@ PR = "r15"
17PV = "${LINUX_VERSION}+git${SRCPV}" 17PV = "${LINUX_VERSION}+git${SRCPV}"
18SRCREV_FORMAT = "meta_machine" 18SRCREV_FORMAT = "meta_machine"
19 19
20SRC_URI = "git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \ 20SRC_URI = "git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta \
21 git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;noclone=1;branch=meta;name=meta \
22 file://tools-perf-no-scripting.patch" 21 file://tools-perf-no-scripting.patch"
23 22
24COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|mpc8315e-rdb|routerstationpro)" 23COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|mpc8315e-rdb|routerstationpro)"