[Buildroot] [PATCH 0 of 2] Small cleanups of build output

[Buildroot] [PATCH 0 of 2] Small cleanups of build output

[Thomas De Schampheleire]

Some small cleanup of the final build output.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
 fs/tar/tar.mk          |  2 +-
 package/pkg-generic.mk |  7 +++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

[Buildroot] [PATCH 1 of 2] infra: permissions/users/device tables: avoid adding empty entries

[Thomas De Schampheleire]

In pkg-generic.mk, an entry would be added to each of the permissions,
devices and users tables, even if FOO_PERMISSIONS/DEVICES/USERS is empty. In
that last case, the entry would contain only the separator, which is
substituted to '\n' in fs/common.mk.
For configurations with many packages, this would render the build output a
bit odd, containing many \n instances (even though the end result in the
target would of course be the same).

This patch cleans up the build output by only adding to these tables when
the package actually specified contents for them.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
 package/pkg-generic.mk |  7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -653,9 +653,16 @@ ifneq ($$($(2)_PROVIDES),)
 endif
 
 TARGETS += $(1)
+
+ifneq ($$($(2)_PERMISSIONS),)
 PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep)
+endif
+ifneq ($$($(2)_DEVICES),)
 PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep)
+endif
+ifneq ($$($(2)_USERS),)
 PACKAGES_USERS += $$($(2)_USERS)$$(sep)
+endif
 
 ifeq ($$($(2)_SITE_METHOD),svn)
 DL_TOOLS_DEPENDENCIES += svn

[Buildroot] [PATCH 2 of 2] fs/tar: use qstrip to clean up build output

[Thomas De Schampheleire]

When using the tar filesystem method, the build output shows at the end:

echo " tar -c""f <br>/output/images/rootfs.tar -C <br>/output/target ." >>
                                    <br>/output/build/_fakeroot.fs

The inner set of quotes can be easily removed by properly stripping the tar
options (coming from the buildroot configuration).

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
 fs/tar/tar.mk |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/tar/tar.mk b/fs/tar/tar.mk
--- a/fs/tar/tar.mk
+++ b/fs/tar/tar.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TAR_OPTS := $(BR2_TARGET_ROOTFS_TAR_OPTIONS)
+TAR_OPTS := $(call qstrip,$(BR2_TARGET_ROOTFS_TAR_OPTIONS))
 
 define ROOTFS_TAR_CMD
  tar -c$(TAR_OPTS)f $@ -C $(TARGET_DIR) .

[Buildroot] [PATCH 1 of 2] infra: permissions/users/device tables: avoid adding empty entries

[Romain Naour]

Hi Thomas,

Le 22/05/2014 14:35, Thomas De Schampheleire a ?crit :
> In pkg-generic.mk, an entry would be added to each of the permissions,
> devices and users tables, even if FOO_PERMISSIONS/DEVICES/USERS is empty. In
> that last case, the entry would contain only the separator, which is
> substituted to '\n' in fs/common.mk.
> For configurations with many packages, this would render the build output a
> bit odd, containing many \n instances (even though the end result in the
> target would of course be the same).
> 
> This patch cleans up the build output by only adding to these tables when
> the package actually specified contents for them.
> 
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

Tested-by: Romain Naour <romain.naour@openwide.fr>
Acked-by: Romain Naour <romain.naour@openwide.fr>

Thanks
Romain

> 
> ---
>  package/pkg-generic.mk |  7 +++++++
>  1 files changed, 7 insertions(+), 0 deletions(-)
> 
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -653,9 +653,16 @@ ifneq ($$($(2)_PROVIDES),)
>  endif
>  
>  TARGETS += $(1)
> +
> +ifneq ($$($(2)_PERMISSIONS),)
>  PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep)
> +endif
> +ifneq ($$($(2)_DEVICES),)
>  PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep)
> +endif
> +ifneq ($$($(2)_USERS),)
>  PACKAGES_USERS += $$($(2)_USERS)$$(sep)
> +endif
>  
>  ifeq ($$($(2)_SITE_METHOD),svn)
>  DL_TOOLS_DEPENDENCIES += svn
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
> 

[Buildroot] [PATCH 2 of 2] fs/tar: use qstrip to clean up build output

[Romain Naour]

Hi Thomas,

Le 22/05/2014 14:35, Thomas De Schampheleire a ?crit :
> When using the tar filesystem method, the build output shows at the end:
> 
> echo " tar -c""f <br>/output/images/rootfs.tar -C <br>/output/target ." >>
>                                     <br>/output/build/_fakeroot.fs
> 
> The inner set of quotes can be easily removed by properly stripping the tar
> options (coming from the buildroot configuration).
> 
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

Acked-by: Romain Naour <romain.naour@openwide.fr>

Thanks
Romain

> 
> ---
>  fs/tar/tar.mk |  2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/tar/tar.mk b/fs/tar/tar.mk
> --- a/fs/tar/tar.mk
> +++ b/fs/tar/tar.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -TAR_OPTS := $(BR2_TARGET_ROOTFS_TAR_OPTIONS)
> +TAR_OPTS := $(call qstrip,$(BR2_TARGET_ROOTFS_TAR_OPTIONS))
>  
>  define ROOTFS_TAR_CMD
>   tar -c$(TAR_OPTS)f $@ -C $(TARGET_DIR) .
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
> 

[Buildroot] [PATCH 1 of 2] infra: permissions/users/device tables: avoid adding empty entries

[Peter Korsgaard]

>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:

 > In pkg-generic.mk, an entry would be added to each of the permissions,
 > devices and users tables, even if FOO_PERMISSIONS/DEVICES/USERS is empty. In
 > that last case, the entry would contain only the separator, which is
 > substituted to '\n' in fs/common.mk.
 > For configurations with many packages, this would render the build output a
 > bit odd, containing many \n instances (even though the end result in the
 > target would of course be the same).

 > This patch cleans up the build output by only adding to these tables when
 > the package actually specified contents for them.

 > Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2 of 2] fs/tar: use qstrip to clean up build output

[Peter Korsgaard]

>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:

 > When using the tar filesystem method, the build output shows at the end:
 > echo " tar -c""f <br>/output/images/rootfs.tar -C <br>/output/target ." >>
 >                                     <br>/output/build/_fakeroot.fs

 > The inner set of quotes can be easily removed by properly stripping the tar
 > options (coming from the buildroot configuration).

 > Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard