Andrea Adami : klibc: fix packaging

oe-commits In review Martin Jansa 3 participants 8 messages Jun 1, 2010 – Jun 2, 2010 1 message not in the archive

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Martin Jansa

author

2010-06-01 19:57 UTC #1 lore raw

Quoted 8 lines · git version control

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

Author: Andrea Adami <[email protected]>
Date:   Tue Jun  1 19:20:59 2010 +0200

Quoted 6 lines

klibc: fix packaging
* insmod was removed after klibc_1.5
* dmesg, sync and ls have been added with 1.5.15
* wc and losetup are provided by OpenEmbedded patches
* bump INC_PR and recipe's PR to propagate the changes to klibc-utils

Why this change?

definition of extra PACKAGES and corresponding FILES_ won't harm, except showing NOTE about not creating empty package ie klibc-utils-ls.

That's why I moved all definitions to one place (klibc-utils.inc) and only do_install for utils not available in _all_ versions were in do_install_append for particular version as described in that comment now removed, and described in cleaning commit
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=7f2c3321e5eb78d70d9ab0a38caccb4fb3911eeb
* reuse as much .inc as possible
* added klibc-utils.inc with common do_install_append for installing all
* utils added PACKAGES + FILES variables for them (union for all klibc versions).

I won't NACK this, but I'm not happy about this change (needs to copy duplicite stuff _again_ for all versions newer then 1.5.18 which I would expect will have ls/sync/dmesg..

Regards,

Quoted 162 lines

---

 recipes/klibc/klibc-common.inc |    2 +-
 recipes/klibc/klibc-utils.inc  |   18 +-----------------
 recipes/klibc/klibc.inc        |    4 ++--
 recipes/klibc/klibc_1.5.18.bb  |    2 +-
 recipes/klibc/klibc_1.5.18.inc |    8 ++++++++
 recipes/klibc/klibc_1.5.bb     |    2 +-
 recipes/klibc/klibc_1.5.inc    |    3 +++
 7 files changed, 17 insertions(+), 22 deletions(-)

recipes/klibc/klibc-common.inc +1 -1

index 7b7a3cb..1f3aab1 100644
@@ -9,7 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/${KLIBC_FETCHDIR}/klibc-${PV
 
 S = "${WORKDIR}/klibc-${PV}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-INC_PR = "r14"
+INC_PR = "r15"
 
 KLIBC_ARCH = '${TARGET_ARCH}'
 KLIBC_ARCH_armeb = 'arm'

recipes/klibc/klibc-utils.inc +1 ~~-17~~

index 7bbcee3..930eb60 100644
@@ -40,16 +40,6 @@ do_install_append() {
         ln -s gzip ${D}${base_bindir}/zcat
 }
 
-# only in 1.5
-# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/insmod ${D}${base_bindir}
-
-# only in >= 1.5.15
-# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir}
-# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir}
-
-# only in >= 1.5.15+1.5.16
-# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir}
-
 PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \
              ${KLIBC_UTILS_PKGNAME}-gzip \
              ${KLIBC_UTILS_PKGNAME}-kinit \

@@ -62,7 +52,6 @@ PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \
              ${KLIBC_UTILS_PKGNAME}-chroot \
              ${KLIBC_UTILS_PKGNAME}-cpio \
              ${KLIBC_UTILS_PKGNAME}-dd \
-             ${KLIBC_UTILS_PKGNAME}-dmesg \
              ${KLIBC_UTILS_PKGNAME}-false \
              ${KLIBC_UTILS_PKGNAME}-halt \
              ${KLIBC_UTILS_PKGNAME}-kill \

@@ -78,14 +67,12 @@ PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \
              ${KLIBC_UTILS_PKGNAME}-readlink \
              ${KLIBC_UTILS_PKGNAME}-reboot \
              ${KLIBC_UTILS_PKGNAME}-sleep \
-             ${KLIBC_UTILS_PKGNAME}-sync \
              ${KLIBC_UTILS_PKGNAME}-true \
              ${KLIBC_UTILS_PKGNAME}-umount \
              ${KLIBC_UTILS_PKGNAME}-uname \
              ${KLIBC_UTILS_PKGNAME}-modprobe \
              ${KLIBC_UTILS_PKGNAME}-losetup \
-             ${KLIBC_UTILS_PKGNAME}-wc \
-             ${KLIBC_UTILS_PKGNAME}-ls"
+             ${KLIBC_UTILS_PKGNAME}-wc"
 
 FILES_${KLIBC_UTILS_PKGNAME}-sh = "${base_bindir}/sh"
 FILES_${KLIBC_UTILS_PKGNAME}-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat"

@@ -99,7 +86,6 @@ FILES_${KLIBC_UTILS_PKGNAME}-cat = "${base_bindir}/cat"
 FILES_${KLIBC_UTILS_PKGNAME}-chroot = "${base_bindir}/chroot"
 FILES_${KLIBC_UTILS_PKGNAME}-cpio = "${base_bindir}/cpio"
 FILES_${KLIBC_UTILS_PKGNAME}-dd = "${base_bindir}/dd"
-FILES_${KLIBC_UTILS_PKGNAME}-dmesg = "${base_bindir}/dmesg"
 FILES_${KLIBC_UTILS_PKGNAME}-false = "${base_bindir}/false"
 FILES_${KLIBC_UTILS_PKGNAME}-halt = "${base_bindir}/halt"
 FILES_${KLIBC_UTILS_PKGNAME}-kill = "${base_bindir}/kill"

@@ -115,11 +101,9 @@ FILES_${KLIBC_UTILS_PKGNAME}-poweroff = "${base_bindir}/poweroff"
 FILES_${KLIBC_UTILS_PKGNAME}-readlink = "${base_bindir}/readlink"
 FILES_${KLIBC_UTILS_PKGNAME}-reboot = "${base_bindir}/reboot"
 FILES_${KLIBC_UTILS_PKGNAME}-sleep = "${base_bindir}/sleep"
-FILES_${KLIBC_UTILS_PKGNAME}-sync = "${base_bindir}/sync"
 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}-modprobe = "${base_sbindir}/modprobe"
 FILES_${KLIBC_UTILS_PKGNAME}-losetup = "${base_bindir}/losetup"
 FILES_${KLIBC_UTILS_PKGNAME}-wc = "${base_bindir}/wc"
-FILES_${KLIBC_UTILS_PKGNAME}-ls = "${base_bindir}/ls"

recipes/klibc/klibc.inc +2 -2

index 9ae6c5b..8ed976a 100644
@@ -37,9 +37,10 @@ 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}-insmod = "${PN} (=${PV}-${PR})"
 RDEPENDS_${KLIBC_UTILS_PKGNAME}-ln = "${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})"

@@ -58,4 +59,3 @@ RDEPENDS_${KLIBC_UTILS_PKGNAME}-uname = "${PN} (=${PV}-${PR})"
 RDEPENDS_${KLIBC_UTILS_PKGNAME}-modprobe = "${PN} (=${PV}-${PR})"
 RDEPENDS_${KLIBC_UTILS_PKGNAME}-losetup = "${PN} (=${PV}-${PR})"
 RDEPENDS_${KLIBC_UTILS_PKGNAME}-wc = "${PN} (=${PV}-${PR})"
-RDEPENDS_${KLIBC_UTILS_PKGNAME}-ls = "${PN} (=${PV}-${PR})"

recipes/klibc/klibc_1.5.18.bb +1 -1

index 694bf58..7520cad 100644
@@ -1,3 +1,3 @@
 require klibc.inc
 require klibc_${PV}.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"

recipes/klibc/klibc_1.5.18.inc +8 -0

index 2175643..cad3bdb 100644
@@ -42,3 +42,11 @@ do_install_append() {
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir}
 }
+
+PACKAGES += "${KLIBC_UTILS_PKGNAME}-dmesg \
+             ${KLIBC_UTILS_PKGNAME}-sync \
+             ${KLIBC_UTILS_PKGNAME}-ls"
+
+FILES_${KLIBC_UTILS_PKGNAME}-dmesg = "${base_bindir}/dmesg"
+FILES_${KLIBC_UTILS_PKGNAME}-sync = "${base_bindir}/sync"
+FILES_${KLIBC_UTILS_PKGNAME}-ls = "${base_bindir}/ls"

recipes/klibc/klibc_1.5.bb +1 -1

index 4b299f2..694bf58 100644
@@ -1,3 +1,3 @@
 require klibc.inc
 require klibc_${PV}.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"

recipes/klibc/klibc_1.5.inc +3 -0

index b00f02c..c8ed5f6 100644
@@ -17,3 +17,6 @@ SRC_URI[sha256sum] = "27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba627
 do_install_append() {
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/insmod ${D}${base_bindir}
 }
+
+PACKAGES += "${KLIBC_UTILS_PKGNAME}-insmod"
+FILES_${KLIBC_UTILS_PKGNAME}-insmod = "${base_bindir}/insmod"

_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

Signature · 3 lines

uin:136542059                jid:[email protected]
Jansa Martin                 sip:[email protected] 
JaMa

Martin Jansa

author

2010-06-01 21:52 UTC #2 lore raw

PATCH 1/2 Revert "klibc: fix packaging"

This reverts commit e020cd9b2c61fd19bb55ec3fd38abcfdbd3f651c.

---
 recipes/klibc/klibc-common.inc |    2 +-
 recipes/klibc/klibc-utils.inc  |   18 +++++++++++++++++-
 recipes/klibc/klibc.inc        |    4 ++--
 recipes/klibc/klibc_1.5.18.bb  |    2 +-
 recipes/klibc/klibc_1.5.18.inc |    8 --------
 recipes/klibc/klibc_1.5.bb     |    2 +-
 recipes/klibc/klibc_1.5.inc    |    3 ---
 7 files changed, 22 insertions(+), 17 deletions(-)

recipes/klibc/klibc-common.inc +1 -1

index 1f3aab1..7b7a3cb 100644
@@ -9,7 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/${KLIBC_FETCHDIR}/klibc-${PV
 
 S = "${WORKDIR}/klibc-${PV}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-INC_PR = "r15"
+INC_PR = "r14"
 
 KLIBC_ARCH = '${TARGET_ARCH}'
 KLIBC_ARCH_armeb = 'arm'

recipes/klibc/klibc-utils.inc +17 -1

index 930eb60..7bbcee3 100644
@@ -40,6 +40,16 @@ do_install_append() {
         ln -s gzip ${D}${base_bindir}/zcat
 }
 
+# only in 1.5
+# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/insmod ${D}${base_bindir}
+
+# only in >= 1.5.15
+# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir}
+# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir}
+
+# only in >= 1.5.15+1.5.16
+# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir}
+
 PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \
              ${KLIBC_UTILS_PKGNAME}-gzip \
              ${KLIBC_UTILS_PKGNAME}-kinit \

@@ -52,6 +62,7 @@ PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \
              ${KLIBC_UTILS_PKGNAME}-chroot \
              ${KLIBC_UTILS_PKGNAME}-cpio \
              ${KLIBC_UTILS_PKGNAME}-dd \
+             ${KLIBC_UTILS_PKGNAME}-dmesg \
              ${KLIBC_UTILS_PKGNAME}-false \
              ${KLIBC_UTILS_PKGNAME}-halt \
              ${KLIBC_UTILS_PKGNAME}-kill \

@@ -67,12 +78,14 @@ PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \
              ${KLIBC_UTILS_PKGNAME}-readlink \
              ${KLIBC_UTILS_PKGNAME}-reboot \
              ${KLIBC_UTILS_PKGNAME}-sleep \
+             ${KLIBC_UTILS_PKGNAME}-sync \
              ${KLIBC_UTILS_PKGNAME}-true \
              ${KLIBC_UTILS_PKGNAME}-umount \
              ${KLIBC_UTILS_PKGNAME}-uname \
              ${KLIBC_UTILS_PKGNAME}-modprobe \
              ${KLIBC_UTILS_PKGNAME}-losetup \
-             ${KLIBC_UTILS_PKGNAME}-wc"
+             ${KLIBC_UTILS_PKGNAME}-wc \
+             ${KLIBC_UTILS_PKGNAME}-ls"
 
 FILES_${KLIBC_UTILS_PKGNAME}-sh = "${base_bindir}/sh"
 FILES_${KLIBC_UTILS_PKGNAME}-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat"

@@ -86,6 +99,7 @@ FILES_${KLIBC_UTILS_PKGNAME}-cat = "${base_bindir}/cat"
 FILES_${KLIBC_UTILS_PKGNAME}-chroot = "${base_bindir}/chroot"
 FILES_${KLIBC_UTILS_PKGNAME}-cpio = "${base_bindir}/cpio"
 FILES_${KLIBC_UTILS_PKGNAME}-dd = "${base_bindir}/dd"
+FILES_${KLIBC_UTILS_PKGNAME}-dmesg = "${base_bindir}/dmesg"
 FILES_${KLIBC_UTILS_PKGNAME}-false = "${base_bindir}/false"
 FILES_${KLIBC_UTILS_PKGNAME}-halt = "${base_bindir}/halt"
 FILES_${KLIBC_UTILS_PKGNAME}-kill = "${base_bindir}/kill"

@@ -101,9 +115,11 @@ FILES_${KLIBC_UTILS_PKGNAME}-poweroff = "${base_bindir}/poweroff"
 FILES_${KLIBC_UTILS_PKGNAME}-readlink = "${base_bindir}/readlink"
 FILES_${KLIBC_UTILS_PKGNAME}-reboot = "${base_bindir}/reboot"
 FILES_${KLIBC_UTILS_PKGNAME}-sleep = "${base_bindir}/sleep"
+FILES_${KLIBC_UTILS_PKGNAME}-sync = "${base_bindir}/sync"
 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}-modprobe = "${base_sbindir}/modprobe"
 FILES_${KLIBC_UTILS_PKGNAME}-losetup = "${base_bindir}/losetup"
 FILES_${KLIBC_UTILS_PKGNAME}-wc = "${base_bindir}/wc"
+FILES_${KLIBC_UTILS_PKGNAME}-ls = "${base_bindir}/ls"

recipes/klibc/klibc.inc +2 -2

index 8ed976a..9ae6c5b 100644
@@ -37,10 +37,9 @@ 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}-kill = "${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}-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})"

@@ -59,3 +58,4 @@ RDEPENDS_${KLIBC_UTILS_PKGNAME}-uname = "${PN} (=${PV}-${PR})"
 RDEPENDS_${KLIBC_UTILS_PKGNAME}-modprobe = "${PN} (=${PV}-${PR})"
 RDEPENDS_${KLIBC_UTILS_PKGNAME}-losetup = "${PN} (=${PV}-${PR})"
 RDEPENDS_${KLIBC_UTILS_PKGNAME}-wc = "${PN} (=${PV}-${PR})"
+RDEPENDS_${KLIBC_UTILS_PKGNAME}-ls = "${PN} (=${PV}-${PR})"

recipes/klibc/klibc_1.5.18.bb +1 -1

index 7520cad..694bf58 100644
@@ -1,3 +1,3 @@
 require klibc.inc
 require klibc_${PV}.inc
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.1"

recipes/klibc/klibc_1.5.18.inc +0 -8

index cad3bdb..2175643 100644
@@ -42,11 +42,3 @@ do_install_append() {
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir}
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir}
 }
-
-PACKAGES += "${KLIBC_UTILS_PKGNAME}-dmesg \
-             ${KLIBC_UTILS_PKGNAME}-sync \
-             ${KLIBC_UTILS_PKGNAME}-ls"
-
-FILES_${KLIBC_UTILS_PKGNAME}-dmesg = "${base_bindir}/dmesg"
-FILES_${KLIBC_UTILS_PKGNAME}-sync = "${base_bindir}/sync"
-FILES_${KLIBC_UTILS_PKGNAME}-ls = "${base_bindir}/ls"

recipes/klibc/klibc_1.5.bb +1 -1

index 694bf58..4b299f2 100644
@@ -1,3 +1,3 @@
 require klibc.inc
 require klibc_${PV}.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"

recipes/klibc/klibc_1.5.inc +0 -3

index c8ed5f6..b00f02c 100644
@@ -17,6 +17,3 @@ SRC_URI[sha256sum] = "27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba627
 do_install_append() {
         install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/insmod ${D}${base_bindir}
 }
-
-PACKAGES += "${KLIBC_UTILS_PKGNAME}-insmod"
-FILES_${KLIBC_UTILS_PKGNAME}-insmod = "${base_bindir}/insmod"

Signature · 1 line

1.7.1

Andrea Adami

2010-06-01 23:01 UTC #3 lore raw

Re: [PATCH 1/2] Revert "klibc: fix packaging"

Martin,

apart the notes building klibc_1.5 [1], I think it is better to package the version-specific bits separately, but don't have strong opinion on this, being klibc_1.5 is very old (still the latest stable, though).

Andrea

[1]
NOTE: Legacy staging mode for /oe/openembedded/recipes/klibc/klibc_1.5.bb
NOTE: the following files were installed but not shipped in any package:
NOTE: /bin/insmod
...
NOTE: Not creating empty archive for klibc-utils-dmesg-1.5-r14.0.5
...
NOTE: Not creating empty archive for klibc-utils-sync-1.5-r14.0.5
...
NOTE: Not creating empty archive for klibc-utils-ls-1.5-r14.0.5
NOTE: package klibc-1.5-r14.0: task do_package_write_ipk: Succeeded

Martin Jansa

author

2010-06-01 21:52 UTC #4 lore raw

PATCH 2/2 klibc: fix packaging without moving PACKAGES and FILES_ back to recipes

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 recipes/klibc/klibc-common.inc |    2 +-
 recipes/klibc/klibc-utils.inc  |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

recipes/klibc/klibc-common.inc +1 -1

index 7b7a3cb..5aba9e5 100644
@@ -9,7 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/${KLIBC_FETCHDIR}/klibc-${PV
 
 S = "${WORKDIR}/klibc-${PV}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-INC_PR = "r14"
+INC_PR = "r16"
 
 KLIBC_ARCH = '${TARGET_ARCH}'
 KLIBC_ARCH_armeb = 'arm'

recipes/klibc/klibc-utils.inc +3 -3

index 7bbcee3..912b774 100644
@@ -43,11 +43,9 @@ do_install_append() {
 # only in 1.5
 # install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/insmod ${D}${base_bindir}
 
-# only in >= 1.5.15
+# only in >= 1.5.18 (can be moved to do_install_append above as soon as klibc_1.5 is dropped from tree)
 # install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir}
 # install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir}
-
-# only in >= 1.5.15+1.5.16
 # install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir}
 
 PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \

@@ -85,6 +83,7 @@ PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \
              ${KLIBC_UTILS_PKGNAME}-modprobe \
              ${KLIBC_UTILS_PKGNAME}-losetup \
              ${KLIBC_UTILS_PKGNAME}-wc \
+             ${KLIBC_UTILS_PKGNAME}-insmod \
              ${KLIBC_UTILS_PKGNAME}-ls"
 
 FILES_${KLIBC_UTILS_PKGNAME}-sh = "${base_bindir}/sh"

@@ -122,4 +121,5 @@ FILES_${KLIBC_UTILS_PKGNAME}-uname = "${base_bindir}/uname"
 FILES_${KLIBC_UTILS_PKGNAME}-modprobe = "${base_sbindir}/modprobe"
 FILES_${KLIBC_UTILS_PKGNAME}-losetup = "${base_bindir}/losetup"
 FILES_${KLIBC_UTILS_PKGNAME}-wc = "${base_bindir}/wc"
+FILES_${KLIBC_UTILS_PKGNAME}-insmod = "${base_bindir}/insmod"
 FILES_${KLIBC_UTILS_PKGNAME}-ls = "${base_bindir}/ls"

Signature · 1 line

1.7.1

Andrea Adami

2010-06-01 23:04 UTC #5 lore raw

Re: [PATCH 2/2] klibc: fix packaging without moving PACKAGES and FILES_ back to recipes

Martin,

building klibc_1.5 we have the same
NOTE: Not creating empty archive for (dmesg,sync,ls)

and building 1.5.18
NOTE: Not creating empty archive for klibc-utils-insmod-1.5.18-r14.1.5

If you prefer to warn the user that it's version lacks those packages, ok. At first I saw them as packaging quirks in this case.
Again, no strong opinion :)

Any other advice?

Regards

Andrea

Martin Jansa

author

2010-06-02 05:40 UTC #6 lore raw

Re: [PATCH 2/2] klibc: fix packaging without moving PACKAGES and FILES_ back to recipes

Quoted 11 lines · Andrea Adami

Martin,
building klibc_1.5 we have the same
NOTE: Not creating empty archive for (dmesg,sync,ls)
and building 1.5.18
NOTE: Not creating empty archive for klibc-utils-insmod-1.5.18-r14.1.5
If you prefer to warn the user that it's version lacks those packages, ok. At first I saw them as packaging quirks in this case.
Again, no strong opinion :)

Then it's 1:1 :), someone else with some opinion?

My point is that I see "Not creating empty archive" as harmless warning about me using version not providing some files which some other version does and this message I see quite often during builds..

Regards,

Signature · 3 lines

uin:136542059                jid:[email protected]
Jansa Martin                 sip:[email protected] 
JaMa

Koen Kooi

2010-06-02 07:58 UTC #7 lore raw

Re: [PATCH 2/2] klibc: fix packaging without moving PACKAGES and FILES_ back to recipes

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 13 lines · Martin Jansa

Quoted 11 lines · Andrea Adami
Martin,
building klibc_1.5 we have the same
NOTE: Not creating empty archive for (dmesg,sync,ls)
and building 1.5.18
NOTE: Not creating empty archive for klibc-utils-insmod-1.5.18-r14.1.5
If you prefer to warn the user that it's version lacks those packages, ok. At first I saw them as packaging quirks in this case.
Again, no strong opinion :)

Quoted 5 lines

Then it's 1:1 :), someone else with some opinion?
My point is that I see "Not creating empty archive" as harmless warning about me using version not providing some files which some other version does and this message I see quite often during builds..

I agree with Martin on the empty archive stuff.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMBg46MkyGM64RGpERAmRkAJ91di7/Ldejnf+ZnfYNFHI+0jnnLACgiXbL sBCVkM8bXOvkvuJ9VYFXjNI=
=lBzP
-----END PGP SIGNATURE-----

Andrea Adami

2010-06-01 23:06 UTC #8 lore raw

In reply to Martin Jansa

Martin
thx for keeping an eye on my commits ;)

I answered the other two mails.

Cheers

Andrea