[oe-commits] Andrea Adami : klibc: repackage according to debian naming for libs

git version control git at git.openembedded.org
Wed Jun 15 22:21:08 UTC 2011 

Module: openembedded.git
Branch: org.openembedded.dev
Commit: e16a751548cb72020bdfc33f8c2b03496dbd85e9
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=e16a751548cb72020bdfc33f8c2b03496dbd85e9

Author: Andrea Adami <andrea.adami at gmail.com>
Date:   Thu Jun 16 00:17:42 2011 +0200

klibc: repackage according to debian naming for libs

* RDEPENDS cleanings for the (shared) utils
* bump PR

Signed-off-by: Andrea Adami <andrea.adami at gmail.com>

---

 recipes/klibc/klibc-utils.inc |   39 ++++++++++++++++++++++++++++++++++++
 recipes/klibc/klibc.inc       |    2 +-
 recipes/klibc/klibc_1.5.23.bb |   44 +++-------------------------------------
 3 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/recipes/klibc/klibc-utils.inc b/recipes/klibc/klibc-utils.inc
index c395391..ebe2bc8 100644
--- a/recipes/klibc/klibc-utils.inc
+++ b/recipes/klibc/klibc-utils.inc
@@ -1,6 +1,44 @@
 KLIBC_UTILS_VARIANT ?= "shared"
 KLIBC_UTILS_PKGNAME ?= "klibc-utils"
 
+RDEPENDS_klibc-utils-sh = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-kinit = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-fstype = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-ipconfig = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-nfsmount = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-resume = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-run-init = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-cat = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-chroot = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-cpio = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-dd = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-dmesg = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-false = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-halt = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-insmod = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-kill = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-ln = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-losetup = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-ls = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-minips = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-mkdir = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-mkfifo = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-mknod = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-modprobe = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-mount = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-mv = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-nuke = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-pivot-root = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-poweroff = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-readlink = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-reboot = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-sleep = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-sync = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-true = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-umount = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-uname = "${THIS_KLIBC}"
+RDEPENDS_klibc-utils-wc = "${THIS_KLIBC}"
+
 # modprobe and losetup go to ${base_sbindir}
 
 do_install_append() {
@@ -120,3 +158,4 @@ FILES_${KLIBC_UTILS_PKGNAME}-true = "${base_bindir}/true"
 FILES_${KLIBC_UTILS_PKGNAME}-umount = "${base_bindir}/umount"
 FILES_${KLIBC_UTILS_PKGNAME}-uname = "${base_bindir}/uname"
 FILES_${KLIBC_UTILS_PKGNAME}-wc = "${base_bindir}/wc"
+
diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc
index e5350a5..4ad72f4 100644
--- a/recipes/klibc/klibc.inc
+++ b/recipes/klibc/klibc.inc
@@ -10,7 +10,7 @@ LICENSE = "BSD-ADV"
 # (was PACKAGE_ARCH = "${MACHINE_ARCH}")
 MACH_STAGING_KERNEL_DIR = "${STAGING_DIR}/${MACHINE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 KLIBC_ARCH = '${TARGET_ARCH}'
 KLIBC_ARCH_armeb = 'arm'
diff --git a/recipes/klibc/klibc_1.5.23.bb b/recipes/klibc/klibc_1.5.23.bb
index 308d3c9..d6c0d96 100644
--- a/recipes/klibc/klibc_1.5.23.bb
+++ b/recipes/klibc/klibc_1.5.23.bb
@@ -25,9 +25,9 @@ do_install() {
 
 }
 
-PACKAGES = "${PN} ${PN}-dev"
-FILES_${PN} = "${base_libdir}/klibc-*.so"
-FILES_${PN}-dev = "${base_libdir}/klibc.so \
+PACKAGES = "libklibc libklibc-dev"
+FILES_libklibc = "${base_libdir}/klibc-*.so"
+FILES_libklibc-dev = "${base_libdir}/klibc.so \
                    ${base_libdir}/klibc/lib/* \
                    ${base_libdir}/klibc/include/* \
 # see above
@@ -36,43 +36,7 @@ FILES_${PN}-dev = "${base_libdir}/klibc.so \
                   "
 
 # Yes we want exactly the klibc that was compiled with the utils
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-sh = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-kinit = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-fstype = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-ipconfig = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-nfsmount = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-resume = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-run-init = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-cat = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-chroot = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-cpio = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-dd = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-dmesg = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-false = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-halt = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-insmod = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-kill = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-ln = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-losetup = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-ls = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-minips = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-mkdir = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-mkfifo = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-mknod = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-modprobe = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-mount = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-mv = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-nuke = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-pivot-root = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-poweroff = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-readlink = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-reboot = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-sleep = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-sync = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-true = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-umount = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-uname = "${PN} (= ${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-wc = "${PN} (= ${PV}-${PR})"
+THIS_KLIBC = "libklibc (= ${PV}-${PR})"
 
 require klibc-utils.inc
 require klibc.inc

More information about the Openembedded-commits mailing list