Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH 1/4] util-linux: alternatify cal, rev, and ionice
@ 2018-10-17 21:22 Dan McGregor
  2018-10-17 21:22 ` [PATCH 2/4] file: alternatify file Dan McGregor
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Dan McGregor @ 2018-10-17 21:22 UTC (permalink / raw)
  To: openembedded-core

From: Dan McGregor <dan.mcgregor@usask.ca>

These are also provided by toybox in its default configuration,
and can be turned on in busybox.

Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
---
 meta/recipes-core/util-linux/util-linux.inc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 60ac9c20064..35c67a8bd53 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -93,7 +93,7 @@ FILES_util-linux-findfs = "${sbindir}/findfs"
 FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}"
 FILES_util-linux-runuser = "${sbindir}/runuser"
 FILES_util-linux-prlimit = "${bindir}/prlimit"
-FILES_util-linux-ionice = "${bindir}/ionice"
+FILES_util-linux-ionice = "${bindir}/ionice.${BPN}"
 FILES_util-linux-su = "${bindir}/su.util-linux ${sysconfdir}/pam.d/su-l"
 CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l"
 
@@ -209,7 +209,7 @@ ALTERNATIVE_${PN}  = " \
     dmesg kill more mkswap blockdev pivot_root switch_root \
     hexdump last lastb logger mesg renice wall \
     setsid chrt flock utmpdump eject nologin taskset fallocate \
-    fsfreeze nsenter \
+    fsfreeze nsenter cal rev \
 "
 
 ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
@@ -219,8 +219,10 @@ ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap"
 ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
 ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
 ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
+ALTERNATIVE_LINK_NAME[cal] = "${bindir}/cal"
 ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
 ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate"
+ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev"
 ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze"
 ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
 
@@ -294,6 +296,9 @@ ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint"
 ALTERNATIVE_util-linux-unshare = "unshare"
 ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare"
 
+ALTERNATIVE_util-linux-ionice = "ionice"
+ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice"
+
 BBCLASSEXTEND = "native nativesdk"
 
 python do_package_prepend () {
-- 
2.19.0-dev



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 2/4] file: alternatify file
  2018-10-17 21:22 [PATCH 1/4] util-linux: alternatify cal, rev, and ionice Dan McGregor
@ 2018-10-17 21:22 ` Dan McGregor
  2018-10-17 21:22 ` [PATCH 3/4] kmod: bump alternative priority Dan McGregor
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Dan McGregor @ 2018-10-17 21:22 UTC (permalink / raw)
  To: openembedded-core

From: Dan McGregor <dan.mcgregor@usask.ca>

file is also provided by toybox.

Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
---
 meta/recipes-devtools/file/file_5.34.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/file/file_5.34.bb b/meta/recipes-devtools/file/file_5.34.bb
index 6612b71000e..5d92913cb03 100644
--- a/meta/recipes-devtools/file/file_5.34.bb
+++ b/meta/recipes-devtools/file/file_5.34.bb
@@ -21,7 +21,10 @@ SRC_URI = "git://github.com/file/file.git \
 SRCREV = "315cef2f699da3c31a54bd3c6c6070680fbaf1f5"
 S = "${WORKDIR}/git"
 
-inherit autotools
+inherit autotools update-alternatives
+
+ALTERNATIVE_${PN} = "file"
+ALTERNATIVE_LINK_NAME[file] = "${bindir}/file"
 
 EXTRA_OEMAKE_append_class-target = "-e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file"
 EXTRA_OEMAKE_append_class-nativesdk = "-e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file"
-- 
2.19.0-dev



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 3/4] kmod: bump alternative priority
  2018-10-17 21:22 [PATCH 1/4] util-linux: alternatify cal, rev, and ionice Dan McGregor
  2018-10-17 21:22 ` [PATCH 2/4] file: alternatify file Dan McGregor
@ 2018-10-17 21:22 ` Dan McGregor
  2018-10-17 21:22 ` [PATCH 4/4] base-files: change permissions on /sys and /proc Dan McGregor
  2018-10-18 10:22 ` [PATCH 1/4] util-linux: alternatify cal, rev, and ionice Burton, Ross
  3 siblings, 0 replies; 5+ messages in thread
From: Dan McGregor @ 2018-10-17 21:22 UTC (permalink / raw)
  To: openembedded-core

From: Dan McGregor <dan.mcgregor@usask.ca>

toybox by default has a priority of 60, and busybox of 50. Bump kmod's
priority so that it beats both toybox and busybox.

Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
---
 meta/recipes-kernel/kmod/kmod_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
index b25679359ba..bd21d2ff731 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -39,7 +39,7 @@ do_compile_prepend() {
 
 inherit update-alternatives bash-completion
 
-ALTERNATIVE_PRIORITY = "60"
+ALTERNATIVE_PRIORITY = "70"
 
 ALTERNATIVE_kmod = "insmod modprobe rmmod modinfo bin-lsmod lsmod depmod"
 
-- 
2.19.0-dev



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 4/4] base-files: change permissions on /sys and /proc
  2018-10-17 21:22 [PATCH 1/4] util-linux: alternatify cal, rev, and ionice Dan McGregor
  2018-10-17 21:22 ` [PATCH 2/4] file: alternatify file Dan McGregor
  2018-10-17 21:22 ` [PATCH 3/4] kmod: bump alternative priority Dan McGregor
@ 2018-10-17 21:22 ` Dan McGregor
  2018-10-18 10:22 ` [PATCH 1/4] util-linux: alternatify cal, rev, and ionice Burton, Ross
  3 siblings, 0 replies; 5+ messages in thread
From: Dan McGregor @ 2018-10-17 21:22 UTC (permalink / raw)
  To: openembedded-core

From: Dan McGregor <dan.mcgregor@usask.ca>

The kernel mounts /proc and /sys with the mode 555. Fedora explicitly
sets this value in its filesystem setup package. Debian doesn't seem
to set it explictly.  Having them be 755 causes permission issues on
upgrades inside a container where the guest does not have the
permission to change the modes of the mount points.

So, just bite the bullet and force them to be 555.

Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
---
 meta/recipes-core/base-files/base-files_3.0.14.bb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 05c05626614..6e75652f152 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -32,15 +32,16 @@ INHIBIT_DEFAULT_DEPS = "1"
 docdir_append = "/${P}"
 dirs1777 = "/tmp ${localstatedir}/volatile/tmp"
 dirs2775 = ""
+dirs555 = "/sys /proc"
 dirs755 = "/boot /dev ${base_bindir} ${base_sbindir} ${base_libdir} \
            ${sysconfdir} ${sysconfdir}/default \
-           ${sysconfdir}/skel ${nonarch_base_libdir} /mnt /proc ${ROOT_HOME} /run \
+           ${sysconfdir}/skel ${nonarch_base_libdir} /mnt ${ROOT_HOME} /run \
            ${prefix} ${bindir} ${docdir} /usr/games ${includedir} \
            ${libdir} ${sbindir} ${datadir} \
            ${datadir}/common-licenses ${datadir}/dict ${infodir} \
            ${mandir} ${datadir}/misc ${localstatedir} \
            ${localstatedir}/backups ${localstatedir}/lib \
-           /sys ${localstatedir}/lib/misc ${localstatedir}/spool \
+           ${localstatedir}/lib/misc ${localstatedir}/spool \
            ${localstatedir}/volatile \
            ${localstatedir}/${@'volatile/' if oe.types.boolean('${VOLATILE_LOG_DIR}') else ''}log \
            /home ${prefix}/src ${localstatedir}/local \
@@ -93,6 +94,9 @@ pkg_preinst_${PN} () {
 }
 
 do_install () {
+	for d in ${dirs555}; do
+		install -m 0555 -d ${D}$d
+	done
 	for d in ${dirs755}; do
 		install -m 0755 -d ${D}$d
 	done
-- 
2.19.0-dev



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH 1/4] util-linux: alternatify cal, rev, and ionice
  2018-10-17 21:22 [PATCH 1/4] util-linux: alternatify cal, rev, and ionice Dan McGregor
                   ` (2 preceding siblings ...)
  2018-10-17 21:22 ` [PATCH 4/4] base-files: change permissions on /sys and /proc Dan McGregor
@ 2018-10-18 10:22 ` Burton, Ross
  3 siblings, 0 replies; 5+ messages in thread
From: Burton, Ross @ 2018-10-18 10:22 UTC (permalink / raw)
  To: Dan McGregor; +Cc: OE-core

Can you rebase this on master?  There's been a lot of changes here recently.

Ross
On Wed, 17 Oct 2018 at 22:22, Dan McGregor <danismostlikely@gmail.com> wrote:
>
> From: Dan McGregor <dan.mcgregor@usask.ca>
>
> These are also provided by toybox in its default configuration,
> and can be turned on in busybox.
>
> Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
> ---
>  meta/recipes-core/util-linux/util-linux.inc | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
> index 60ac9c20064..35c67a8bd53 100644
> --- a/meta/recipes-core/util-linux/util-linux.inc
> +++ b/meta/recipes-core/util-linux/util-linux.inc
> @@ -93,7 +93,7 @@ FILES_util-linux-findfs = "${sbindir}/findfs"
>  FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}"
>  FILES_util-linux-runuser = "${sbindir}/runuser"
>  FILES_util-linux-prlimit = "${bindir}/prlimit"
> -FILES_util-linux-ionice = "${bindir}/ionice"
> +FILES_util-linux-ionice = "${bindir}/ionice.${BPN}"
>  FILES_util-linux-su = "${bindir}/su.util-linux ${sysconfdir}/pam.d/su-l"
>  CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l"
>
> @@ -209,7 +209,7 @@ ALTERNATIVE_${PN}  = " \
>      dmesg kill more mkswap blockdev pivot_root switch_root \
>      hexdump last lastb logger mesg renice wall \
>      setsid chrt flock utmpdump eject nologin taskset fallocate \
> -    fsfreeze nsenter \
> +    fsfreeze nsenter cal rev \
>  "
>
>  ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
> @@ -219,8 +219,10 @@ ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap"
>  ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
>  ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
>  ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
> +ALTERNATIVE_LINK_NAME[cal] = "${bindir}/cal"
>  ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
>  ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate"
> +ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev"
>  ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze"
>  ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
>
> @@ -294,6 +296,9 @@ ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint"
>  ALTERNATIVE_util-linux-unshare = "unshare"
>  ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare"
>
> +ALTERNATIVE_util-linux-ionice = "ionice"
> +ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice"
> +
>  BBCLASSEXTEND = "native nativesdk"
>
>  python do_package_prepend () {
> --
> 2.19.0-dev
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-10-18 10:22 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-17 21:22 [PATCH 1/4] util-linux: alternatify cal, rev, and ionice Dan McGregor
2018-10-17 21:22 ` [PATCH 2/4] file: alternatify file Dan McGregor
2018-10-17 21:22 ` [PATCH 3/4] kmod: bump alternative priority Dan McGregor
2018-10-17 21:22 ` [PATCH 4/4] base-files: change permissions on /sys and /proc Dan McGregor
2018-10-18 10:22 ` [PATCH 1/4] util-linux: alternatify cal, rev, and ionice Burton, Ross

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox