diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-25 22:38:19 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-25 22:39:38 +0000 |
commit | 77ec121b1bb96ea4621c8e761a5740cd4bb3cfc9 (patch) | |
tree | 49f5ae1373c94dff4f77a290bbf077099297c22c /recipes/uclibc | |
parent | 5720be48bdb98f53557939f7253aec60e8f36686 (diff) |
uclibc-initial: Convert to us do_install for staging. 0.9.30.1 is tested and works, anyone using older versions will need to verify this
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'recipes/uclibc')
-rw-r--r-- | recipes/uclibc/uclibc-initial_0.9.28.bb | 24 | ||||
-rw-r--r-- | recipes/uclibc/uclibc-initial_0.9.29.bb | 25 | ||||
-rw-r--r-- | recipes/uclibc/uclibc-initial_0.9.30.1.bb | 1 | ||||
-rw-r--r-- | recipes/uclibc/uclibc-initial_0.9.30.bb | 22 | ||||
-rw-r--r-- | recipes/uclibc/uclibc-initial_git.bb | 22 | ||||
-rw-r--r-- | recipes/uclibc/uclibc-initial_nptl.bb | 29 |
6 files changed, 44 insertions, 79 deletions
diff --git a/recipes/uclibc/uclibc-initial_0.9.28.bb b/recipes/uclibc/uclibc-initial_0.9.28.bb index e0b93f9418..ed290220c3 100644 --- a/recipes/uclibc/uclibc-initial_0.9.28.bb +++ b/recipes/uclibc/uclibc-initial_0.9.28.bb @@ -5,30 +5,24 @@ DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" PACKAGES = "" -do_stage() { +do_install() { # Install initial headers into the cross dir - make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + make PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ pregen install_dev - install -d ${CROSS_DIR}/${TARGET_SYS} - ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include + #install -d ${CROSS_DIR}/${TARGET_SYS} + #ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include # This conflicts with the c++ version of this header - rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h - install -d ${UCLIBC_STAGE_PREFIX}/lib - install -m 644 libc/sysdeps/linux/${TARGET_ARCH}/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib - install -m 644 libc/libc.so ${UCLIBC_STAGE_PREFIX}/lib - -} + rm -f ${D}${includedir}/bits/atomicity.h + install -d ${D}${libdir}/ + install -m 644 libc/sysdeps/linux/${TARGET_ARCH}/crt[1in].o ${D}${libdir}/ + install -m 644 libc/libc.so ${D}${libdir}/ -do_install() { - : } do_compile () { - make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + make PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ libc/sysdeps/linux/${TARGET_ARCH}/crt1.o \ libc/sysdeps/linux/${TARGET_ARCH}/crti.o \ libc/sysdeps/linux/${TARGET_ARCH}/crtn.o diff --git a/recipes/uclibc/uclibc-initial_0.9.29.bb b/recipes/uclibc/uclibc-initial_0.9.29.bb index f7abdec20f..94aa4efdc9 100644 --- a/recipes/uclibc/uclibc-initial_0.9.29.bb +++ b/recipes/uclibc/uclibc-initial_0.9.29.bb @@ -5,30 +5,23 @@ DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" PACKAGES = "" -do_stage() { +do_install() { # Install initial headers into the cross dir - make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + make PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ pregen install_dev - install -d ${CROSS_DIR}/${TARGET_SYS} - ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include + #install -d ${CROSS_DIR}/${TARGET_SYS} + #ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include # This conflicts with the c++ version of this header - rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h - install -d ${UCLIBC_STAGE_PREFIX}/lib - install -m 644 lib/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib - install -m 644 lib/libc.so ${UCLIBC_STAGE_PREFIX}/lib - -} - -do_install() { - : + rm -f ${D}${includedir}/bits/atomicity.h + install -d ${D}${libdir}/ + install -m 644 lib/crt[1in].o ${D}${libdir}/ + install -m 644 lib/libc.so ${D}${libdir}/ } do_compile () { - make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + make PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ lib/crt1.o lib/crti.o lib/crtn.o ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \ -o lib/libc.so diff --git a/recipes/uclibc/uclibc-initial_0.9.30.1.bb b/recipes/uclibc/uclibc-initial_0.9.30.1.bb index d0491fcc67..a9fa146023 100644 --- a/recipes/uclibc/uclibc-initial_0.9.30.1.bb +++ b/recipes/uclibc/uclibc-initial_0.9.30.1.bb @@ -15,7 +15,6 @@ do_install() { rm -f ${D}${includedir}/bits/atomicity.h install -d ${D}${libdir}/ install -m 644 lib/crt[1in].o ${D}${libdir}/ - install -d ${D}${libdir}/ install -m 644 lib/libc.so ${D}${libdir}/ } diff --git a/recipes/uclibc/uclibc-initial_0.9.30.bb b/recipes/uclibc/uclibc-initial_0.9.30.bb index 7d8c9c037f..84c35c8d1e 100644 --- a/recipes/uclibc/uclibc-initial_0.9.30.bb +++ b/recipes/uclibc/uclibc-initial_0.9.30.bb @@ -5,28 +5,22 @@ DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" PACKAGES = "" -do_stage() { +do_install() { # Install initial headers into the cross dir - make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + make PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ install_headers - ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include + #ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include # This conflicts with the c++ version of this header - rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h - install -d ${UCLIBC_STAGE_PREFIX}/lib - install -m 644 lib/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib - install -m 644 lib/libc.so ${UCLIBC_STAGE_PREFIX}/lib -} - -do_install() { - : + rm -f ${D}${includedir}/bits/atomicity.h + install -d ${D}${libdir}/ + install -m 644 lib/crt[1in].o ${D}${libdir}/ + install -m 644 lib/libc.so ${D}${libdir}/ } do_compile () { - make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + make PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ lib/crt1.o lib/crti.o lib/crtn.o ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \ -o lib/libc.so diff --git a/recipes/uclibc/uclibc-initial_git.bb b/recipes/uclibc/uclibc-initial_git.bb index a0077b167a..00330e2439 100644 --- a/recipes/uclibc/uclibc-initial_git.bb +++ b/recipes/uclibc/uclibc-initial_git.bb @@ -5,27 +5,21 @@ DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" PACKAGES = "" -do_stage() { +do_install() { # Install initial headers into the cross dir - make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + make V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ install_headers - ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include + #ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include # This conflicts with the c++ version of this header - rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h - install -d ${UCLIBC_STAGE_PREFIX}/lib - install -m 644 lib/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib - install -m 644 lib/libc.so ${UCLIBC_STAGE_PREFIX}/lib -} - -do_install() { - : + rm -f ${D}${includedir}/bits/atomicity.h + install -d ${D}${libdir}/ + install -m 644 lib/crt[1in].o ${D}${libdir}/ + install -m 644 lib/libc.so ${D}${libdir}/ } do_compile () { - make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + make V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ lib/crt1.o lib/crti.o lib/crtn.o ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \ -o lib/libc.so diff --git a/recipes/uclibc/uclibc-initial_nptl.bb b/recipes/uclibc/uclibc-initial_nptl.bb index dc376f5bce..a7c079b458 100644 --- a/recipes/uclibc/uclibc-initial_nptl.bb +++ b/recipes/uclibc/uclibc-initial_nptl.bb @@ -5,31 +5,22 @@ DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" PACKAGES = "" -do_stage() { +do_install() { # Install initial headers into the cross dir - make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - install_headers V=1 - - ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include + make V=1 PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ + install_headers + #ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include # This conflicts with the c++ version of this header - - rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h - install -d ${UCLIBC_STAGE_PREFIX}/lib - install -m 644 lib/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib - install -m 644 lib/libc.so ${UCLIBC_STAGE_PREFIX}/lib - -} - -do_install() { - : + rm -f ${D}${includedir}/bits/atomicity.h + install -d ${D}${libdir}/ + install -m 644 lib/crt[1in].o ${D}${libdir}/ + install -m 644 lib/libc.so ${D}${libdir}/ } do_compile () { - make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - lib/crt1.o lib/crti.o lib/crtn.o V=1 + make V=1 PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ + lib/crt1.o lib/crti.o lib/crtn.o ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \ -o lib/libc.so } |