f268f7131b
The Buildroot coding style defines one space around make assignments and
does not align the assignment symbols.
This patch does a bulk fix of offending packages. The package
infrastructures (or more in general assignments to calculated variable
names, like $(2)_FOO) are not touched.
Alignment of line continuation characters (\) is kept as-is.
The sed command used to do this replacement is:
find * -name "*.mk" | xargs sed -i \
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#'
Brief explanation of this command:
^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line
\([?:+]\?=\) any assignment character =, :=, ?=, +=
\([^\\]\+\) any string not containing a line continuation
\([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a
line continuation character
\(\s*\\\) optional whitespace, followed by a line
continuation character
Hence, the first subexpression handles empty assignments, the second
handles regular assignments, the third handles regular assignments with
line continuation, and the fourth empty assignments with line
continuation.
This expression was tested on following test text: (initial tab not
included)
FOO = spaces before
FOO = spaces before and after
FOO = tab before
FOO = tab and spaces before
FOO = tab after
FOO = tab and spaces after
FOO = spaces and tab after
FOO = \
FOO = bar \
FOO = bar space \
FOO = \
GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse
FOO += spaces before
FOO ?= spaces before and after
FOO :=
FOO =
FOO =
FOO =
FOO =
$(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C
AT91BOOTSTRAP3_DEFCONFIG = \
AXEL_DISABLE_I18N=--i18n=0
After this bulk change, following manual fixups were done:
- fix line continuation alignment in cegui06 and spice (the sed
expression leaves the number of whitespace between the value and line
continuation character intact, but the whitespace before that could have
changed, causing misalignment.
- qt5base was reverted, as this package uses extensive alignment which
actually makes the code more readable.
Finally, the end result was manually reviewed.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Cc: Yann E. Morin <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
82 lines
2.9 KiB
Makefile
82 lines
2.9 KiB
Makefile
################################################################################
|
|
#
|
|
# syslinux to make target msdos/iso9660 filesystems bootable
|
|
#
|
|
################################################################################
|
|
|
|
SYSLINUX_VERSION = 6.02
|
|
SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.xz
|
|
SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux
|
|
|
|
SYSLINUX_LICENSE = GPLv2+
|
|
SYSLINUX_LICENSE_FILES = COPYING
|
|
|
|
SYSLINUX_INSTALL_IMAGES = YES
|
|
|
|
SYSLINUX_DEPENDENCIES = host-nasm host-util-linux host-upx
|
|
|
|
ifeq ($(BR2_TARGET_SYSLINUX_LEGACY_BIOS),y)
|
|
SYSLINUX_TARGET = bios
|
|
endif
|
|
|
|
ifeq ($(BR2_TARGET_SYSLINUX_EFI),y)
|
|
ifeq ($(BR2_ARCH_IS_64),y)
|
|
SYSLINUX_EFI_BITS = efi64
|
|
else
|
|
SYSLINUX_EFI_BITS = efi32
|
|
endif # 64-bit
|
|
SYSLINUX_DEPENDENCIES += gnu-efi
|
|
SYSLINUX_TARGET = $(SYSLINUX_EFI_BITS)
|
|
endif # EFI
|
|
|
|
# The syslinux tarball comes with pre-compiled binaries.
|
|
# Since timestamps might not be in the correct order, a rebuild is
|
|
# not always triggered for all the different images.
|
|
# Cleanup the mess even before we attempt a build, so we indeed
|
|
# build everything from source.
|
|
define SYSLINUX_CLEANUP
|
|
rm -rf $(@D)/bios $(@D)/efi32 $(@D)/efi64
|
|
endef
|
|
SYSLINUX_POST_PATCH_HOOKS += SYSLINUX_CLEANUP
|
|
|
|
# syslinux build system has no convenient way to pass CFLAGS,
|
|
# and the internal zlib should take precedence so -I shouldn't
|
|
# be used.
|
|
define SYSLINUX_BUILD_CMDS
|
|
$(TARGET_MAKE_ENV) $(MAKE1) CC="$(HOSTCC) -idirafter $(HOST_DIR)/usr/include $(HOST_LDFLAGS)" \
|
|
AR="$(HOSTAR)" SYSROOT=$(STAGING_DIR) -C $(@D) $(SYSLINUX_TARGET)
|
|
endef
|
|
|
|
# While the actual bootloader is compiled for the target, several
|
|
# utilities for installing the bootloader are meant for the host.
|
|
# Repeat the target, otherwise syslinux will try to build everything
|
|
# Repeat CC and AR, since syslinux really wants to check them at
|
|
# install time
|
|
define SYSLINUX_INSTALL_TARGET_CMDS
|
|
$(TARGET_MAKE_ENV) $(MAKE1) CC="$(HOSTCC) -idirafter $(HOST_DIR)/usr/include $(HOST_LDFLAGS)" \
|
|
AR="$(HOSTAR)" SYSROOT=$(STAGING_DIR) INSTALLROOT=$(HOST_DIR) \
|
|
-C $(@D) $(SYSLINUX_TARGET) install
|
|
endef
|
|
|
|
SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_ISOLINUX) += bios/core/isolinux.bin
|
|
SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_PXELINUX) += bios/core/pxelinux.bin
|
|
SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_MBR) += bios/mbr/mbr.bin
|
|
SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_EFI) += $(SYSLINUX_EFI_BITS)/efi/syslinux.efi
|
|
|
|
SYSLINUX_C32 = $(call qstrip,$(BR2_TARGET_SYSLINUX_C32))
|
|
|
|
# We install the c32 modules from the host-installed tree, where they
|
|
# are all neatly installed in a single location, while they are
|
|
# scattered around everywhere in the build tree.
|
|
define SYSLINUX_INSTALL_IMAGES_CMDS
|
|
for i in $(SYSLINUX_IMAGES-y); do \
|
|
$(INSTALL) -D -m 0755 $(@D)/$$i $(BINARIES_DIR)/syslinux/$${i##*/}; \
|
|
done
|
|
for i in $(SYSLINUX_C32); do \
|
|
$(INSTALL) -D -m 0755 $(HOST_DIR)/usr/share/syslinux/$${i} \
|
|
$(BINARIES_DIR)/syslinux/$${i}; \
|
|
done
|
|
endef
|
|
|
|
$(eval $(generic-package))
|