diff mbox

package/skeleton: remove legacy mkdir

Message ID 1483477263-15610-1-git-send-email-yann.morin.1998@free.fr
State Accepted
Headers show

Commit Message

Yann E. MORIN Jan. 3, 2017, 9:01 p.m. UTC
We've had this mkdir, in various forms, for aeons. It dates back to
the inception of Buildroot, at the dawn of ages, when the toolchain
support was still nascent. Evolution had it morph from /include, to
a tuple-prefixed directory and a symlink there-to, then back to the
/include directory, to the final /usr/include directory we've had
for the last 9 years.

Anything that wants to install headers is supposed to be creating
that directory beforehand; we don't need this legacy mkdir now.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

---
OK, we can keep it, just for nostalgia; I just felt like writing some
prose tonight. ;-)
---
 package/skeleton/skeleton.mk | 1 -
 1 file changed, 1 deletion(-)

Comments

Peter Korsgaard Jan. 4, 2017, 4:14 p.m. UTC | #1
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 > We've had this mkdir, in various forms, for aeons. It dates back to
 > the inception of Buildroot, at the dawn of ages, when the toolchain
 > support was still nascent. Evolution had it morph from /include, to
 > a tuple-prefixed directory and a symlink there-to, then back to the
 > /include directory, to the final /usr/include directory we've had
 > for the last 9 years.

 > Anything that wants to install headers is supposed to be creating
 > that directory beforehand; we don't need this legacy mkdir now.

But how is that different from the {lib,bin,sbin} directories we also
create?

 > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

 > ---
 > OK, we can keep it, just for nostalgia; I just felt like writing some
 > prose tonight. ;-)
 > ---
 >  package/skeleton/skeleton.mk | 1 -
 >  1 file changed, 1 deletion(-)

 > diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk
 > index 1000161..e65ef61 100644
 > --- a/package/skeleton/skeleton.mk
 > +++ b/package/skeleton/skeleton.mk
 > @@ -107,7 +107,6 @@ define SKELETON_INSTALL_STAGING_CMDS
 >  	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/lib
 >  	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/bin
 >  	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/sbin
 > -	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include
 >  	$(call SKELETON_USR_SYMLINKS_OR_DIRS,$(STAGING_DIR))
 >  	ln -snf lib $(STAGING_DIR)/$(SKELETON_LIB_SYMLINK)
 >  	ln -snf lib $(STAGING_DIR)/usr/$(SKELETON_LIB_SYMLINK)
 > -- 
 > 2.7.4

 > _______________________________________________
 > buildroot mailing list
 > buildroot@busybox.net
 > http://lists.busybox.net/mailman/listinfo/buildroot
Yann E. MORIN Jan. 4, 2017, 5:19 p.m. UTC | #2
Peter, All,

On 2017-01-04 17:14 +0100, Peter Korsgaard spake thusly:
> >>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
> 
>  > We've had this mkdir, in various forms, for aeons. It dates back to
>  > the inception of Buildroot, at the dawn of ages, when the toolchain
>  > support was still nascent. Evolution had it morph from /include, to
>  > a tuple-prefixed directory and a symlink there-to, then back to the
>  > /include directory, to the final /usr/include directory we've had
>  > for the last 9 years.
> 
>  > Anything that wants to install headers is supposed to be creating
>  > that directory beforehand; we don't need this legacy mkdir now.
> 
> But how is that different from the {lib,bin,sbin} directories we also
> create?

Hmm, you would seem to make a rather good point.

But there is a difference: for lib, bin and sbin, we want to ensure
consistency with the merged-usr setup, so we need the directories to
exist to create the /lib, /bin and /sbin symlinks to their /usr
counterparts.

For lib, we also want it to exist because we also create the lib{32,64}
symlink.

So, we need to create those because Buildroot needs them by itself.

This is not the case for /usr/include.

This commit is not strictly necessary, but it makes it a little bit
easier to split the skeleton for systemd (to come later: the series is
too big and unmanageable as a single piece, so I'm sending bits of it
separately, such as this one).

Regards,
Yann E. MORIN.

>  > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> 
>  > ---
>  > OK, we can keep it, just for nostalgia; I just felt like writing some
>  > prose tonight. ;-)
>  > ---
>  >  package/skeleton/skeleton.mk | 1 -
>  >  1 file changed, 1 deletion(-)
> 
>  > diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk
>  > index 1000161..e65ef61 100644
>  > --- a/package/skeleton/skeleton.mk
>  > +++ b/package/skeleton/skeleton.mk
>  > @@ -107,7 +107,6 @@ define SKELETON_INSTALL_STAGING_CMDS
>  >  	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/lib
>  >  	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/bin
>  >  	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/sbin
>  > -	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include
>  >  	$(call SKELETON_USR_SYMLINKS_OR_DIRS,$(STAGING_DIR))
>  >  	ln -snf lib $(STAGING_DIR)/$(SKELETON_LIB_SYMLINK)
>  >  	ln -snf lib $(STAGING_DIR)/usr/$(SKELETON_LIB_SYMLINK)
>  > -- 
>  > 2.7.4
> 
>  > _______________________________________________
>  > buildroot mailing list
>  > buildroot@busybox.net
>  > http://lists.busybox.net/mailman/listinfo/buildroot
> 
> -- 
> Bye, Peter Korsgaard
Arnout Vandecappelle July 26, 2017, 12:24 a.m. UTC | #3
On 03-01-17 22:01, Yann E. MORIN wrote:
> We've had this mkdir, in various forms, for aeons. It dates back to
> the inception of Buildroot, at the dawn of ages, when the toolchain
> support was still nascent. Evolution had it morph from /include, to
> a tuple-prefixed directory and a symlink there-to, then back to the
> /include directory, to the final /usr/include directory we've had
> for the last 9 years.
> 
> Anything that wants to install headers is supposed to be creating
> that directory beforehand; we don't need this legacy mkdir now.
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

 Since in your skeleton rework series, *some* skeletons *don't* create this
directory, I've applied to master, thanks.

 Regards,
 Arnout

> 
> ---
> OK, we can keep it, just for nostalgia; I just felt like writing some
> prose tonight. ;-)
> ---
>  package/skeleton/skeleton.mk | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk
> index 1000161..e65ef61 100644
> --- a/package/skeleton/skeleton.mk
> +++ b/package/skeleton/skeleton.mk
> @@ -107,7 +107,6 @@ define SKELETON_INSTALL_STAGING_CMDS
>  	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/lib
>  	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/bin
>  	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/sbin
> -	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include
>  	$(call SKELETON_USR_SYMLINKS_OR_DIRS,$(STAGING_DIR))
>  	ln -snf lib $(STAGING_DIR)/$(SKELETON_LIB_SYMLINK)
>  	ln -snf lib $(STAGING_DIR)/usr/$(SKELETON_LIB_SYMLINK)
>
diff mbox

Patch

diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk
index 1000161..e65ef61 100644
--- a/package/skeleton/skeleton.mk
+++ b/package/skeleton/skeleton.mk
@@ -107,7 +107,6 @@  define SKELETON_INSTALL_STAGING_CMDS
 	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/lib
 	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/bin
 	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/sbin
-	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include
 	$(call SKELETON_USR_SYMLINKS_OR_DIRS,$(STAGING_DIR))
 	ln -snf lib $(STAGING_DIR)/$(SKELETON_LIB_SYMLINK)
 	ln -snf lib $(STAGING_DIR)/usr/$(SKELETON_LIB_SYMLINK)