aboutsummaryrefslogtreecommitdiffstats
path: root/meta-initramfs/recipes-devtools/klibc
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2012-02-29 01:25:24 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-02-29 09:36:27 +0100
commit4c9740b5a893255326efa62fb8dd60153f88da2d (patch)
treed8a064af757c850b05ab20effc6fdfce2564fe92 /meta-initramfs/recipes-devtools/klibc
parent08bf37116bd13d9edc1ddd185ff9d6c230eb17a2 (diff)
downloadmeta-openembedded-contrib-4c9740b5a893255326efa62fb8dd60153f88da2d.tar.gz
meta-openembedded-contrib-4c9740b5a893255326efa62fb8dd60153f88da2d.tar.bz2
meta-openembedded-contrib-4c9740b5a893255326efa62fb8dd60153f88da2d.zip
klibc_1.5.25: Fetcher and QA fixes
* fix unfetchable SRC_URI and use git fetcher instead * and remove checksums file * adapt ${S} * fix QA about non -staticdev package contains static .a library * fix QA about /bin installed but not shipped * fix license and relative QA * bump INC_PR * patchset untouched awaiting klibc_2.0, expected in March 2012 Signed-off-by: Andrea Adami <andrea.adami@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-initramfs/recipes-devtools/klibc')
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.25.bb1
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-checksums_1.5.25.inc2
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.25.bb1
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.25.bb1
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc.inc10
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc_1.5.25.bb11
6 files changed, 9 insertions, 17 deletions
diff --git a/meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.25.bb b/meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.25.bb
index 922c8d84f2..ad7c07e8c2 100644
--- a/meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.25.bb
+++ b/meta-initramfs/recipes-devtools/klibc/klcc-cross_1.5.25.bb
@@ -1,7 +1,6 @@
PR = "${INC_PR}.0"
require klibc.inc
-require klibc-checksums_${PV}.inc
export KLCC_INST = "${STAGING_DIR_TARGET}/lib/klibc"
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-checksums_1.5.25.inc b/meta-initramfs/recipes-devtools/klibc/klibc-checksums_1.5.25.inc
deleted file mode 100644
index ebba6587c8..0000000000
--- a/meta-initramfs/recipes-devtools/klibc/klibc-checksums_1.5.25.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SRC_URI[md5sum] = "5bc4dcd63e9142b934787729133c2766"
-SRC_URI[sha256sum] = "0b910ec0b2a97d4c775ed06e44ad7bca7be150efdf2a77a19253a573e16367d3"
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.25.bb b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.25.bb
index c9749f0d7a..484134e44b 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.25.bb
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_1.5.25.bb
@@ -14,4 +14,3 @@ FILES_${PN} = ""
require klibc-utils.inc
require klibc.inc
-require klibc-checksums_${PV}.inc
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.25.bb b/meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.25.bb
index b26dda400f..37cab84c52 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.25.bb
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-utils_1.5.25.bb
@@ -14,4 +14,3 @@ FILES_${PN} = ""
require klibc-utils.inc
require klibc.inc
-require klibc-checksums_${PV}.inc
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc
index 1b1f7c626d..bd365daf7a 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc.inc
+++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc
@@ -3,7 +3,7 @@ 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"
+LICENSE = "BSD-3-Clause & GPL-2.0 & Zlib"
LIC_FILES_CHKSUM = "file://usr/klibc/LICENSE;md5=d75181f10e998c21eb147f6d2e43ce8b"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -12,7 +12,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
# debugsources.list: No such file or directory:
INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INC_PR = "r0"
+INC_PR = "r1"
KLIBC_ARCH = '${TARGET_ARCH}'
KLIBC_ARCH_armeb = 'arm'
@@ -23,8 +23,8 @@ KLIBC_ARCH_i586 = 'i386'
KLIBC_ARCH_i686 = 'i386'
KLIBC_ARCH_pentium = 'i386'
-KLIBC_FETCHDIR = "1.5"
-SRC_URI = "${KERNELORG_MIRROR}/linux/libs/klibc/${KLIBC_FETCHDIR}/klibc-${PV}.tar.bz2"
+SRCREV = "ff0a614bd724f6c4c6a5014a9955dc1bc028f336"
+SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git;protocol=git"
SRC_URI_append_linux-gnueabi = " file://klibc-config-eabi.patch"
SRC_URI_append_linux-uclibceabi = " file://klibc-config-eabi.patch"
@@ -36,7 +36,7 @@ SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \
file://staging.patch \
"
-S = "${WORKDIR}/klibc-${PV}"
+S = "${WORKDIR}/git"
EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
'CROSS_COMPILE=${TARGET_PREFIX}' \
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc_1.5.25.bb b/meta-initramfs/recipes-devtools/klibc/klibc_1.5.25.bb
index a313bfd771..8a50628417 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc_1.5.25.bb
+++ b/meta-initramfs/recipes-devtools/klibc/klibc_1.5.25.bb
@@ -8,8 +8,9 @@ do_install() {
# the crosscompiler is packaged by klcc-cross
# remove klcc
- # remove also from FILES_libklibc-dev
rm ${D}${base_bindir}/klcc
+ # remove now empty dir
+ rmdir ${D}${base_bindir}
# remove Linux headers .install and ..install.cmd files
find ${D}${base_libdir}/klibc/include -name '.install' -delete
@@ -21,15 +22,11 @@ do_install() {
}
-PACKAGES = "libklibc libklibc-dev"
+PACKAGES = "libklibc libklibc-staticdev libklibc-dev"
FILES_libklibc = "${base_libdir}/klibc-*.so"
+FILES_libklibc-staticdev = "${base_libdir}/klibc/lib/libc.a"
FILES_libklibc-dev = "${base_libdir}/klibc.so \
${base_libdir}/klibc/lib/* \
${base_libdir}/klibc/include/* \
"
-# see above
-# do not package it in -dev
-# ${base_bindir}/klcc \
-
require klibc.inc
-require klibc-checksums_${PV}.inc