Skip to contentSkip to conversation

sed: handle merged usr folder

PATCH New James Knight 3 participants 3 messages Oct 18, 2015 – Oct 20, 2015

lore
Share & tools
lore

James Knight

author
#0 lore raw

PATCH 1/1 sed: handle merged usr folder

For targets prepared with a usr-move, package should not be attempting to move binaries from usr/bin to bin.

Signed-off-by James Knight <[email protected]>
---
 package/sed/sed.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/sed/sed.mk +2 -1
index b819300..5f76e7e 100644
@@ -19,10 +19,11 @@ SED_CONF_OPTS = \
 	--infodir=/usr/share/info \
 	--include=$(STAGING_DIR)/usr/include
 
+ifeq ($(BR2_ROOTFS_MERGED_USR),)
 define SED_MOVE_BINARY
 	mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/
 endef
-
 SED_POST_INSTALL_TARGET_HOOKS = SED_MOVE_BINARY
+endif
 
 $(eval $(autotools-package))
Signature · 1 line
1.9.5.msysgit.1
#1 lore raw

PATCH 1/1 sed: handle merged usr folder

James, All,

On 2015-10-18 11:08 -0400, James Knight spake thusly:

Quoted 2 lines

For targets prepared with a usr-move, package should not be attempting to move binaries from usr/bin to bin.

I was looking at your coreutils patch doing the same, and was about to suggest you also looked at sed. ;-)

However, we discussed these two changes with Thomas on IRC, and we're not very happy that the merged /usr change implies we have to have special handling for it in various packages... :-/

But we can't see an easy alternate solution to the problem either... :-/

Quoted 1 line
Signed-off-by James Knight <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>
Tested-by "Yann E. MORIN" <[email protected]>

BTW, note that we would already had the issue if a user were to provide a custom skeleton with merged /usr .

Regards,
Yann E. MORIN.

Quoted 28 lines
---
 package/sed/sed.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/sed/sed.mk +2 -1
index b819300..5f76e7e 100644
@@ -19,10 +19,11 @@ SED_CONF_OPTS = \
 	--infodir=/usr/share/info \
 	--include=$(STAGING_DIR)/usr/include
 
+ifeq ($(BR2_ROOTFS_MERGED_USR),)
 define SED_MOVE_BINARY
 	mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/
 endef
-
 SED_POST_INSTALL_TARGET_HOOKS = SED_MOVE_BINARY
+endif
 
 $(eval $(autotools-package))
Signature · 6 lines
1.9.5.msysgit.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 sed: handle merged usr folder

In reply to James Knight
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"James" == James Knight <[email protected]> writes:

For targets prepared with a usr-move, package should not be attempting to move binaries from usr/bin to bin.

Signed-off-by James Knight <[email protected]>

A simpler fix is just to get sed to put the binary in /bin in the first place,m so I've changed the package to configure with --bindir=/bin instead and mark your patch as rejected.

Signature · 1 line
Bye, Peter Korsgaard