summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-10-26 12:12:24 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-10-26 12:12:24 +0000
commit1bdfb7b626be9db29987eda26f505af5f2e3e433 (patch)
tree045147ed6518a10526dfb89a01dbde7aa859a6e2 /meta
parenta975511d0dd0bc62db13e6ca8ea226f65ee32ae7 (diff)
downloadpoky-1bdfb7b626be9db29987eda26f505af5f2e3e433.tar.gz
linux-libc-headers: sync with OE (mainly safer use of and blackfin support)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3002 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb9
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb11
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb12
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb22
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb2
5 files changed, 39 insertions, 17 deletions
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
index 30f57000bb..3f5cc3a0b5 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
@@ -1,12 +1,11 @@
1SECTION = "devel" 1require linux-libc-headers.inc
2DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use." 2
3HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/" 3HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/"
4# license note from the package: 4# license note from the package:
5# Linux-libc-headers are derived from linux kernel headers. For license of a 5# Linux-libc-headers are derived from linux kernel headers. For license of a
6# particular header, check it's content, and if copyright notice isn't present, 6# particular header, check it's content, and if copyright notice isn't present,
7# standard linux kernel license applies. 7# standard linux kernel license applies.
8# since we assume GPL for linux i think we can also assume it here 8# since we assume GPL for linux i think we can also assume it here
9LICENSE = "GPL"
10INHIBIT_DEFAULT_DEPS = "1" 9INHIBIT_DEFAULT_DEPS = "1"
11PR = "r2" 10PR = "r2"
12 11
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
index 8d82f7b662..0dba90dc97 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
@@ -1,17 +1,16 @@
1SECTION = "devel" 1require linux-libc-headers.inc
2DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use." 2
3# This package is derived from the original linux-libc-headers at 3# This package is derived from the original linux-libc-headers at
4# http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ 4# http://ep09.pld-linux.org/~mmazur/linux-libc-headers/
5# More specifically, llh-2.6.12.0 was patched up to 2.6.16-rc6 with 5# More specifically, llh-2.6.12.0 was patched up to 2.6.16-rc6 with
6# the official linux patches (where applicable) and then fixed up just 6# the official linux patches (where applicable) and then fixed up just
7# enough to build glibc-2.4. BEWARE! 7# enough to build glibc-2.4. BEWARE!
8# 8#
9# license note from the linux-libc-headers package: 9# license note from the linux-libc-headers package:
10# Linux-libc-headers are derived from linux kernel headers. For license of a 10# Linux-libc-headers are derived from linux kernel headers. For license of a
11# particular header, check it's content, and if copyright notice isn't present, 11# particular header, check it's content, and if copyright notice isn't present,
12# standard linux kernel license applies. 12# standard linux kernel license applies.
13# since we assume GPL for linux i think we can also assume it here 13# since we assume GPL for linux i think we can also assume it here
14LICENSE = "GPL"
15DEFAULT_PREFERENCE = "-1" 14DEFAULT_PREFERENCE = "-1"
16INHIBIT_DEFAULT_DEPS = "1" 15INHIBIT_DEFAULT_DEPS = "1"
17PR = "r4" 16PR = "r4"
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
index 8c6222560f..7cb5c4aa2d 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
@@ -36,7 +36,7 @@ do_install() {
36 set_arch 36 set_arch
37 install -d ${D}${includedir} 37 install -d ${D}${includedir}
38 cp -pfLR ${S}${includedir}/linux ${D}${includedir}/ 38 cp -pfLR ${S}${includedir}/linux ${D}${includedir}/
39 cp -pfLR ${S}${includedir}/asm-$ARCH ${D}${includedir}/asm 39 cp -pfLR ${S}${includedir}/asm-${ARCH} ${D}${includedir}/asm
40 cp -pfLR ${S}${includedir}/asm-generic ${D}${includedir}/ 40 cp -pfLR ${S}${includedir}/asm-generic ${D}${includedir}/
41} 41}
42 42
@@ -45,6 +45,14 @@ do_stage () {
45 install -d ${STAGING_INCDIR} 45 install -d ${STAGING_INCDIR}
46 rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm ${STAGING_INCDIR}/asm-generic 46 rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm ${STAGING_INCDIR}/asm-generic
47 cp -pfLR ${S}${includedir}/linux ${STAGING_INCDIR}/ 47 cp -pfLR ${S}${includedir}/linux ${STAGING_INCDIR}/
48 cp -pfLR ${S}${includedir}/asm-$ARCH ${STAGING_INCDIR}/asm 48 cp -pfLR ${S}${includedir}/asm-${ARCH} ${STAGING_INCDIR}/asm
49 cp -pfLR ${S}${includedir}/asm-generic ${STAGING_INCDIR}/ 49 cp -pfLR ${S}${includedir}/asm-generic ${STAGING_INCDIR}/
50} 50}
51
52do_stage_append_nylon () {
53 cp -pPR include/asm-${ARCH}/* ${STAGING_INCDIR}/asm/
54 cp -pPR include/asm-${ARCH}/* ${CROSS_DIR}/${TARGET_SYS}/include/asm/
55 cp -pPR include/linux/* ${STAGING_INCDIR}/linux/
56 cp -pPR include/linux/* ${CROSS_DIR}/${TARGET_SYS}/include/linux/
57}
58
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
index 33cbb4ad28..3abf26f4ff 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
@@ -30,7 +30,7 @@ set_arch() {
30 30
31do_configure() { 31do_configure() {
32 set_arch 32 set_arch
33 oe_runmake allnoconfig ARCH=$ARCH 33 oe_runmake allnoconfig ARCH=${ARCH}
34} 34}
35 35
36do_compile () { 36do_compile () {
@@ -38,7 +38,7 @@ do_compile () {
38 38
39do_install() { 39do_install() {
40 set_arch 40 set_arch
41 oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH 41 oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=${ARCH}
42} 42}
43 43
44do_install_append_arm() { 44do_install_append_arm() {
@@ -51,8 +51,8 @@ do_stage () {
51 set_arch 51 set_arch
52 rm -rf ${STAGE_TEMP} 52 rm -rf ${STAGE_TEMP}
53 mkdir -p ${STAGE_TEMP} 53 mkdir -p ${STAGE_TEMP}
54 oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH 54 oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=${ARCH}
55 if [ "$ARCH" = "arm" ]; then 55 if [ "${ARCH}" == "arm" ]; then
56 cp include/asm-arm/procinfo.h ${STAGE_TEMP}${includedir}/asm 56 cp include/asm-arm/procinfo.h ${STAGE_TEMP}${includedir}/asm
57 fi 57 fi
58 install -d ${STAGING_INCDIR} 58 install -d ${STAGING_INCDIR}
@@ -60,4 +60,18 @@ do_stage () {
60 cp -pfLR ${STAGE_TEMP}${includedir}/linux ${STAGING_INCDIR}/ 60 cp -pfLR ${STAGE_TEMP}${includedir}/linux ${STAGING_INCDIR}/
61 cp -pfLR ${STAGE_TEMP}${includedir}/asm ${STAGING_INCDIR}/ 61 cp -pfLR ${STAGE_TEMP}${includedir}/asm ${STAGING_INCDIR}/
62 cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${STAGING_INCDIR}/ 62 cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${STAGING_INCDIR}/
63 # Add UTS_RELEASE to version.h. UTS_RELEASE was moved from version.h to
64 # utsrelease.h in order to avoid recompiling a kernel every time a localversion
65 # changed. Since the our headers are static and we're not compiling an
66 # actual kernel, re-adding UTS_RELEASE does't hurt, and it allows uclibc to
67 # compile with kernel headers that work with EABI on ARM
68 echo '#define UTS_RELEASE "2.6.18"' >> ${STAGING_INCDIR}/linux/version.h
63} 69}
70
71do_stage_append_nylon () {
72 cp -pPR include/asm-${ARCH}/* ${STAGING_INCDIR}/asm/
73 cp -pPR include/asm-${ARCH}/* ${CROSS_DIR}/${TARGET_SYS}/include/asm/
74 cp -pPR include/linux/* ${STAGING_INCDIR}/linux/
75 cp -pPR include/linux/* ${CROSS_DIR}/${TARGET_SYS}/include/linux/
76}
77
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
index 3f5607684a..0b6112884e 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
@@ -25,6 +25,8 @@ set_arch() {
25 sparc64*) ARCH=sparc64 ;; 25 sparc64*) ARCH=sparc64 ;;
26 sparc*) ARCH=sparc ;; 26 sparc*) ARCH=sparc ;;
27 x86_64*) ARCH=x86_64 ;; 27 x86_64*) ARCH=x86_64 ;;
28 avr32*) ARCH=avr32 ;;
29 bfin*) ARCH=blackfin ;;
28 esac 30 esac
29} 31}
30 32