12 files changed, 16 insertions, 46 deletions
diff --git a/recipes/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch b/recipes/klibc/klibc-1.5.15/fstype-sane-vfat-and-jffs2-for-1.5.patch
index 6eb604e45c..6eb604e45c 100644
--- a/recipes/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch
+++ b/recipes/klibc/klibc-1.5.15/fstype-sane-vfat-and-jffs2-for-1.5.patch
diff --git a/recipes/klibc/files/modprobe.patch b/recipes/klibc/klibc-1.5.15/modprobe.patch
index 61ee340ff9..61ee340ff9 100644
--- a/recipes/klibc/files/modprobe.patch
+++ b/recipes/klibc/klibc-1.5.15/modprobe.patch
diff --git a/recipes/klibc/files/staging.patch b/recipes/klibc/klibc-1.5.15/staging.patch
index 390c214f94..390c214f94 100644
--- a/recipes/klibc/files/staging.patch
+++ b/recipes/klibc/klibc-1.5.15/staging.patch
diff --git a/recipes/klibc/files/wc.patch b/recipes/klibc/klibc-1.5.15/wc.patch
index f54c49d3ab..f54c49d3ab 100644
--- a/recipes/klibc/files/wc.patch
+++ b/recipes/klibc/klibc-1.5.15/wc.patch
diff --git a/recipes/klibc/klibc-common.inc b/recipes/klibc/klibc-common.inc
index ff67450f50..b66bc616ef 100644
--- a/recipes/klibc/klibc-common.inc
+++ b/recipes/klibc/klibc-common.inc
@@ -4,13 +4,15 @@ DESCRIPTION = "klibc is intended to be a minimalistic libc subset for \
 use with initramfs.  It is deliberately written for small size, \
 minimal entaglement, and portability, not speed."
 LICENSE = "BSD-ADV"
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2 \
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/${KLIBC_FETCHDIR}/klibc-${PV}.tar.bz2 \
 	   file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \
 	   file://modprobe.patch;patch=1 \
 	   file://losetup.patch;patch=1 \
 	   file://dash_readopt.patch;patch=1 \
 	   file://wc.patch;patch=1 \
 	   "
+
 S = "${WORKDIR}/klibc-${PV}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/recipes/klibc/klibc-common_1.5.15.inc b/recipes/klibc/klibc-common_1.5.15.inc
deleted file mode 100644
index 58ed99a2dd..0000000000
--- a/recipes/klibc/klibc-common_1.5.15.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-DEPENDS = "virtual/kernel perl-native"
-SECTION = "libs"
-DESCRIPTION = "klibc is intended to be a minimalistic libc subset for \
-use with initramfs.  It is deliberately written for small size, \
-minimal entaglement, and portability, not speed."
-LICENSE = "BSD-ADV"
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Testing/klibc-${PV}.tar.bz2 \
-	   file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \
-	   file://modprobe.patch;patch=1 \
-	   file://losetup.patch;patch=1 \
-	   file://dash_readopt.patch;patch=1 \
-	   file://wc.patch;patch=1 \
-	   "
-S = "${WORKDIR}/klibc-${PV}"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-KLIBC_ARCH = '${TARGET_ARCH}'
-KLIBC_ARCH_armeb = 'arm'
-KLIBC_ARCH_mipsel = 'mips'
-KLIBC_ARCH_x86 = 'i386'
-KLIBC_ARCH_i486 = 'i386'
-KLIBC_ARCH_i586 = 'i386'
-KLIBC_ARCH_i686 = 'i386'
-KLIBC_ARCH_pentium = 'i386'
-
-# the klibc code contains ARM instructions (for ARM), this
-# could be fixed, but for the moment:
-ARM_INSTRUCTION_SET = "arm"
-
-SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch;patch=1 \
-				"
-SRC_URI_append_linux-uclibcgnueabi = "file://klibc-config-eabi.patch;patch=1 \
-				      "
-
-EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
-                'CROSS_COMPILE=${TARGET_PREFIX}' \
-                "
-
-do_configure () {
-	ln -sf ${STAGING_KERNEL_DIR} linux
-}
-
diff --git a/recipes/klibc/klibc-utils-static_1.5.15.bb b/recipes/klibc/klibc-utils-static_1.5.15.bb
index 5717886d68..3fff9b86ae 100644
--- a/recipes/klibc/klibc-utils-static_1.5.15.bb
+++ b/recipes/klibc/klibc-utils-static_1.5.15.bb
@@ -1,7 +1,10 @@
-require klibc-common_1.5.15.inc
+require klibc-common.inc
 
 PR = "r1"
 
+KLIBC_FETCHDIR = "Testing"
+FILESPATHPKG =. "klibc-${PV}:"
+
 # We only want the static utils. klibc build both. So we install only what we want.
 do_install() {
         install -d ${D}${base_bindir}
diff --git a/recipes/klibc/klibc-utils-static_1.5.bb b/recipes/klibc/klibc-utils-static_1.5.bb
index c89def5be6..a4e31de95c 100644
--- a/recipes/klibc/klibc-utils-static_1.5.bb
+++ b/recipes/klibc/klibc-utils-static_1.5.bb
@@ -2,6 +2,9 @@ require klibc-common.inc
 
 PR = "r12"
 
+KLIBC_FETCHDIR = "Stable"
+FILESPATHPKG =. "klibc-${PV}:"
+
 # We only want the static utils. klibc build both. So we install only what we want.				
 do_install() {
         install -d ${D}${base_bindir}
diff --git a/recipes/klibc/klibc_1.5.15.bb b/recipes/klibc/klibc_1.5.15.bb
index aae3e604de..e66587454e 100644
--- a/recipes/klibc/klibc_1.5.15.bb
+++ b/recipes/klibc/klibc_1.5.15.bb
@@ -1,2 +1,4 @@
 require klibc_1.5.15.inc
 PR = "r1"
+
+KLIBC_FETCHDIR = "Testing"
diff --git a/recipes/klibc/klibc_1.5.15.inc b/recipes/klibc/klibc_1.5.15.inc
index a9cd2f3122..e8967f56b0 100644
--- a/recipes/klibc/klibc_1.5.15.inc
+++ b/recipes/klibc/klibc_1.5.15.inc
@@ -1,4 +1,4 @@
-require klibc-common_1.5.15.inc
+require klibc-common.inc
 
 SRC_URI += "file://staging.patch;patch=1 \
 	    file://klibc_kexecsyscall.patch;patch=1 \
diff --git a/recipes/klibc/klibc_1.5.bb b/recipes/klibc/klibc_1.5.bb
index a607aa8a21..3dd4d645ec 100644
--- a/recipes/klibc/klibc_1.5.bb
+++ b/recipes/klibc/klibc_1.5.bb
@@ -1,2 +1,4 @@
-require klibc.inc
+require klibc_1.5.inc
 PR = "r9"
+
+KLIBC_FETCHDIR = "Stable"
diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc_1.5.inc
index 15205c754b..15205c754b 100644
--- a/recipes/klibc/klibc.inc
+++ b/recipes/klibc/klibc_1.5.inc