summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Kunze <thommycheck@gmx.de>2008-04-14 21:49:21 +0000
committerThomas Kunze <thommycheck@gmx.de>2008-04-14 21:49:21 +0000
commit7a74595f87ad18f7435ce192f9667b962225087e (patch)
treea6e59f12c2df3b3df5774a58e7f52daafe2d1fb3
parent83f6d01df2f8f4ba919d178d7a88e75694403886 (diff)
klibc: add wc to tools
* for use with uniboot
-rw-r--r--packages/klibc/klibc-common.inc1
-rw-r--r--packages/klibc/klibc-utils-static_1.5.bb6
-rw-r--r--packages/klibc/klibc.inc7
-rw-r--r--packages/klibc/klibc_1.5.bb2
4 files changed, 11 insertions, 5 deletions
diff --git a/packages/klibc/klibc-common.inc b/packages/klibc/klibc-common.inc
index 5e890b3bc8..87fb6498f4 100644
--- a/packages/klibc/klibc-common.inc
+++ b/packages/klibc/klibc-common.inc
@@ -9,6 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2 \
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/packages/klibc/klibc-utils-static_1.5.bb b/packages/klibc/klibc-utils-static_1.5.bb
index f0429e34a2..f7015ffaf7 100644
--- a/packages/klibc/klibc-utils-static_1.5.bb
+++ b/packages/klibc/klibc-utils-static_1.5.bb
@@ -1,6 +1,6 @@
require klibc-common.inc
-PR = "r9"
+PR = "r10"
# We only want the static utils. klibc build both. So we install only what we want.
do_install() {
@@ -38,6 +38,7 @@ do_install() {
install -m 755 usr/utils/static/uname ${D}${base_bindir}
install -m 755 usr/utils/static/modprobe ${D}${base_bindir}
install -m 755 usr/utils/static/losetup ${D}${base_bindir}
+ install -m 755 usr/utils/static/wc ${D}${base_bindir}
cd ${D}${base_bindir}
ln -s gzip gunzip
ln -s gzip zcat
@@ -60,7 +61,7 @@ PACKAGES = "klibc-utils-static-sh klibc-utils-static-gzip \
klibc-utils-static-reboot klibc-utils-static-sleep \
klibc-utils-static-true klibc-utils-static-umount \
klibc-utils-static-uname klibc-utils-static-modprobe \
- klibc-utils-static-losetup"
+ klibc-utils-static-losetup klibc-utils-static-wc"
FILES_klibc-utils-static-sh = "${base_bindir}/sh"
FILES_klibc-utils-static-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat"
@@ -95,3 +96,4 @@ FILES_klibc-utils-static-umount = "${base_bindir}/umount"
FILES_klibc-utils-static-uname = "${base_bindir}/uname"
FILES_klibc-utils-static-modprobe = "${base_bindir}/modprobe"
FILES_klibc-utils-static-losetup = "${base_bindir}/losetup"
+FILES_klibc-utils-static-wc = "${base_bindir}/wc"
diff --git a/packages/klibc/klibc.inc b/packages/klibc/klibc.inc
index c32111af37..15205c754b 100644
--- a/packages/klibc/klibc.inc
+++ b/packages/klibc/klibc.inc
@@ -40,7 +40,8 @@ do_install() {
install -m 755 usr/utils/shared/uname ${D}${base_bindir}
install -m 755 usr/utils/shared/modprobe ${D}${base_bindir}
install -m 755 usr/utils/shared/losetup ${D}${base_bindir}
-
+ install -m 755 usr/utils/shared/wc ${D}${base_bindir}
+
install -d ${D}${base_libdir}
install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir}
cd ${D}${base_libdir}
@@ -74,7 +75,7 @@ PACKAGES = "${PN} klibc-utils-sh klibc-utils-kinit \
klibc-utils-sleep klibc-utils-true \
klibc-utils-umount klibc-utils-uname \
klibc-utils-gzip klibc-utils-modprobe \
- klibc-utils-losetup"
+ klibc-utils-losetup klibc-utils-wc"
FILES_${PN} = "${base_libdir}/klibc*.so"
FILES_klibc-utils-sh = "${base_bindir}/sh"
@@ -110,6 +111,7 @@ FILES_klibc-utils-umount = "${base_bindir}/umount"
FILES_klibc-utils-uname = "${base_bindir}/uname"
FILES_klibc-utils-modprobe = "${base_bindir}/modprobe"
FILES_klibc-utils-losetup = "${base_bindir}/losetup"
+FILES_klibc-utils-wc = "${base_bindir}/wc"
# Yes we want exactly the klibc that was compiled with the utils
RDEPENDS_klibc-utils-sh = "${PN} (=${PV}-${PR})"
@@ -144,3 +146,4 @@ RDEPENDS_klibc-utils-umount = "${PN} (=${PV}-${PR})"
RDEPENDS_klibc-utils-uname = "${PN} (=${PV}-${PR})"
RDEPENDS_klibc-utils-modprobe = "${PN} (=${PV}-${PR})"
RDEPENDS_klibc-utils-losetup = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-wc = "${PN} (=${PV}-${PR})"
diff --git a/packages/klibc/klibc_1.5.bb b/packages/klibc/klibc_1.5.bb
index 967f88f948..70d2819394 100644
--- a/packages/klibc/klibc_1.5.bb
+++ b/packages/klibc/klibc_1.5.bb
@@ -1,2 +1,2 @@
require klibc.inc
-PR = "r7"
+PR = "r8"