[prev in list] [next in list] [prev in thread] [next in thread] 

List:       busybox
Subject:    Heads up, 1.18.0 now installs to /usr, unless CONFIG_FEATURE_INSTALLER
From:       Joachim Nilsson <joachim.nilsson () vmlinux ! org>
Date:       2010-11-30 14:36:24
Message-ID: 4CF50BE8.9050207 () vmlinux ! org
[Download RAW message or body]

Hi everyone,

I just upgraded to 1.18.0 from using 1.16.0 and 1.17.4.  Careless as I
am I simply ran "make oldconfig" and hoped for the best.  Everything
seemed to work just fine, but then I started getting complaints from users.

Turns out most binaries had moved from /bin to /usr/bin ... and it was
not until I found that CONFIG_INSTALL_NO_USR had gone missing.  In
1.18.0 it depends on CONFIG_FEATURE_INSTALLER.

No biggie, I thought, and simply added the missing config options ...

Now, even with NO_USR defined, when I run "make install" the
busybox.links file holds the wrong symlinks.  I.e., /usr is still
present.  If I revert the following hunk from
d4d289acf5eb59ebae414f9aae8a74de30dce36a the busybox.mkll script works
again:

diff --git a/include/applets.src.h b/include/applets.src.h
index d2b1d19..6a14a65 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -56,11 +56,6 @@ s     - suid type:
 # define APPLET_NOFORK(name,main,l,s,name2)  { #name, #main, l, s, 1, 1 },
 #endif
 
-#if ENABLE_INSTALL_NO_USR
-# define _BB_DIR_USR_BIN _BB_DIR_BIN
-# define _BB_DIR_USR_SBIN _BB_DIR_SBIN
-#endif
-
 
 INSERT
 IF_TEST(APPLET_NOFORK([,  test, _BB_DIR_USR_BIN, _BB_SUID_DROP, test))

I understand the reason for the initial cleanup.  But if we keep things
as-is, then we need to fix the busybox.mkll script.

Regards
 /Joachim

["joachim_nilsson.vcf" (text/x-vcard)]

_______________________________________________
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox

[prev in list] [next in list] [prev in thread] [next in thread]