Skip to contentSkip to conversation

util-linux: alternatify cal, rev, and ionice

PATCH In review Dan McGregor 3 participants 7 messages Oct 18, 2018 – Oct 19, 2018

lore
Share & tools
lore

Dan McGregor

author
#0 lore raw

PATCH v2 1/1 util-linux: alternatify cal, rev, and ionice

From: Dan McGregor <[email protected]>

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

Signed-off-by Dan McGregor <[email protected]>
---
 meta/recipes-core/util-linux/util-linux.inc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
meta/recipes-core/util-linux/util-linux.inc +6 -4
index 3d8b3ff592c..2f99e8409f5 100644
@@ -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 \
     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"

@@ -218,8 +218,10 @@ ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more"
 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[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"
 

@@ -293,8 +295,8 @@ ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint"
 ALTERNATIVE_util-linux-unshare = "unshare"
 ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare"
 
-ALTERNATIVE_util-linux-switch-root = "switch_root"
-ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
+ALTERNATIVE_util-linux-ionice = "ionice"
+ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice"
 
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.19.0-dev
#1 lore raw
Quoted 51 lines · Dan McGregor

From: Dan McGregor <[email protected]>

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

Signed-off-by Dan McGregor <[email protected]>
---
 meta/recipes-core/util-linux/util-linux.inc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
meta/recipes-core/util-linux/util-linux.inc +1 -1
index 3d8b3ff592c..2f99e8409f5 100644
@@ -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"

meta/recipes-core/util-linux/util-linux.inc +1 -1
@@ -209,7 +209,7 @@ ALTERNATIVE_${PN}  = " \
     dmesg kill more mkswap blockdev pivot_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"

@@ -218,8 +218,10 @@ ALTERNATIVE_LINK_NAME[more] =

"${base_bindir}/more"
ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"

meta/recipes-core/util-linux/util-linux.inc +2 -0
+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"

@@ -293,8 +295,8 @@ ALTERNATIVE_LINK_NAME[mountpoint] =

"${base_bindir}/mountpoint"
ALTERNATIVE_util-linux-unshare = "unshare" ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare"

meta/recipes-core/util-linux/util-linux.inc ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" · line 299

Quoted 4 lines
meta/recipes-core/util-linux/util-linux.inc +2 -2
-ALTERNATIVE_util-linux-switch-root = "switch_root"
-ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
+ALTERNATIVE_util-linux-ionice = "ionice"
+ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice"

The rebase went wrong here. I'll try and fix this up in -next and retest so we can figure out if switch_root really is broken (cc Randy)...

Cheers,

Richard

#2 lore raw
Quoted 52 lines · Richard Purdie
Quoted 51 lines · Dan McGregor

From: Dan McGregor <[email protected]>

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

Signed-off-by Dan McGregor <[email protected]>
---
  meta/recipes-core/util-linux/util-linux.inc | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
meta/recipes-core/util-linux/util-linux.inc +1 -1
index 3d8b3ff592c..2f99e8409f5 100644
@@ -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"

meta/recipes-core/util-linux/util-linux.inc +1 -1
@@ -209,7 +209,7 @@ ALTERNATIVE_${PN}  = " \
      dmesg kill more mkswap blockdev pivot_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"

@@ -218,8 +218,10 @@ ALTERNATIVE_LINK_NAME[more] =

"${base_bindir}/more"
ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"

meta/recipes-core/util-linux/util-linux.inc +2 -0
+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"

@@ -293,8 +295,8 @@ ALTERNATIVE_LINK_NAME[mountpoint] =

"${base_bindir}/mountpoint"
ALTERNATIVE_util-linux-unshare = "unshare" ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare"

Quoted 9 lines

meta/recipes-core/util-linux/util-linux.inc ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" · line 299

Quoted 4 lines
meta/recipes-core/util-linux/util-linux.inc +2 -2
-ALTERNATIVE_util-linux-switch-root = "switch_root"
-ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
+ALTERNATIVE_util-linux-ionice = "ionice"
+ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice"

The rebase went wrong here. I'll try and fix this up in -next and retest so we can figure out if switch_root really is broken (cc Randy)...

Ah, so it seems. Deleting switch-root alternatives, eh... WTF Dan! :)

Thanks Richard.

../Randy

Quoted 5 lines

Cheers,

Richard

Signature · 2 lines
# Randy MacLeod
# Wind River Linux
#3 lore raw
Quoted 59 lines · Randy MacLeod
Quoted 49 lines · Richard Purdie
Quoted 48 lines · Dan McGregor

From: Dan McGregor <[email protected]>

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

Signed-off-by Dan McGregor <[email protected]>

---
  meta/recipes-core/util-linux/util-linux.inc | 10 ++++++----

  1 file changed, 6 insertions(+), 4 deletions(-)
meta/recipes-core/util-linux/util-linux.inc +0 -0
index 3d8b3ff592c..2f99e8409f5 100644
@@ -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"

meta/recipes-core/util-linux/util-linux.inc +1 -1
-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"

meta/recipes-core/util-linux/util-linux.inc +1 -1
@@ -209,7 +209,7 @@ ALTERNATIVE_${PN}  = " \
       dmesg kill more mkswap blockdev pivot_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"

meta/recipes-core/util-linux/util-linux.inc +0 -0
@@ -218,8 +218,10 @@ ALTERNATIVE_LINK_NAME[more] =

"${base_bindir}/more"
  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[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"

meta/recipes-core/util-linux/util-linux.inc +0 -0
@@ -293,8 +295,8 @@ ALTERNATIVE_LINK_NAME[mountpoint] =

"${base_bindir}/mountpoint" ALTERNATIVE_util-linux-unshare = "unshare" ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" -ALTERNATIVE_util-linux-switch-root = "switch_root"

Quoted 8 lines

meta/recipes-core/util-linux/util-linux.inc ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" · line 299

Quoted 3 lines
meta/recipes-core/util-linux/util-linux.inc +2 -1
-ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
+ALTERNATIVE_util-linux-ionice = "ionice"
+ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice"

The rebase went wrong here. I'll try and fix this up in -next and retest so we can figure out if switch_root really is broken (cc Randy)...

Quoted 2 lines

Ah, so it seems. Deleting switch-root alternatives, eh... WTF Dan! :)

Oh, the oe-core commit log for master-next shows that Dan's commit is fine so it's *Richard's" rebase. I rescind my humorous WTF.

../Randy

Quoted 11 lines

Thanks Richard.

../Randy

Quoted 5 lines

Cheers,

Richard

Signature · 2 lines
# Randy MacLeod
# Wind River Linux
author
#4 lore raw
Quoted 61 lines · Randy MacLeod
Quoted 59 lines · Randy MacLeod
Quoted 57 lines · Richard Purdie
Quoted 47 lines · Dan McGregor

From: Dan McGregor <[email protected]>

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

Signed-off-by Dan McGregor <[email protected]>
---
  meta/recipes-core/util-linux/util-linux.inc | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
meta/recipes-core/util-linux/util-linux.inc +1 -1
index 3d8b3ff592c..2f99e8409f5 100644
@@ -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"

meta/recipes-core/util-linux/util-linux.inc +1 -1
@@ -209,7 +209,7 @@ ALTERNATIVE_${PN}  = " \
      dmesg kill more mkswap blockdev pivot_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"

@@ -218,8 +218,10 @@ ALTERNATIVE_LINK_NAME[more] =

"${base_bindir}/more"
ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"

meta/recipes-core/util-linux/util-linux.inc +2 -0
+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"

@@ -293,8 +295,8 @@ ALTERNATIVE_LINK_NAME[mountpoint] =

"${base_bindir}/mountpoint"
ALTERNATIVE_util-linux-unshare = "unshare" ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare"

meta/recipes-core/util-linux/util-linux.inc ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" · line 299

Quoted 4 lines
meta/recipes-core/util-linux/util-linux.inc +2 -2
-ALTERNATIVE_util-linux-switch-root = "switch_root"
-ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
+ALTERNATIVE_util-linux-ionice = "ionice"
+ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice"

The rebase went wrong here. I'll try and fix this up in -next and retest so we can figure out if switch_root really is broken (cc Randy)...

Quoted 4 lines
Quoted 2 lines

Ah, so it seems. Deleting switch-root alternatives, eh... WTF Dan! :)

Oh, the oe-core commit log for master-next shows that Dan's commit is fine so it's *Richard's" rebase. I rescind my humorous WTF.

Nope, I just looked at my reflog. Somehow it was indeed me that removed switch_root. My bad.

That's what review on mailing lists is for ;)

Quoted 19 lines

../Randy

Quoted 11 lines

Thanks Richard.

../Randy

Quoted 5 lines

Cheers,

Richard

--
# Randy MacLeod
# Wind River Linux

#5 lore raw
In reply to Randy MacLeod
Quoted 7 lines · Randy MacLeod
Quoted 6 lines · Randy MacLeod
Quoted 4 lines · Richard Purdie

The rebase went wrong here. I'll try and fix this up in -next and retest so we can figure out if switch_root really is broken (cc Randy)...

Quoted 6 lines
Quoted 3 lines

Ah, so it seems. Deleting switch-root alternatives, eh... WTF Dan! :)

Oh, the oe-core commit log for master-next shows that Dan's commit is fine so it's *Richard's" rebase. I rescind my humorous WTF.

It was Dan's patch that was broken and I've now fixed it in -next ;-)

Cheers,

Richard

author
#6 lore raw
Quoted 9 lines · On Fri, 19 Oct 2018 at 11:28, <[email protected]> wrote:
Quoted 7 lines · Randy MacLeod
Quoted 6 lines · Randy MacLeod
Quoted 4 lines · Richard Purdie

The rebase went wrong here. I'll try and fix this up in -next and retest so we can figure out if switch_root really is broken (cc Randy)...

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

Ah, so it seems. Deleting switch-root alternatives, eh... WTF Dan! :)

Oh, the oe-core commit log for master-next shows that Dan's commit is fine so it's *Richard's" rebase. I rescind my humorous WTF.

It was Dan's patch that was broken and I've now fixed it in -next ;-)

Thanks for that. Turns out I need to watch the commit log more closely when I'm rebasing stuff.

Quoted 5 lines

Cheers,

Richard