* Re: [oe-commits] Andrea Adami : klibc: fix packaging
[not found] <E1OJVCz-0003yI-GC@melo.openembedded.org>
@ 2010-06-01 19:52 ` Martin Jansa
2010-06-01 21:47 ` [PATCH 1/2] Revert "klibc: fix packaging" Martin Jansa
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Martin Jansa @ 2010-06-01 19:52 UTC (permalink / raw)
To: openembedded-devel; +Cc: openembedded-commits
On Tue, Jun 01, 2010 at 05:24:57PM +0000, git version control wrote:
> Module: openembedded.git
> Branch: org.openembedded.dev
> Commit: e020cd9b2c61fd19bb55ec3fd38abcfdbd3f651c
> URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e020cd9b2c61fd19bb55ec3fd38abcfdbd3f651c
>
> Author: Andrea Adami <andrea.adami@gmail.com>
> Date: Tue Jun 1 19:20:59 2010 +0200
>
> 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,
>
> ---
>
> 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(-)
>
> diff --git a/recipes/klibc/klibc-common.inc b/recipes/klibc/klibc-common.inc
> index 7b7a3cb..1f3aab1 100644
> --- a/recipes/klibc/klibc-common.inc
> +++ b/recipes/klibc/klibc-common.inc
> @@ -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'
> diff --git a/recipes/klibc/klibc-utils.inc b/recipes/klibc/klibc-utils.inc
> index 7bbcee3..930eb60 100644
> --- a/recipes/klibc/klibc-utils.inc
> +++ b/recipes/klibc/klibc-utils.inc
> @@ -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"
> diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc
> index 9ae6c5b..8ed976a 100644
> --- a/recipes/klibc/klibc.inc
> +++ b/recipes/klibc/klibc.inc
> @@ -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})"
> diff --git a/recipes/klibc/klibc_1.5.18.bb b/recipes/klibc/klibc_1.5.18.bb
> index 694bf58..7520cad 100644
> --- a/recipes/klibc/klibc_1.5.18.bb
> +++ b/recipes/klibc/klibc_1.5.18.bb
> @@ -1,3 +1,3 @@
> require klibc.inc
> require klibc_${PV}.inc
> -PR = "${INC_PR}.1"
> +PR = "${INC_PR}.2"
> diff --git a/recipes/klibc/klibc_1.5.18.inc b/recipes/klibc/klibc_1.5.18.inc
> index 2175643..cad3bdb 100644
> --- a/recipes/klibc/klibc_1.5.18.inc
> +++ b/recipes/klibc/klibc_1.5.18.inc
> @@ -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"
> diff --git a/recipes/klibc/klibc_1.5.bb b/recipes/klibc/klibc_1.5.bb
> index 4b299f2..694bf58 100644
> --- a/recipes/klibc/klibc_1.5.bb
> +++ b/recipes/klibc/klibc_1.5.bb
> @@ -1,3 +1,3 @@
> require klibc.inc
> require klibc_${PV}.inc
> -PR = "${INC_PR}.0"
> +PR = "${INC_PR}.1"
> diff --git a/recipes/klibc/klibc_1.5.inc b/recipes/klibc/klibc_1.5.inc
> index b00f02c..c8ed5f6 100644
> --- a/recipes/klibc/klibc_1.5.inc
> +++ b/recipes/klibc/klibc_1.5.inc
> @@ -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
> Openembedded-commits@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
--
uin:136542059 jid:Martin.Jansa@gmail.com
Jansa Martin sip:jamasip@voip.wengo.fr
JaMa
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] Revert "klibc: fix packaging"
2010-06-01 19:52 ` [oe-commits] Andrea Adami : klibc: fix packaging Martin Jansa
@ 2010-06-01 21:47 ` Martin Jansa
2010-06-01 22:56 ` Andrea Adami
2010-06-01 21:47 ` [PATCH 2/2] klibc: fix packaging without moving PACKAGES and FILES_ back to recipes Martin Jansa
2010-06-01 23:02 ` [oe-commits] Andrea Adami : klibc: fix packaging Andrea Adami
2 siblings, 1 reply; 8+ messages in thread
From: Martin Jansa @ 2010-06-01 21:47 UTC (permalink / raw)
To: openembedded-devel
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(-)
diff --git a/recipes/klibc/klibc-common.inc b/recipes/klibc/klibc-common.inc
index 1f3aab1..7b7a3cb 100644
--- a/recipes/klibc/klibc-common.inc
+++ b/recipes/klibc/klibc-common.inc
@@ -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'
diff --git a/recipes/klibc/klibc-utils.inc b/recipes/klibc/klibc-utils.inc
index 930eb60..7bbcee3 100644
--- a/recipes/klibc/klibc-utils.inc
+++ b/recipes/klibc/klibc-utils.inc
@@ -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"
diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc
index 8ed976a..9ae6c5b 100644
--- a/recipes/klibc/klibc.inc
+++ b/recipes/klibc/klibc.inc
@@ -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})"
diff --git a/recipes/klibc/klibc_1.5.18.bb b/recipes/klibc/klibc_1.5.18.bb
index 7520cad..694bf58 100644
--- a/recipes/klibc/klibc_1.5.18.bb
+++ b/recipes/klibc/klibc_1.5.18.bb
@@ -1,3 +1,3 @@
require klibc.inc
require klibc_${PV}.inc
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.1"
diff --git a/recipes/klibc/klibc_1.5.18.inc b/recipes/klibc/klibc_1.5.18.inc
index cad3bdb..2175643 100644
--- a/recipes/klibc/klibc_1.5.18.inc
+++ b/recipes/klibc/klibc_1.5.18.inc
@@ -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"
diff --git a/recipes/klibc/klibc_1.5.bb b/recipes/klibc/klibc_1.5.bb
index 694bf58..4b299f2 100644
--- a/recipes/klibc/klibc_1.5.bb
+++ b/recipes/klibc/klibc_1.5.bb
@@ -1,3 +1,3 @@
require klibc.inc
require klibc_${PV}.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
diff --git a/recipes/klibc/klibc_1.5.inc b/recipes/klibc/klibc_1.5.inc
index c8ed5f6..b00f02c 100644
--- a/recipes/klibc/klibc_1.5.inc
+++ b/recipes/klibc/klibc_1.5.inc
@@ -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"
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] klibc: fix packaging without moving PACKAGES and FILES_ back to recipes
2010-06-01 19:52 ` [oe-commits] Andrea Adami : klibc: fix packaging Martin Jansa
2010-06-01 21:47 ` [PATCH 1/2] Revert "klibc: fix packaging" Martin Jansa
@ 2010-06-01 21:47 ` Martin Jansa
2010-06-01 22:59 ` Andrea Adami
2010-06-01 23:02 ` [oe-commits] Andrea Adami : klibc: fix packaging Andrea Adami
2 siblings, 1 reply; 8+ messages in thread
From: Martin Jansa @ 2010-06-01 21:47 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes/klibc/klibc-common.inc | 2 +-
recipes/klibc/klibc-utils.inc | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/recipes/klibc/klibc-common.inc b/recipes/klibc/klibc-common.inc
index 7b7a3cb..5aba9e5 100644
--- a/recipes/klibc/klibc-common.inc
+++ b/recipes/klibc/klibc-common.inc
@@ -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'
diff --git a/recipes/klibc/klibc-utils.inc b/recipes/klibc/klibc-utils.inc
index 7bbcee3..912b774 100644
--- a/recipes/klibc/klibc-utils.inc
+++ b/recipes/klibc/klibc-utils.inc
@@ -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"
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] Revert "klibc: fix packaging"
2010-06-01 21:47 ` [PATCH 1/2] Revert "klibc: fix packaging" Martin Jansa
@ 2010-06-01 22:56 ` Andrea Adami
0 siblings, 0 replies; 8+ messages in thread
From: Andrea Adami @ 2010-06-01 22:56 UTC (permalink / raw)
To: openembedded-devel
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] klibc: fix packaging without moving PACKAGES and FILES_ back to recipes
2010-06-01 21:47 ` [PATCH 2/2] klibc: fix packaging without moving PACKAGES and FILES_ back to recipes Martin Jansa
@ 2010-06-01 22:59 ` Andrea Adami
2010-06-02 5:36 ` Martin Jansa
0 siblings, 1 reply; 8+ messages in thread
From: Andrea Adami @ 2010-06-01 22:59 UTC (permalink / raw)
To: openembedded-devel
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [oe-commits] Andrea Adami : klibc: fix packaging
2010-06-01 19:52 ` [oe-commits] Andrea Adami : klibc: fix packaging Martin Jansa
2010-06-01 21:47 ` [PATCH 1/2] Revert "klibc: fix packaging" Martin Jansa
2010-06-01 21:47 ` [PATCH 2/2] klibc: fix packaging without moving PACKAGES and FILES_ back to recipes Martin Jansa
@ 2010-06-01 23:02 ` Andrea Adami
2 siblings, 0 replies; 8+ messages in thread
From: Andrea Adami @ 2010-06-01 23:02 UTC (permalink / raw)
To: openembedded-devel
Martin
thx for keeping an eye on my commits ;)
I answered the other two mails.
Cheers
Andrea
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] klibc: fix packaging without moving PACKAGES and FILES_ back to recipes
2010-06-01 22:59 ` Andrea Adami
@ 2010-06-02 5:36 ` Martin Jansa
2010-06-02 7:54 ` Koen Kooi
0 siblings, 1 reply; 8+ messages in thread
From: Martin Jansa @ 2010-06-02 5:36 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jun 02, 2010 at 12:59:45AM +0200, Andrea Adami wrote:
> 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,
--
uin:136542059 jid:Martin.Jansa@gmail.com
Jansa Martin sip:jamasip@voip.wengo.fr
JaMa
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] klibc: fix packaging without moving PACKAGES and FILES_ back to recipes
2010-06-02 5:36 ` Martin Jansa
@ 2010-06-02 7:54 ` Koen Kooi
0 siblings, 0 replies; 8+ messages in thread
From: Koen Kooi @ 2010-06-02 7:54 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 02-06-10 07:36, Martin Jansa wrote:
> On Wed, Jun 02, 2010 at 12:59:45AM +0200, Andrea Adami wrote:
>> 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..
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-----
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-06-02 7:58 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <E1OJVCz-0003yI-GC@melo.openembedded.org>
2010-06-01 19:52 ` [oe-commits] Andrea Adami : klibc: fix packaging Martin Jansa
2010-06-01 21:47 ` [PATCH 1/2] Revert "klibc: fix packaging" Martin Jansa
2010-06-01 22:56 ` Andrea Adami
2010-06-01 21:47 ` [PATCH 2/2] klibc: fix packaging without moving PACKAGES and FILES_ back to recipes Martin Jansa
2010-06-01 22:59 ` Andrea Adami
2010-06-02 5:36 ` Martin Jansa
2010-06-02 7:54 ` Koen Kooi
2010-06-01 23:02 ` [oe-commits] Andrea Adami : klibc: fix packaging Andrea Adami
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox