[oe-commits] Andrea Adami : klibc: reorganize recipes and patches (use FILESPATHPKG)
git version control
git at git.openembedded.org
Thu Aug 6 22:52:13 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 55bf476027b34eb910f98e6d88f97768342920eb
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=55bf476027b34eb910f98e6d88f97768342920eb
Author: Andrea Adami <andrea.adami at gmail.com>
Date: Fri Aug 7 00:50:18 2009 +0200
klibc: reorganize recipes and patches (use FILESPATHPKG)
---
.../fstype-sane-vfat-and-jffs2-for-1.5.patch | 0
.../klibc/{files => klibc-1.5.15}/modprobe.patch | 0
.../klibc/{files => klibc-1.5.15}/staging.patch | 0
recipes/klibc/{files => klibc-1.5.15}/wc.patch | 0
recipes/klibc/klibc-common.inc | 4 +-
recipes/klibc/klibc-common_1.5.15.inc | 42 --------------------
recipes/klibc/klibc-utils-static_1.5.15.bb | 5 ++-
recipes/klibc/klibc-utils-static_1.5.bb | 3 +
recipes/klibc/klibc_1.5.15.bb | 2 +
recipes/klibc/klibc_1.5.15.inc | 2 +-
recipes/klibc/klibc_1.5.bb | 4 +-
recipes/klibc/{klibc.inc => klibc_1.5.inc} | 0
12 files changed, 16 insertions(+), 46 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
similarity index 100%
rename from recipes/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch
rename to 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
similarity index 100%
rename from recipes/klibc/files/modprobe.patch
rename to 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
similarity index 100%
rename from recipes/klibc/files/staging.patch
rename to 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
similarity index 100%
rename from recipes/klibc/files/wc.patch
rename to recipes/klibc/klibc-1.5.15/wc.patch
diff --git a/recipes/klibc/klibc-common.inc b/recipes/klibc/klibc-common.inc
index ff67450..b66bc61 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 58ed99a..0000000
--- 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 5717886..3fff9b8 100644
--- a/recipes/klibc/klibc-utils-static_1.5.15.bb
+++ b/recipes/klibc/klibc-utils-static_1.5.15.bb
@@ -1,7 +1,10 @@
-require klibc-common_1.5.15.inc
+require klibc-common.inc
PR = "r1"
+KLIBC_FETCHDIR = "Testing"
+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-utils-static_1.5.bb b/recipes/klibc/klibc-utils-static_1.5.bb
index c89def5..a4e31de 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 aae3e60..e665874 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"
+
+KLIBC_FETCHDIR = "Testing"
diff --git a/recipes/klibc/klibc_1.5.15.inc b/recipes/klibc/klibc_1.5.15.inc
index a9cd2f3..e8967f5 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 \
diff --git a/recipes/klibc/klibc_1.5.bb b/recipes/klibc/klibc_1.5.bb
index a607aa8..3dd4d64 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
similarity index 100%
rename from recipes/klibc/klibc.inc
rename to recipes/klibc/klibc_1.5.inc
More information about the Openembedded-commits
mailing list