gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

package: indentation cleanup 

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Jerzy Grzegorek 2014-10-23 10:43:37 +02:00 committed by Thomas Petazzoni
parent 0659ca799f
commit 595bf30654
18 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/cramfs/cramfs.mk
View File

@ -11,7 +11,7 @@ CRAMFS_OPTS = -l
endif endif
define ROOTFS_CRAMFS_CMD define ROOTFS_CRAMFS_CMD
$(HOST_DIR)/usr/bin/mkcramfs $(CRAMFS_OPTS) $(TARGET_DIR) $@ $(HOST_DIR)/usr/bin/mkcramfs $(CRAMFS_OPTS) $(TARGET_DIR) $@
endef endef
ROOTFS_CRAMFS_DEPENDENCIES = host-cramfs ROOTFS_CRAMFS_DEPENDENCIES = host-cramfs

2
fs/tar/tar.mk
View File

@ -7,7 +7,7 @@
TAR_OPTS := $(call qstrip,$(BR2_TARGET_ROOTFS_TAR_OPTIONS)) TAR_OPTS := $(call qstrip,$(BR2_TARGET_ROOTFS_TAR_OPTIONS))
define ROOTFS_TAR_CMD define ROOTFS_TAR_CMD
tar -c$(TAR_OPTS)f $@ -C $(TARGET_DIR) . tar -c$(TAR_OPTS)f $@ -C $(TARGET_DIR) .
endef endef
$(eval $(call ROOTFS_TARGET,tar)) $(eval $(call ROOTFS_TARGET,tar))

2
package/automake/automake.mk
View File

@ -13,7 +13,7 @@ AUTOMAKE_LICENSE_FILES = COPYING
HOST_AUTOMAKE_DEPENDENCIES = host-autoconf HOST_AUTOMAKE_DEPENDENCIES = host-autoconf
define GTK_DOC_M4_INSTALL define GTK_DOC_M4_INSTALL
$(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 $(HOST_DIR)/usr/share/aclocal/gtk-doc.m4 $(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 $(HOST_DIR)/usr/share/aclocal/gtk-doc.m4
endef endef
# ensure staging aclocal dir exists # ensure staging aclocal dir exists

12
package/cramfs/cramfs.mk
View File

@ -12,21 +12,21 @@ CRAMFS_LICENSE_FILES = COPYING
CRAMFS_DEPENDENCIES = zlib CRAMFS_DEPENDENCIES = zlib
define CRAMFS_BUILD_CMDS define CRAMFS_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
endef endef
define CRAMFS_INSTALL_TARGET_CMDS define CRAMFS_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 755 $(@D)/mkcramfs $(TARGET_DIR)/usr/bin/mkcramfs $(INSTALL) -D -m 755 $(@D)/mkcramfs $(TARGET_DIR)/usr/bin/mkcramfs
$(INSTALL) -D -m 755 $(@D)/cramfsck $(TARGET_DIR)/usr/bin/cramfsck $(INSTALL) -D -m 755 $(@D)/cramfsck $(TARGET_DIR)/usr/bin/cramfsck
endef endef
define HOST_CRAMFS_BUILD_CMDS define HOST_CRAMFS_BUILD_CMDS
$(HOST_MAKE_ENV) $(MAKE) CFLAGS="$(HOST_CFLAGS) -Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS="$(HOST_LDFLAGS)" -C $(@D) $(HOST_MAKE_ENV) $(MAKE) CFLAGS="$(HOST_CFLAGS) -Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS="$(HOST_LDFLAGS)" -C $(@D)
endef endef
define HOST_CRAMFS_INSTALL_CMDS define HOST_CRAMFS_INSTALL_CMDS
$(INSTALL) -D -m 755 $(@D)/mkcramfs $(HOST_DIR)/usr/bin/mkcramfs $(INSTALL) -D -m 755 $(@D)/mkcramfs $(HOST_DIR)/usr/bin/mkcramfs
$(INSTALL) -D -m 755 $(@D)/cramfsck $(HOST_DIR)/usr/bin/cramfsck $(INSTALL) -D -m 755 $(@D)/cramfsck $(HOST_DIR)/usr/bin/cramfsck
endef endef
$(eval $(generic-package)) $(eval $(generic-package))

2
package/e2fsprogs/e2fsprogs.mk
View File

@ -35,7 +35,7 @@ E2FSPROGS_MAKE_OPTS = \
LDCONFIG=true LDCONFIG=true
define HOST_E2FSPROGS_INSTALL_CMDS define HOST_E2FSPROGS_INSTALL_CMDS
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs
endef endef
# we don't have a host-util-linux # we don't have a host-util-linux
HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf

24
package/elfutils/elfutils.mk
View File

@ -38,34 +38,34 @@ ELFUTILS_CONF_ENV += \
LDFLAGS="$(ELFUTILS_LDFLAGS)" LDFLAGS="$(ELFUTILS_LDFLAGS)"
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
ELFUTILS_DEPENDENCIES += argp-standalone ELFUTILS_DEPENDENCIES += argp-standalone
endif endif
ifeq ($(BR2_PACKAGE_ZLIB),y) ifeq ($(BR2_PACKAGE_ZLIB),y)
ELFUTILS_DEPENDENCIES += zlib ELFUTILS_DEPENDENCIES += zlib
ELFUTILS_CONF_OPTS += --with-zlib ELFUTILS_CONF_OPTS += --with-zlib
else else
ELFUTILS_CONF_OPTS += --without-zlib ELFUTILS_CONF_OPTS += --without-zlib
endif endif
ifeq ($(BR2_PACKAGE_BZIP2),y) ifeq ($(BR2_PACKAGE_BZIP2),y)
ELFUTILS_DEPENDENCIES += bzip2 ELFUTILS_DEPENDENCIES += bzip2
ELFUTILS_CONF_OPTS += --with-bzlib ELFUTILS_CONF_OPTS += --with-bzlib
else else
ELFUTILS_CONF_OPTS += --without-bzlib ELFUTILS_CONF_OPTS += --without-bzlib
endif endif
ifeq ($(BR2_PACKAGE_XZ),y) ifeq ($(BR2_PACKAGE_XZ),y)
ELFUTILS_DEPENDENCIES += xz ELFUTILS_DEPENDENCIES += xz
ELFUTILS_CONF_OPTS += --with-lzma ELFUTILS_CONF_OPTS += --with-lzma
else else
ELFUTILS_CONF_OPTS += --without-lzma ELFUTILS_CONF_OPTS += --without-lzma
endif endif
ifeq ($(BR2_PACKAGE_ELFUTILS_PROGS),y) ifeq ($(BR2_PACKAGE_ELFUTILS_PROGS),y)
ELFUTILS_CONF_OPTS += --enable-progs ELFUTILS_CONF_OPTS += --enable-progs
else else
ELFUTILS_CONF_OPTS += --disable-progs ELFUTILS_CONF_OPTS += --disable-progs
endif endif
$(eval $(autotools-package)) $(eval $(autotools-package))

10
package/genromfs/genromfs.mk
View File

@ -10,14 +10,14 @@ GENROMFS_LICENSE = GPLv2+
GENROMFS_LICENSE_FILES = COPYING GENROMFS_LICENSE_FILES = COPYING
define GENROMFS_BUILD_CMDS define GENROMFS_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"
endef endef
define GENROMFS_INSTALL_TARGET_CMDS define GENROMFS_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR) install
endef endef
define HOST_GENROMFS_BUILD_CMDS define HOST_GENROMFS_BUILD_CMDS

2
package/i2c-tools/i2c-tools.mk
View File

@ -11,7 +11,7 @@ I2C_TOOLS_LICENSE = GPLv2+, GPLv2 (py-smbus)
I2C_TOOLS_LICENSE_FILES = COPYING I2C_TOOLS_LICENSE_FILES = COPYING
define I2C_TOOLS_BUILD_CMDS define I2C_TOOLS_BUILD_CMDS
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
endef endef
define I2C_TOOLS_INSTALL_TARGET_CMDS define I2C_TOOLS_INSTALL_TARGET_CMDS

4
package/libgtk2/libgtk2.mk
View File

@ -165,11 +165,11 @@ HOST_LIBGTK2_CONF_OPTS = \
--disable-cups --disable-cups
define HOST_LIBGTK2_BUILD_CMDS define HOST_LIBGTK2_BUILD_CMDS
$(HOST_MAKE_ENV) make -C $(@D)/gtk gtk-update-icon-cache $(HOST_MAKE_ENV) make -C $(@D)/gtk gtk-update-icon-cache
endef endef
define HOST_LIBGTK2_INSTALL_CMDS define HOST_LIBGTK2_INSTALL_CMDS
cp $(@D)/gtk/gtk-update-icon-cache $(HOST_DIR)/usr/bin cp $(@D)/gtk/gtk-update-icon-cache $(HOST_DIR)/usr/bin
endef endef
$(eval $(autotools-package)) $(eval $(autotools-package))

2
package/liblog4c-localtime/liblog4c-localtime.mk
View File

@ -19,4 +19,4 @@ endef
LIBLOG4C_LOCALTIME_PRE_CONFIGURE_HOOKS += LIBLOG4C_LOCALTIME_FIX_CONFIGURE_PERMS LIBLOG4C_LOCALTIME_PRE_CONFIGURE_HOOKS += LIBLOG4C_LOCALTIME_FIX_CONFIGURE_PERMS
$(eval $(autotools-package)) $(eval $(autotools-package))

22
package/libxml-parser-perl/libxml-parser-perl.mk
View File

@ -12,23 +12,23 @@ LIBXML_PARSER_PERL_LICENSE = Artistic or GPLv1+
LIBXML_PARSER_PERL_RUN_PERL = `which perl` LIBXML_PARSER_PERL_RUN_PERL = `which perl`
define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS
(cd $(@D) ; \ (cd $(@D) ; \
$(HOST_CONFIGURE_OPTS) $(LIBXML_PARSER_PERL_RUN_PERL) Makefile.PL \ $(HOST_CONFIGURE_OPTS) $(LIBXML_PARSER_PERL_RUN_PERL) Makefile.PL \
PREFIX=$(HOST_DIR)/usr \ PREFIX=$(HOST_DIR)/usr \
EXPATLIBPATH=$(HOST_DIR)/usr/lib \ EXPATLIBPATH=$(HOST_DIR)/usr/lib \
EXPATINCPATH=$(HOST_DIR)/usr/include \ EXPATINCPATH=$(HOST_DIR)/usr/include \
INSTALLDIRS=site \ INSTALLDIRS=site \
INSTALLSITELIB=$(HOST_DIR)/usr/lib/perl \ INSTALLSITELIB=$(HOST_DIR)/usr/lib/perl \
INSTALLSITEARCH=$(HOST_DIR)/usr/lib/perl \ INSTALLSITEARCH=$(HOST_DIR)/usr/lib/perl \
) )
endef endef
define HOST_LIBXML_PARSER_PERL_BUILD_CMDS define HOST_LIBXML_PARSER_PERL_BUILD_CMDS
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
endef endef
define HOST_LIBXML_PARSER_PERL_INSTALL_CMDS define HOST_LIBXML_PARSER_PERL_INSTALL_CMDS
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
endef endef
$(eval $(host-generic-package)) $(eval $(host-generic-package))

4
package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
View File

@ -14,8 +14,8 @@ MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst
MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat
define MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES define MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
$(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
$(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' $(MATCHBOX_FAKEKEY_DIR)/Makefile $(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' $(MATCHBOX_FAKEKEY_DIR)/Makefile
endef endef
MATCHBOX_FAKEKEY_POST_CONFIGURE_HOOKS += MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES MATCHBOX_FAKEKEY_POST_CONFIGURE_HOOKS += MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES

2
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
View File

@ -15,7 +15,7 @@ MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expa
MATCHBOX_KEYBOARD_CONF_ENV = expat=yes MATCHBOX_KEYBOARD_CONF_ENV = expat=yes
define MATCHBOX_KEYBOARD_POST_INSTALL_FIXES define MATCHBOX_KEYBOARD_POST_INSTALL_FIXES
cp -dpf ./package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/ cp -dpf ./package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/
endef endef
MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FIXES MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FIXES

2
package/matchbox/matchbox-lib/matchbox-lib.mk
View File

@ -15,7 +15,7 @@ MATCHBOX_LIB_CONF_OPTS = --enable-expat --disable-doxygen-docs
MATCHBOX_LIB_CONF_ENV = LIBS="-lX11" MATCHBOX_LIB_CONF_ENV = LIBS="-lX11"
define MATCHBOX_LIB_POST_INSTALL_FIXES define MATCHBOX_LIB_POST_INSTALL_FIXES
$(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
endef endef
MATCHBOX_LIB_POST_INSTALL_STAGING_HOOKS += MATCHBOX_LIB_POST_INSTALL_FIXES MATCHBOX_LIB_POST_INSTALL_STAGING_HOOKS += MATCHBOX_LIB_POST_INSTALL_FIXES

6
package/mtd/mtd.mk
View File

@ -95,9 +95,9 @@ define MTD_INSTALL_STAGING_CMDS
endef endef
define MTD_INSTALL_TARGET_CMDS define MTD_INSTALL_TARGET_CMDS
for f in $(MTD_TARGETS_y) ; do \ for f in $(MTD_TARGETS_y) ; do \
$(INSTALL) -D -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$${f##*/} ; \ $(INSTALL) -D -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$${f##*/} ; \
done done
endef endef
$(eval $(generic-package)) $(eval $(generic-package))

32
package/squashfs/squashfs.mk
View File

@ -60,31 +60,31 @@ HOST_SQUASHFS_MAKE_ARGS = \
LZMA_XZ_SUPPORT=1 LZMA_XZ_SUPPORT=1
define SQUASHFS_BUILD_CMDS define SQUASHFS_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) \ $(TARGET_MAKE_ENV) $(MAKE) \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
$(SQUASHFS_MAKE_ARGS) \ $(SQUASHFS_MAKE_ARGS) \
-C $(@D)/squashfs-tools/ -C $(@D)/squashfs-tools/
endef endef
define SQUASHFS_INSTALL_TARGET_CMDS define SQUASHFS_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(SQUASHFS_MAKE_ARGS) \ $(TARGET_MAKE_ENV) $(MAKE) $(SQUASHFS_MAKE_ARGS) \
-C $(@D)/squashfs-tools/ INSTALL_DIR=$(TARGET_DIR)/usr/bin install -C $(@D)/squashfs-tools/ INSTALL_DIR=$(TARGET_DIR)/usr/bin install
endef endef
define HOST_SQUASHFS_BUILD_CMDS define HOST_SQUASHFS_BUILD_CMDS
$(HOST_MAKE_ENV) $(MAKE) \ $(HOST_MAKE_ENV) $(MAKE) \
CC="$(HOSTCC)" \ CC="$(HOSTCC)" \
EXTRA_CFLAGS="$(HOST_CFLAGS)" \ EXTRA_CFLAGS="$(HOST_CFLAGS)" \
EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \ EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
$(HOST_SQUASHFS_MAKE_ARGS) \ $(HOST_SQUASHFS_MAKE_ARGS) \
-C $(@D)/squashfs-tools/ -C $(@D)/squashfs-tools/
endef endef
define HOST_SQUASHFS_INSTALL_CMDS define HOST_SQUASHFS_INSTALL_CMDS
$(HOST_MAKE_ENV) $(MAKE) $(HOST_SQUASHFS_MAKE_ARGS) \ $(HOST_MAKE_ENV) $(MAKE) $(HOST_SQUASHFS_MAKE_ARGS) \
-C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/usr/bin install -C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/usr/bin install
endef endef
$(eval $(generic-package)) $(eval $(generic-package))

2
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
View File

@ -72,7 +72,7 @@ ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE),y)
XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive --enable-xfbdev \ XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive --enable-xfbdev \
--disable-glx --disable-dri --disable-xsdl --disable-glx --disable-dri --disable-xsdl
define XSERVER_CREATE_X_SYMLINK define XSERVER_CREATE_X_SYMLINK
ln -f -s Xfbdev $(TARGET_DIR)/usr/bin/X ln -f -s Xfbdev $(TARGET_DIR)/usr/bin/X
endef endef
XSERVER_XORG_SERVER_POST_INSTALL_TARGET_HOOKS += XSERVER_CREATE_X_SYMLINK XSERVER_XORG_SERVER_POST_INSTALL_TARGET_HOOKS += XSERVER_CREATE_X_SYMLINK

4
toolchain/helpers.mk
View File

@ -48,7 +48,7 @@ copy_toolchain_lib_root = \
ARCH_LIB_DIR="$(strip $3)" ; \ ARCH_LIB_DIR="$(strip $3)" ; \
LIB="$(strip $4)"; \ LIB="$(strip $4)"; \
DESTDIR="$(strip $5)" ; \ DESTDIR="$(strip $5)" ; \
\ \
for dir in \ for dir in \
$${ARCH_SYSROOT_DIR}/$${ARCH_LIB_DIR}/$(TOOLCHAIN_EXTERNAL_PREFIX) \ $${ARCH_SYSROOT_DIR}/$${ARCH_LIB_DIR}/$(TOOLCHAIN_EXTERNAL_PREFIX) \
$${ARCH_SYSROOT_DIR}/usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/$${ARCH_LIB_DIR} \ $${ARCH_SYSROOT_DIR}/usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/$${ARCH_LIB_DIR} \
@ -80,7 +80,7 @@ copy_toolchain_lib_root = \
LIBPATH="`readlink -f $${LIBPATH}`"; \ LIBPATH="`readlink -f $${LIBPATH}`"; \
done; \ done; \
done; \ done; \
\ \
echo -n echo -n
# #