Small cleanups of build output
PATCH 1/1 Small cleanups of build output
Some small cleanup of the final build output.
--- fs/tar/tar.mk | 2 +- package/pkg-generic.mk | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-)
PATCH 1/1 infra: permissions/users/device tables: avoid adding empty entries
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.
--- package/pkg-generic.mk | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
package/pkg-generic.mk +7 -0
@@ -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
PATCH 1/1 infra: permissions/users/device tables: avoid adding empty entries
Hi Thomas,
Le 22/05/2014 14:35, Thomas De Schampheleire a ?crit :
Quoted 8 lines
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).
Quoted 4 lines
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 <[email protected]>
Thanks
Romain
Quoted 30 lines
--- package/pkg-generic.mk | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)package/pkg-generic.mk +7
-0@@ -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
PATCH 1/1 infra: permissions/users/device tables: avoid adding empty entries
In reply to Thomas De SchampheleireQuoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas De Schampheleire <[email protected]> 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).
Quoted 4 lines
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 <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 fs/tar: use qstrip to clean up build output
In reply to Thomas De SchampheleireWhen 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).
--- fs/tar/tar.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/tar/tar.mk +1 -1
@@ -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) .
PATCH 1/1 fs/tar: use qstrip to clean up build output
Hi Thomas,
Le 22/05/2014 14:35, Thomas De Schampheleire a ?crit :
Quoted 9 lines
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.fsThe 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 <[email protected]>
Thanks
Romain
Quoted 22 lines
--- fs/tar/tar.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)fs/tar/tar.mk +1
-1@@ -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
PATCH 1/1 fs/tar: use qstrip to clean up build output
In reply to Thomas De SchampheleireQuoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas De Schampheleire <[email protected]> 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.fsThe 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 <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard