* [PATCH 1/3] procps: Complement update-alternatives scope
@ 2018-04-20 14:09 Niko Mauno
2018-04-20 14:09 ` [PATCH 2/3] e2fsprogs: " Niko Mauno
2018-04-20 14:09 ` [PATCH 3/3] mtd-utils: " Niko Mauno
0 siblings, 2 replies; 6+ messages in thread
From: Niko Mauno @ 2018-04-20 14:09 UTC (permalink / raw)
To: openembedded-core
Avoid collision of propcs provided w binary with BusyBox-provided
applet in case both are installed to same rootfs, by adding w to
update-alternatives scope via bindir_progs variable
Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
---
meta/recipes-extended/procps/procps_3.3.12.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/procps/procps_3.3.12.bb b/meta/recipes-extended/procps/procps_3.3.12.bb
index 99e43c5349..ecf215fecf 100644
--- a/meta/recipes-extended/procps/procps_3.3.12.bb
+++ b/meta/recipes-extended/procps/procps_3.3.12.bb
@@ -42,7 +42,7 @@ do_install_append () {
CONFFILES_${PN} = "${sysconfdir}/sysctl.conf"
-bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime"
+bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime w"
base_bindir_progs += "kill pidof ps watch"
base_sbindir_progs += "sysctl"
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] e2fsprogs: Complement update-alternatives scope
2018-04-20 14:09 [PATCH 1/3] procps: Complement update-alternatives scope Niko Mauno
@ 2018-04-20 14:09 ` Niko Mauno
2018-05-03 12:56 ` Burton, Ross
2018-04-20 14:09 ` [PATCH 3/3] mtd-utils: " Niko Mauno
1 sibling, 1 reply; 6+ messages in thread
From: Niko Mauno @ 2018-04-20 14:09 UTC (permalink / raw)
To: openembedded-core
Avoid collision of e2fsprogs provided tune2fs, mke2fs and mkfs.ext2
commands with corresponding BusyBox provided applets in case both
packages are installed to same rootfs, by adding these commands to
update-alternatives scope
Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
---
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
index 56abb3b5d3..cda432460f 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
@@ -100,6 +100,13 @@ ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs"
ALTERNATIVE_${PN}-doc = "fsck.8"
ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8"
+ALTERNATIVE_${PN}-tune2fs = "tune2fs"
+ALTERNATIVE_LINK_NAME[tune2fs] = "${base_sbindir}/tune2fs"
+
+ALTERNATIVE_${PN}-mke2fs = "mke2fs mkfs.ext2"
+ALTERNATIVE_LINK_NAME[mke2fs] = "${base_sbindir}/mke2fs"
+ALTERNATIVE_LINK_NAME[mkfs.ext2] = "${base_sbindir}/mkfs.ext2"
+
RDEPENDS_${PN}-ptest += "${PN} ${PN}-tune2fs coreutils procps bash"
do_compile_ptest() {
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] mtd-utils: Complement update-alternatives scope
2018-04-20 14:09 [PATCH 1/3] procps: Complement update-alternatives scope Niko Mauno
2018-04-20 14:09 ` [PATCH 2/3] e2fsprogs: " Niko Mauno
@ 2018-04-20 14:09 ` Niko Mauno
1 sibling, 0 replies; 6+ messages in thread
From: Niko Mauno @ 2018-04-20 14:09 UTC (permalink / raw)
To: openembedded-core
Avoid collision of mtd-utils and mtd-utils-ubifs provided binaries
with identically named BusyBox provided applets in case packages
are installed to same rootfs, by adding relevant binaries to
update-alternatives scope
Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
---
meta/recipes-devtools/mtd/mtd-utils_git.bb | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb
index d09d633022..f50a42cf0e 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
@@ -28,10 +28,27 @@ CPPFLAGS_append_riscv64 = " -pthread -D_REENTRANT"
EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} ${@bb.utils.contains('PACKAGECONFIG', 'xattr', '', '-DWITHOUT_XATTR', d)} -I${S}/include' 'BUILDDIR=${S}'"
-ALTERNATIVE_${PN} = "flash_eraseall"
+# Use higher priority than corresponding BusyBox-provided applets
+ALTERNATIVE_PRIORITY = "100"
+
+ALTERNATIVE_${PN} = "flashcp flash_eraseall flash_lock flash_unlock nanddump nandwrite"
+ALTERNATIVE_${PN}-ubifs = "ubiattach ubidetach ubimkvol ubirename ubirmvol ubirsvol ubiupdatevol"
+
+ALTERNATIVE_LINK_NAME[flash_eraseall] = "${sbindir}/flash_eraseall"
+ALTERNATIVE_LINK_NAME[nandwrite] = "${sbindir}/nandwrite"
+ALTERNATIVE_LINK_NAME[nanddump] = "${sbindir}/nanddump"
+ALTERNATIVE_LINK_NAME[ubiattach] = "${sbindir}/ubiattach"
+ALTERNATIVE_LINK_NAME[ubiattach] = "${sbindir}/ubiattach"
+ALTERNATIVE_LINK_NAME[ubidetach] = "${sbindir}/ubidetach"
+ALTERNATIVE_LINK_NAME[ubimkvol] = "${sbindir}/ubimkvol"
+ALTERNATIVE_LINK_NAME[ubirename] = "${sbindir}/ubirename"
+ALTERNATIVE_LINK_NAME[ubirmvol] = "${sbindir}/ubirmvol"
+ALTERNATIVE_LINK_NAME[ubirsvol] = "${sbindir}/ubirsvol"
+ALTERNATIVE_LINK_NAME[ubiupdatevol] = "${sbindir}/ubiupdatevol"
ALTERNATIVE_LINK_NAME[flash_eraseall] = "${sbindir}/flash_eraseall"
-# Use higher priority than busybox's flash_eraseall (created when built with CONFIG_FLASH_ERASEALL)
-ALTERNATIVE_PRIORITY[flash_eraseall] = "100"
+ALTERNATIVE_LINK_NAME[flash_lock] = "${sbindir}/flash_lock"
+ALTERNATIVE_LINK_NAME[flash_unlock] = "${sbindir}/flash_unlock"
+ALTERNATIVE_LINK_NAME[flashcp] = "${sbindir}/flashcp"
do_install () {
oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir}
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] e2fsprogs: Complement update-alternatives scope
2018-04-20 14:09 ` [PATCH 2/3] e2fsprogs: " Niko Mauno
@ 2018-05-03 12:56 ` Burton, Ross
2018-05-05 20:05 ` Niko Mauno
2018-05-06 2:55 ` Niko Mauno
0 siblings, 2 replies; 6+ messages in thread
From: Burton, Ross @ 2018-05-03 12:56 UTC (permalink / raw)
To: Niko Mauno; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 2064 bytes --]
Breaks packaging:
packages/corei7-64-poky-linux/e2fsprogs/e2fsprogs-mke2fs: FILELIST: removed
"/sbin/mkfs.ext2 /sbin/mke2fs", added "/sbin/mkfs.ext2.e2fsprogs"
packages/corei7-64-poky-linux/e2fsprogs/e2fsprogs-tune2fs: FILELIST:
removed "/sbin/tune2fs"
packages/corei7-64-poky-linux/e2fsprogs/e2fsprogs: PKGSIZE changed from
419692 to 645500 (+54%)
packages/corei7-64-poky-linux/e2fsprogs/e2fsprogs: FILELIST: added
"/sbin/mke2fs.e2fsprogs /sbin/tune2fs.e2fsprogs"
Ross
On 20 April 2018 at 15:09, Niko Mauno <niko.mauno@vaisala.com> wrote:
> Avoid collision of e2fsprogs provided tune2fs, mke2fs and mkfs.ext2
> commands with corresponding BusyBox provided applets in case both
> packages are installed to same rootfs, by adding these commands to
> update-alternatives scope
>
> Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
> ---
> meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
> b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
> index 56abb3b5d3..cda432460f 100644
> --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
> +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
> @@ -100,6 +100,13 @@ ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.
> e2fsprogs"
> ALTERNATIVE_${PN}-doc = "fsck.8"
> ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8"
>
> +ALTERNATIVE_${PN}-tune2fs = "tune2fs"
> +ALTERNATIVE_LINK_NAME[tune2fs] = "${base_sbindir}/tune2fs"
> +
> +ALTERNATIVE_${PN}-mke2fs = "mke2fs mkfs.ext2"
> +ALTERNATIVE_LINK_NAME[mke2fs] = "${base_sbindir}/mke2fs"
> +ALTERNATIVE_LINK_NAME[mkfs.ext2] = "${base_sbindir}/mkfs.ext2"
> +
> RDEPENDS_${PN}-ptest += "${PN} ${PN}-tune2fs coreutils procps bash"
>
> do_compile_ptest() {
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 3359 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] e2fsprogs: Complement update-alternatives scope
2018-05-03 12:56 ` Burton, Ross
@ 2018-05-05 20:05 ` Niko Mauno
2018-05-06 2:55 ` Niko Mauno
1 sibling, 0 replies; 6+ messages in thread
From: Niko Mauno @ 2018-05-05 20:05 UTC (permalink / raw)
To: ross.burton; +Cc: openembedded-core
On 05/03/2018 03:56 PM, Burton, Ross wrote:
> Breaks packaging:
>
> packages/corei7-64-poky-linux/e2fsprogs/e2fsprogs-mke2fs: FILELIST: removed
> "/sbin/mkfs.ext2 /sbin/mke2fs", added "/sbin/mkfs.ext2.e2fsprogs"
> packages/corei7-64-poky-linux/e2fsprogs/e2fsprogs-tune2fs: FILELIST:
> removed "/sbin/tune2fs"
> packages/corei7-64-poky-linux/e2fsprogs/e2fsprogs: PKGSIZE changed from
> 419692 to 645500 (+54%)
> packages/corei7-64-poky-linux/e2fsprogs/e2fsprogs: FILELIST: added
> "/sbin/mke2fs.e2fsprogs /sbin/tune2fs.e2fsprogs"
Thanks, submitted v2: http://lists.openembedded.org/pipermail/openembedded-core/2018-May/150468.html
With v2 I got:
$ buildhistory-diff
packages/i586-poky-linux/e2fsprogs/e2fsprogs-mke2fs: FILELIST: removed "/sbin/mkfs.ext2 /sbin/mke2fs", added "/sbin/mkfs.ext2.e2fsprogs /sbin/mke2fs.e2fsprogs"
* FILES: removed "/sbin/mke2fs", added "/sbin/mke2fs.e2fsprogs"
packages/i586-poky-linux/e2fsprogs/e2fsprogs-mke2fs: RDEPENDS: added "update-alternatives-opkg"
packages/i586-poky-linux/e2fsprogs/e2fsprogs-tune2fs: FILELIST: removed "/sbin/tune2fs", added "/sbin/tune2fs.e2fsprogs"
* FILES: removed "/sbin/tune2fs", added "/sbin/tune2fs.e2fsprogs"
packages/i586-poky-linux/e2fsprogs/e2fsprogs-tune2fs: RDEPENDS: added "update-alternatives-opkg"
packages/i586-poky-linux/e2fsprogs/e2fsprogs-mke2fs: pkg_postinst added:
@@ -0,0 +1 @@
+#!/bin/sh\nset -e\n\tupdate-alternatives --install /sbin/mke2fs mke2fs /sbin/mke2fs.e2fsprogs 100\n\tupdate-alternatives --install /sbin/mkfs.ext2 mkfs.ext2 /sbin/mkfs.ext2.e2fsprogs 100\n
--
packages/i586-poky-linux/e2fsprogs/e2fsprogs-mke2fs: pkg_prerm added:
@@ -0,0 +1 @@
+#!/bin/sh\nset -e\n\tupdate-alternatives --remove mke2fs /sbin/mke2fs.e2fsprogs\n\tupdate-alternatives --remove mkfs.ext2 /sbin/mkfs.ext2.e2fsprogs\n
--
packages/i586-poky-linux/e2fsprogs/e2fsprogs-tune2fs: pkg_postinst added:
@@ -0,0 +1 @@
+#!/bin/sh\nset -e\n\tupdate-alternatives --install /sbin/tune2fs tune2fs /sbin/tune2fs.e2fsprogs 100\n
--
packages/i586-poky-linux/e2fsprogs/e2fsprogs-tune2fs: pkg_prerm added:
@@ -0,0 +1 @@
+#!/bin/sh\nset -e\n\tupdate-alternatives --remove tune2fs /sbin/tune2fs.e2fsprogs\n
--
-Niko
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] e2fsprogs: Complement update-alternatives scope
2018-05-03 12:56 ` Burton, Ross
2018-05-05 20:05 ` Niko Mauno
@ 2018-05-06 2:55 ` Niko Mauno
1 sibling, 0 replies; 6+ messages in thread
From: Niko Mauno @ 2018-05-06 2:55 UTC (permalink / raw)
To: ross.burton; +Cc: openembedded-core
On 05/03/2018 03:56 PM, Burton, Ross wrote:
> Breaks packaging:
Submitted v3 still in which I changed the added 'ALTERNATIVE_${PN}-...' lines to 'ALTERNATIVE_e2fsprogs-...':
http://lists.openembedded.org/pipermail/openembedded-core/2018-May/150471.html
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-05-06 2:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-20 14:09 [PATCH 1/3] procps: Complement update-alternatives scope Niko Mauno
2018-04-20 14:09 ` [PATCH 2/3] e2fsprogs: " Niko Mauno
2018-05-03 12:56 ` Burton, Ross
2018-05-05 20:05 ` Niko Mauno
2018-05-06 2:55 ` Niko Mauno
2018-04-20 14:09 ` [PATCH 3/3] mtd-utils: " Niko Mauno
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.