summaryrefslogtreecommitdiff
path: root/recipes/klibc
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/klibc')
-rw-r--r--recipes/klibc/klibc-1.5.15/fstype-sane-vfat-and-jffs2-for-1.5.patch (renamed from recipes/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch)0
-rw-r--r--recipes/klibc/klibc-1.5.15/modprobe.patch (renamed from recipes/klibc/files/modprobe.patch)0
-rw-r--r--recipes/klibc/klibc-1.5.15/staging.patch (renamed from recipes/klibc/files/staging.patch)0
-rw-r--r--recipes/klibc/klibc-1.5.15/wc.patch (renamed from recipes/klibc/files/wc.patch)0
-rw-r--r--recipes/klibc/klibc-common.inc4
-rw-r--r--recipes/klibc/klibc-common_1.5.15.inc42
-rw-r--r--recipes/klibc/klibc-utils-static_1.5.15.bb16
-rw-r--r--recipes/klibc/klibc-utils-static_1.5.bb3
-rw-r--r--recipes/klibc/klibc_1.5.15.bb4
-rw-r--r--recipes/klibc/klibc_1.5.15.inc15
-rw-r--r--recipes/klibc/klibc_1.5.bb4
-rw-r--r--recipes/klibc/klibc_1.5.inc (renamed from recipes/klibc/klibc.inc)0
12 files changed, 35 insertions, 53 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..c1b3e6dd94 100644
--- a/recipes/klibc/klibc-utils-static_1.5.15.bb
+++ b/recipes/klibc/klibc-utils-static_1.5.15.bb
@@ -1,6 +1,9 @@
-require klibc-common_1.5.15.inc
+require klibc-common.inc
-PR = "r1"
+PR = "r2"
+
+KLIBC_FETCHDIR = "Testing"
+FILESPATHPKG =. "klibc-${PV}:"
# We only want the static utils. klibc build both. So we install only what we want.
do_install() {
@@ -18,6 +21,7 @@ do_install() {
install -m 755 usr/utils/static/chroot ${D}${base_bindir}
install -m 755 usr/utils/static/cpio ${D}${base_bindir}
install -m 755 usr/utils/static/dd ${D}${base_bindir}
+ install -m 755 usr/utils/static/dmesg ${D}${base_bindir}
install -m 755 usr/utils/static/false ${D}${base_bindir}
install -m 755 usr/utils/static/halt ${D}${base_bindir}
install -m 755 usr/utils/static/kill ${D}${base_bindir}
@@ -33,6 +37,7 @@ do_install() {
install -m 755 usr/utils/static/readlink ${D}${base_bindir}
install -m 755 usr/utils/static/reboot ${D}${base_bindir}
install -m 755 usr/utils/static/sleep ${D}${base_bindir}
+ install -m 755 usr/utils/static/sync ${D}${base_bindir}
install -m 755 usr/utils/static/true ${D}${base_bindir}
install -m 755 usr/utils/static/umount ${D}${base_bindir}
install -m 755 usr/utils/static/uname ${D}${base_bindir}
@@ -51,14 +56,15 @@ PACKAGES = "klibc-utils-static-sh klibc-utils-static-gzip \
klibc-utils-static-resume klibc-utils-static-run-init \
klibc-utils-static-cat klibc-utils-static-chroot \
klibc-utils-static-cpio klibc-utils-static-dd \
- klibc-utils-static-false klibc-utils-static-halt \
- klibc-utils-static-kill \
+ klibc-utils-static-dmesg klibc-utils-static-false \
+ klibc-utils-static-halt klibc-utils-static-kill \
klibc-utils-static-ln klibc-utils-static-minips \
klibc-utils-static-mkdir klibc-utils-static-mkfifo \
klibc-utils-static-mknod klibc-utils-static-mount \
klibc-utils-static-nuke klibc-utils-static-pivot-root \
klibc-utils-static-poweroff klibc-utils-static-readlink \
klibc-utils-static-reboot klibc-utils-static-sleep \
+ klibc-utils-static-sync \
klibc-utils-static-true klibc-utils-static-umount \
klibc-utils-static-uname klibc-utils-static-modprobe \
klibc-utils-static-losetup klibc-utils-static-wc"
@@ -75,6 +81,7 @@ FILES_klibc-utils-static-cat = "${base_bindir}/cat"
FILES_klibc-utils-static-chroot = "${base_bindir}/chroot"
FILES_klibc-utils-static-cpio = "${base_bindir}/cpio"
FILES_klibc-utils-static-dd = "${base_bindir}/dd"
+FILES_klibc-utils-static-dmesg = "${base_bindir}/dmesg"
FILES_klibc-utils-static-false = "${base_bindir}/false"
FILES_klibc-utils-static-halt = "${base_bindir}/halt"
FILES_klibc-utils-static-kill = "${base_bindir}/kill"
@@ -90,6 +97,7 @@ FILES_klibc-utils-static-poweroff = "${base_bindir}/poweroff"
FILES_klibc-utils-static-readlink = "${base_bindir}/readlink"
FILES_klibc-utils-static-reboot = "${base_bindir}/reboot"
FILES_klibc-utils-static-sleep = "${base_bindir}/sleep"
+FILES_klibc-utils-static-sync = "${base_bindir}/sync"
FILES_klibc-utils-static-true = "${base_bindir}/true"
FILES_klibc-utils-static-umount = "${base_bindir}/umount"
FILES_klibc-utils-static-uname = "${base_bindir}/uname"
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..13fe8a2499 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"
+PR = "r2"
+
+KLIBC_FETCHDIR = "Testing"
diff --git a/recipes/klibc/klibc_1.5.15.inc b/recipes/klibc/klibc_1.5.15.inc
index a9cd2f3122..ad7a1e3c9e 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 \
@@ -19,6 +19,7 @@ do_install() {
install -m 755 usr/utils/shared/chroot ${D}${base_bindir}
install -m 755 usr/utils/shared/cpio ${D}${base_bindir}
install -m 755 usr/utils/shared/dd ${D}${base_bindir}
+ install -m 755 usr/utils/shared/dmesg ${D}${base_bindir}
install -m 755 usr/utils/shared/false ${D}${base_bindir}
install -m 755 usr/utils/shared/halt ${D}${base_bindir}
install -m 755 usr/utils/shared/kill ${D}${base_bindir}
@@ -34,6 +35,7 @@ do_install() {
install -m 755 usr/utils/shared/readlink ${D}${base_bindir}
install -m 755 usr/utils/shared/reboot ${D}${base_bindir}
install -m 755 usr/utils/shared/sleep ${D}${base_bindir}
+ install -m 755 usr/utils/shared/sync ${D}${base_bindir}
install -m 755 usr/utils/shared/true ${D}${base_bindir}
install -m 755 usr/utils/shared/umount ${D}${base_bindir}
install -m 755 usr/utils/shared/uname ${D}${base_bindir}
@@ -63,15 +65,16 @@ PACKAGES = "${PN} klibc-utils-sh klibc-utils-kinit \
klibc-utils-nfsmount klibc-utils-resume \
klibc-utils-run-init klibc-utils-cat \
klibc-utils-chroot klibc-utils-cpio \
- klibc-utils-dd klibc-utils-false \
- klibc-utils-halt \
+ klibc-utils-dd klibc-utils-dmesg \
+ klibc-utils-false klibc-utils-halt \
klibc-utils-kill klibc-utils-ln \
klibc-utils-minips klibc-utils-mkdir \
klibc-utils-mkfifo klibc-utils-mknod \
klibc-utils-mount klibc-utils-nuke \
klibc-utils-pivot-root klibc-utils-poweroff \
klibc-utils-readlink klibc-utils-reboot \
- klibc-utils-sleep klibc-utils-true \
+ klibc-utils-sleep \
+ klibc-utils-sync klibc-utils-true \
klibc-utils-umount klibc-utils-uname \
klibc-utils-gzip klibc-utils-modprobe \
klibc-utils-losetup klibc-utils-wc"
@@ -89,6 +92,7 @@ FILES_klibc-utils-cat = "${base_bindir}/cat"
FILES_klibc-utils-chroot = "${base_bindir}/chroot"
FILES_klibc-utils-cpio = "${base_bindir}/cpio"
FILES_klibc-utils-dd = "${base_bindir}/dd"
+FILES_klibc-utils-dmesg = "${base_bindir}/dmesg"
FILES_klibc-utils-false = "${base_bindir}/false"
FILES_klibc-utils-halt = "${base_bindir}/halt"
FILES_klibc-utils-kill = "${base_bindir}/kill"
@@ -104,6 +108,7 @@ FILES_klibc-utils-poweroff = "${base_bindir}/poweroff"
FILES_klibc-utils-readlink = "${base_bindir}/readlink"
FILES_klibc-utils-reboot = "${base_bindir}/reboot"
FILES_klibc-utils-sleep = "${base_bindir}/sleep"
+FILES_klibc-utils-sync = "${base_bindir}/sync"
FILES_klibc-utils-true = "${base_bindir}/true"
FILES_klibc-utils-umount = "${base_bindir}/umount"
FILES_klibc-utils-uname = "${base_bindir}/uname"
@@ -123,6 +128,7 @@ RDEPENDS_klibc-utils-cat = "${PN} (=${PV}-${PR})"
RDEPENDS_klibc-utils-chroot = "${PN} (=${PV}-${PR})"
RDEPENDS_klibc-utils-cpio = "${PN} (=${PV}-${PR})"
RDEPENDS_klibc-utils-dd = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-dmesg = "${PN} (=${PV}-${PR})"
RDEPENDS_klibc-utils-false = "${PN} (=${PV}-${PR})"
RDEPENDS_klibc-utils-halt = "${PN} (=${PV}-${PR})"
RDEPENDS_klibc-utils-kill = "${PN} (=${PV}-${PR})"
@@ -138,6 +144,7 @@ RDEPENDS_klibc-utils-poweroff = "${PN} (=${PV}-${PR})"
RDEPENDS_klibc-utils-readlink = "${PN} (=${PV}-${PR})"
RDEPENDS_klibc-utils-reboot = "${PN} (=${PV}-${PR})"
RDEPENDS_klibc-utils-sleep = "${PN} (=${PV}-${PR})"
+RDEPENDS_klibc-utils-sync = "${PN} (=${PV}-${PR})"
RDEPENDS_klibc-utils-true = "${PN} (=${PV}-${PR})"
RDEPENDS_klibc-utils-umount = "${PN} (=${PV}-${PR})"
RDEPENDS_klibc-utils-uname = "${PN} (=${PV}-${PR})"
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 05:23:38 +0000