package: indentation cleanup

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Jerzy Grzegorek 2014-10-25 20:29:31 +02:00 committed by Peter Korsgaard
parent 28a0054bea
commit 1769933d98
33 changed files with 140 additions and 140 deletions

View File

@ -106,9 +106,9 @@ config BR2_TARGET_GRUB2
2. Extract, and rename OVMF.fd to bios.bin and 2. Extract, and rename OVMF.fd to bios.bin and
CirrusLogic5446.rom to vgabios-cirrus.bin. CirrusLogic5446.rom to vgabios-cirrus.bin.
3. qemu-system-{i386,x86-64} -L ovmf-dir/ -hda disk.img 3. qemu-system-{i386,x86-64} -L ovmf-dir/ -hda disk.img
4. Make sure to pass pci=nocrs to the kernel command line, 4. Make sure to pass pci=nocrs to the kernel command line,
to workaround a bug in the EFI BIOS regarding the to workaround a bug in the EFI BIOS regarding the
EFI framebuffer. EFI framebuffer.
http://www.gnu.org/software/grub/ http://www.gnu.org/software/grub/

View File

@ -31,7 +31,7 @@
FAKEROOT_SCRIPT = $(BUILD_DIR)/_fakeroot.fs FAKEROOT_SCRIPT = $(BUILD_DIR)/_fakeroot.fs
FULL_DEVICE_TABLE = $(BUILD_DIR)/_device_table.txt FULL_DEVICE_TABLE = $(BUILD_DIR)/_device_table.txt
ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE) \ ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE) \
$(BR2_ROOTFS_STATIC_DEVICE_TABLE)) $(BR2_ROOTFS_STATIC_DEVICE_TABLE))
USERS_TABLE = $(BUILD_DIR)/_users_table.txt USERS_TABLE = $(BUILD_DIR)/_users_table.txt
ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES)) ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES))

View File

@ -7,18 +7,18 @@
ifeq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y) ifeq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
define ROOTFS_CPIO_ADD_INIT define ROOTFS_CPIO_ADD_INIT
if [ ! -e $(TARGET_DIR)/init ]; then \ if [ ! -e $(TARGET_DIR)/init ]; then \
ln -sf sbin/init $(TARGET_DIR)/init; \ ln -sf sbin/init $(TARGET_DIR)/init; \
fi fi
endef endef
else else
# devtmpfs does not get automounted when initramfs is used. # devtmpfs does not get automounted when initramfs is used.
# Add a pre-init script to mount it before running init # Add a pre-init script to mount it before running init
define ROOTFS_CPIO_ADD_INIT define ROOTFS_CPIO_ADD_INIT
if [ ! -e $(TARGET_DIR)/init ]; then \ if [ ! -e $(TARGET_DIR)/init ]; then \
$(INSTALL) -m 0755 fs/cpio/init $(TARGET_DIR)/init; \ $(INSTALL) -m 0755 fs/cpio/init $(TARGET_DIR)/init; \
fi fi
endef endef
PACKAGES_PERMISSIONS_TABLE += /dev/console c 622 0 0 5 1 - - -$(sep) PACKAGES_PERMISSIONS_TABLE += /dev/console c 622 0 0 5 1 - - -$(sep)

View File

@ -253,10 +253,10 @@ ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)
# address and entry point for the kernel from the already # address and entry point for the kernel from the already
# generate uboot image before using mkimage -l. # generate uboot image before using mkimage -l.
LINUX_APPEND_DTB += $(sep) MKIMAGE_ARGS=`$(MKIMAGE) -l $(LINUX_IMAGE_PATH) |\ LINUX_APPEND_DTB += $(sep) MKIMAGE_ARGS=`$(MKIMAGE) -l $(LINUX_IMAGE_PATH) |\
sed -n -e 's/Image Name:[ ]*\(.*\)/-n \1/p' -e 's/Load Address:/-a/p' -e 's/Entry Point:/-e/p'`; \ sed -n -e 's/Image Name:[ ]*\(.*\)/-n \1/p' -e 's/Load Address:/-a/p' -e 's/Entry Point:/-e/p'`; \
$(MKIMAGE) -A $(MKIMAGE_ARCH) -O linux \ $(MKIMAGE) -A $(MKIMAGE_ARCH) -O linux \
-T kernel -C none $${MKIMAGE_ARGS} \ -T kernel -C none $${MKIMAGE_ARGS} \
-d $(KERNEL_ARCH_PATH)/boot/zImage $(LINUX_IMAGE_PATH); -d $(KERNEL_ARCH_PATH)/boot/zImage $(LINUX_IMAGE_PATH);
endif endif
endif endif

View File

@ -32,7 +32,7 @@ $(error BR2_TOOLCHAIN_BUILDROOT_VENDOR is not allowed to be empty)
endif endif
ifeq ($(TARGET_VENDOR),unknown) ifeq ($(TARGET_VENDOR),unknown)
$(error BR2_TOOLCHAIN_BUILDROOT_VENDOR cannot be 'unknown'. \ $(error BR2_TOOLCHAIN_BUILDROOT_VENDOR cannot be 'unknown'. \
It might be confused with the native toolchain) It might be confused with the native toolchain)
endif endif
# Compute GNU_TARGET_NAME # Compute GNU_TARGET_NAME

View File

@ -15,10 +15,10 @@ AT_LICENSE = GPLv2+, GPLv3+, ISC
AT_LICENSE_FILES = Copyright COPYING AT_LICENSE_FILES = Copyright COPYING
AT_CONF_OPTS = \ AT_CONF_OPTS = \
--with-jobdir=/var/spool/cron/atjobs \ --with-jobdir=/var/spool/cron/atjobs \
--with-atspool=/var/spool/cron/atspool \ --with-atspool=/var/spool/cron/atspool \
--with-daemon_username=root \ --with-daemon_username=root \
--with-daemon_groupname=root \ --with-daemon_groupname=root \
SENDMAIL=/usr/sbin/sendmail SENDMAIL=/usr/sbin/sendmail
define AT_INSTALL_INITSCRIPT define AT_INSTALL_INITSCRIPT

View File

@ -85,7 +85,7 @@ AVAHI_CONF_OPTS = \
--with-autoipd-group=avahi --with-autoipd-group=avahi
AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool \ AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool \
host-pkgconf host-gettext host-pkgconf host-gettext
ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),) ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
AVAHI_DEPENDENCIES += libdaemon AVAHI_DEPENDENCIES += libdaemon

View File

@ -76,8 +76,8 @@ endef
ifeq ($(BR2_PACKAGE_BIND_SERVER),y) ifeq ($(BR2_PACKAGE_BIND_SERVER),y)
define BIND_INSTALL_INIT_SYSV define BIND_INSTALL_INIT_SYSV
$(INSTALL) -m 0755 -D package/bind/S81named \ $(INSTALL) -m 0755 -D package/bind/S81named \
$(TARGET_DIR)/etc/init.d/S81named $(TARGET_DIR)/etc/init.d/S81named
endef endef
else else
BIND_POST_INSTALL_TARGET_HOOKS += BIND_TARGET_REMOVE_SERVER BIND_POST_INSTALL_TARGET_HOOKS += BIND_TARGET_REMOVE_SERVER

View File

@ -173,7 +173,7 @@ endef
ifeq ($(BR2_PACKAGE_BUSYBOX_WATCHDOG),y) ifeq ($(BR2_PACKAGE_BUSYBOX_WATCHDOG),y)
define BUSYBOX_SET_WATCHDOG define BUSYBOX_SET_WATCHDOG
$(call KCONFIG_ENABLE_OPT,CONFIG_WATCHDOG,$(BUSYBOX_BUILD_CONFIG)) $(call KCONFIG_ENABLE_OPT,CONFIG_WATCHDOG,$(BUSYBOX_BUILD_CONFIG))
endef endef
define BUSYBOX_INSTALL_WATCHDOG_SCRIPT define BUSYBOX_INSTALL_WATCHDOG_SCRIPT
[ -f $(TARGET_DIR)/etc/init.d/S15watchdog ] || \ [ -f $(TARGET_DIR)/etc/init.d/S15watchdog ] || \

View File

@ -26,11 +26,11 @@ DHCP_CONF_OPTS = \
--with-relay6-pid-file=/var/run/dhcrelay6.pid --with-relay6-pid-file=/var/run/dhcrelay6.pid
ifeq ($(BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK),y) ifeq ($(BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK),y)
DHCP_CONF_OPTS += --enable-delayed-ack DHCP_CONF_OPTS += --enable-delayed-ack
endif endif
ifneq ($(BR2_INET_IPV6),y) ifneq ($(BR2_INET_IPV6),y)
DHCP_CONF_OPTS += --disable-dhcpv6 DHCP_CONF_OPTS += --disable-dhcpv6
endif endif
ifeq ($(BR2_PACKAGE_DHCP_SERVER),y) ifeq ($(BR2_PACKAGE_DHCP_SERVER),y)

View File

@ -11,7 +11,7 @@ DSTAT_LICENSE = GPLv2
DSTAT_LICENSE_FILES = COPYING DSTAT_LICENSE_FILES = COPYING
define DSTAT_INSTALL_TARGET_CMDS define DSTAT_INSTALL_TARGET_CMDS
$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
endef endef
$(eval $(generic-package)) $(eval $(generic-package))

View File

@ -11,7 +11,7 @@ DTACH_LICENSE_FILES = COPYING
# The Makefile does not have an install target. # The Makefile does not have an install target.
define DTACH_INSTALL_TARGET_CMDS define DTACH_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 $(@D)/dtach $(TARGET_DIR)/usr/bin/dtach $(INSTALL) -D -m 0755 $(@D)/dtach $(TARGET_DIR)/usr/bin/dtach
endef endef
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -22,8 +22,8 @@ ELFUTILS_INSTALL_STAGING = YES
ifeq ($(BR2_LARGEFILE),y) ifeq ($(BR2_LARGEFILE),y)
# elfutils gets confused when lfs mode is forced, so don't # elfutils gets confused when lfs mode is forced, so don't
ELFUTILS_CONF_ENV += \ ELFUTILS_CONF_ENV += \
CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \ CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \
CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))" CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))"
endif endif
ELFUTILS_LDFLAGS = $(TARGET_LDFLAGS) ELFUTILS_LDFLAGS = $(TARGET_LDFLAGS)

View File

@ -27,17 +27,17 @@ HOST_GCC_FINAL_SUBDIR = build
HOST_GCC_FINAL_PRE_CONFIGURE_HOOKS += HOST_GCC_CONFIGURE_SYMLINK HOST_GCC_FINAL_PRE_CONFIGURE_HOOKS += HOST_GCC_CONFIGURE_SYMLINK
define HOST_GCC_FINAL_CONFIGURE_CMDS define HOST_GCC_FINAL_CONFIGURE_CMDS
(cd $(HOST_GCC_FINAL_SRCDIR) && rm -rf config.cache; \ (cd $(HOST_GCC_FINAL_SRCDIR) && rm -rf config.cache; \
$(HOST_CONFIGURE_OPTS) \ $(HOST_CONFIGURE_OPTS) \
CFLAGS="$(HOST_CFLAGS)" \ CFLAGS="$(HOST_CFLAGS)" \
LDFLAGS="$(HOST_LDFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \
$(HOST_GCC_FINAL_CONF_ENV) \ $(HOST_GCC_FINAL_CONF_ENV) \
./configure \ ./configure \
--prefix="$(HOST_DIR)/usr" \ --prefix="$(HOST_DIR)/usr" \
--sysconfdir="$(HOST_DIR)/etc" \ --sysconfdir="$(HOST_DIR)/etc" \
--enable-static \ --enable-static \
$(QUIET) $(HOST_GCC_FINAL_CONF_OPTS) \ $(QUIET) $(HOST_GCC_FINAL_CONF_OPTS) \
) )
endef endef

View File

@ -26,8 +26,8 @@ GCC_SOURCE ?= gcc-$(GCC_VERSION).tar.bz2
# #
define HOST_GCC_XTENSA_OVERLAY_EXTRACT define HOST_GCC_XTENSA_OVERLAY_EXTRACT
tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip,\ tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip,\
$(BR2_XTENSA_CORE_NAME)).tar -C $(@D) --strip-components=1 gcc $(BR2_XTENSA_CORE_NAME)).tar -C $(@D) --strip-components=1 gcc
endef endef
# #

View File

@ -19,8 +19,8 @@ GSL_CONFIG_SCRIPTS = gsl-config
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
ifneq ($(BR2_i386),y) ifneq ($(BR2_i386),y)
GSL_CONF_ENV = \ GSL_CONF_ENV = \
ac_cv_have_decl_feenableexcept=no \ ac_cv_have_decl_feenableexcept=no \
ac_cv_have_decl_fesettrapenable=no ac_cv_have_decl_fesettrapenable=no
endif endif
endif endif

View File

@ -31,7 +31,7 @@ endif
# Remove /usr/share/lftp # Remove /usr/share/lftp
define LFTP_REMOVE_DATA define LFTP_REMOVE_DATA
$(RM) -fr $(TARGET_DIR)/usr/share/lftp $(RM) -fr $(TARGET_DIR)/usr/share/lftp
endef endef
LFTP_POST_INSTALL_TARGET_HOOKS += LFTP_REMOVE_DATA LFTP_POST_INSTALL_TARGET_HOOKS += LFTP_REMOVE_DATA

View File

@ -21,7 +21,7 @@ endif
LIBSOUP_CONF_OPTS = --disable-glibtest LIBSOUP_CONF_OPTS = --disable-glibtest
LIBSOUP_DEPENDENCIES = host-pkgconf host-libglib2 \ LIBSOUP_DEPENDENCIES = host-pkgconf host-libglib2 \
libglib2 libxml2 sqlite host-intltool libglib2 libxml2 sqlite host-intltool
ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y) ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y)
LIBSOUP_CONF_OPTS += --with-gnome LIBSOUP_CONF_OPTS += --with-gnome

View File

@ -39,9 +39,9 @@ endif
# The .tar.bz2 contains another .tar, which contains the source code. # The .tar.bz2 contains another .tar, which contains the source code.
define LSOF_EXTRACT_CMDS define LSOF_EXTRACT_CMDS
$(call suitable-extractor,$(LSOF_SOURCE)) $(DL_DIR)/$(LSOF_SOURCE) | \ $(call suitable-extractor,$(LSOF_SOURCE)) $(DL_DIR)/$(LSOF_SOURCE) | \
$(TAR) -O $(TAR_OPTIONS) - lsof_$(LSOF_VERSION)/lsof_$(LSOF_VERSION)_src.tar | \ $(TAR) -O $(TAR_OPTIONS) - lsof_$(LSOF_VERSION)/lsof_$(LSOF_VERSION)_src.tar | \
$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(LSOF_DIR) $(TAR_OPTIONS) - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(LSOF_DIR) $(TAR_OPTIONS) -
endef endef
define LSOF_CONFIGURE_CMDS define LSOF_CONFIGURE_CMDS

View File

@ -34,15 +34,15 @@ define MIDORI_CONFIGURE_CMDS
$(HOST_DIR)/usr/bin/python2 ./waf configure \ $(HOST_DIR)/usr/bin/python2 ./waf configure \
--prefix=/usr \ --prefix=/usr \
--disable-libnotify \ --disable-libnotify \
) )
endef endef
define MIDORI_BUILD_CMDS define MIDORI_BUILD_CMDS
(cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS)) (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS))
endef endef
define MIDORI_INSTALL_TARGET_CMDS define MIDORI_INSTALL_TARGET_CMDS
(cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) install) (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) install)
endef endef
$(eval $(generic-package)) $(eval $(generic-package))

View File

@ -18,7 +18,7 @@ NCFTP_DEPENDENCIES = host-autoconf
# We need to pass -I because of the non-standard m4 directory name, and # We need to pass -I because of the non-standard m4 directory name, and
# none of the other autotools are used, so the below is the easiest. # none of the other autotools are used, so the below is the easiest.
define NCFTP_RUN_AUTOCONF define NCFTP_RUN_AUTOCONF
(cd $(@D); $(HOST_DIR)/usr/bin/autoconf -I$(@D)/autoconf_local/) (cd $(@D); $(HOST_DIR)/usr/bin/autoconf -I$(@D)/autoconf_local/)
endef endef
NCFTP_PRE_CONFIGURE_HOOKS += NCFTP_RUN_AUTOCONF NCFTP_PRE_CONFIGURE_HOOKS += NCFTP_RUN_AUTOCONF

View File

@ -5,18 +5,18 @@ config BR2_PACKAGE_NETCAT_OPENBSD
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_USES_GLIBC
help help
A simple Unix utility which reads and writes data across network A simple Unix utility which reads and writes data across network
connections using TCP or UDP protocol. It is designed to be a connections using TCP or UDP protocol. It is designed to be a
reliable "back-end" tool that can be used directly or easily driven reliable "back-end" tool that can be used directly or easily driven
by other programs and scripts. At the same time it is a feature-rich by other programs and scripts. At the same time it is a feature-rich
network debugging and exploration tool, since it can create almost network debugging and exploration tool, since it can create almost
any kind of connection you would need and has several interesting any kind of connection you would need and has several interesting
built-in capabilities. built-in capabilities.
This package contains the OpenBSD rewrite of netcat, including This package contains the OpenBSD rewrite of netcat, including
support for IPv6, proxies, and Unix sockets. support for IPv6, proxies, and Unix sockets.
https://packages.debian.org/sid/netcat-openbsd https://packages.debian.org/sid/netcat-openbsd
comment "netcat-openbsd needs an (e)glibc toolchain w/ threads" comment "netcat-openbsd needs an (e)glibc toolchain w/ threads"
depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS

View File

@ -20,7 +20,7 @@ OPENTYRIAN_NETWORK = false
endif endif
define OPENTYRIAN_BUILD_CMDS define OPENTYRIAN_BUILD_CMDS
$(MAKE) PLATFORM=UNIX \ $(MAKE) PLATFORM=UNIX \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
STRIP="/bin/true" \ STRIP="/bin/true" \
SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \ SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \

View File

@ -162,7 +162,7 @@ define $(2)_CONFIGURE_CMDS
$$(HOST_CONFIGURE_OPTS) \ $$(HOST_CONFIGURE_OPTS) \
CFLAGS="$$(HOST_CFLAGS)" \ CFLAGS="$$(HOST_CFLAGS)" \
LDFLAGS="$$(HOST_LDFLAGS)" \ LDFLAGS="$$(HOST_LDFLAGS)" \
$$($$(PKG)_CONF_ENV) \ $$($$(PKG)_CONF_ENV) \
CONFIG_SITE=/dev/null \ CONFIG_SITE=/dev/null \
./configure \ ./configure \
--prefix="$$(HOST_DIR)/usr" \ --prefix="$$(HOST_DIR)/usr" \
@ -187,8 +187,8 @@ endif
# Hook to update config.sub and config.guess if needed # Hook to update config.sub and config.guess if needed
# #
define UPDATE_CONFIG_HOOK define UPDATE_CONFIG_HOOK
@$$(call MESSAGE,"Updating config.sub and config.guess") @$$(call MESSAGE,"Updating config.sub and config.guess")
$$(call CONFIG_UPDATE,$$(@D)) $$(call CONFIG_UPDATE,$$(@D))
endef endef
$(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK

View File

@ -16,12 +16,12 @@ REDIS_BUILDOPTS = $(TARGET_CONFIGURE_OPTS) \
PREFIX=$(TARGET_DIR)/usr MALLOC=libc \ PREFIX=$(TARGET_DIR)/usr MALLOC=libc \
define REDIS_BUILD_CMDS define REDIS_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D) $(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D)
endef endef
define REDIS_INSTALL_TARGET_CMDS define REDIS_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D) \ $(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D) \
LDCONFIG=true install LDCONFIG=true install
endef endef
$(eval $(generic-package)) $(eval $(generic-package))

View File

@ -12,9 +12,9 @@ SAM_BA_LICENSE = BSD-like (partly binary-only)
SAM_BA_LICENSE_FILES = doc/readme.txt SAM_BA_LICENSE_FILES = doc/readme.txt
define HOST_SAM_BA_EXTRACT_CMDS define HOST_SAM_BA_EXTRACT_CMDS
unzip -d $(BUILD_DIR) $(DL_DIR)/$(SAM_BA_SOURCE) unzip -d $(BUILD_DIR) $(DL_DIR)/$(SAM_BA_SOURCE)
mv $(BUILD_DIR)/sam-ba_cdc_cdc_linux/* $(@D) mv $(BUILD_DIR)/sam-ba_cdc_cdc_linux/* $(@D)
rmdir $(BUILD_DIR)/sam-ba_cdc_cdc_linux/ rmdir $(BUILD_DIR)/sam-ba_cdc_cdc_linux/
endef endef
# Since it's a prebuilt application and it does not conform to the # Since it's a prebuilt application and it does not conform to the

View File

@ -36,12 +36,12 @@ SDL_IMAGE_DEPENDENCIES = sdl \
$(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),webp) $(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),webp)
HOST_SDL_IMAGE_CONF_OPTS = --with-sdl-prefix=$(HOST_DIR)/usr \ HOST_SDL_IMAGE_CONF_OPTS = --with-sdl-prefix=$(HOST_DIR)/usr \
--with-sdl-exec-prefix=$(HOST_DIR)/usr \ --with-sdl-exec-prefix=$(HOST_DIR)/usr \
--disable-sdltest \ --disable-sdltest \
--disable-static \ --disable-static \
--disable-jpg-shared \ --disable-jpg-shared \
--disable-png-shared \ --disable-png-shared \
--disable-tif-shared \ --disable-tif-shared \
HOST_SDL_IMAGE_DEPENDENCIES = host-libjpeg host-libpng host-sdl HOST_SDL_IMAGE_DEPENDENCIES = host-libjpeg host-libpng host-sdl

View File

@ -11,11 +11,11 @@ SIMICSFS_LICENSE_FILES = hostfs.h
SIMICSFS_DEPENDENCIES = linux SIMICSFS_DEPENDENCIES = linux
define SIMICSFS_BUILD_CMDS define SIMICSFS_BUILD_CMDS
$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) M=$(@D) modules $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) M=$(@D) modules
endef endef
define SIMICSFS_INSTALL_TARGET_CMDS define SIMICSFS_INSTALL_TARGET_CMDS
$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) M=$(@D) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) M=$(@D) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
endef endef
$(eval $(generic-package)) $(eval $(generic-package))

View File

@ -10,61 +10,61 @@ STRONGSWAN_SITE = http://download.strongswan.org
STRONGSWAN_LICENSE = GPLv2+ STRONGSWAN_LICENSE = GPLv2+
STRONGSWAN_LICENSE_FILES = COPYING LICENSE STRONGSWAN_LICENSE_FILES = COPYING LICENSE
STRONGSWAN_DEPENDENCIES = host-pkgconf STRONGSWAN_DEPENDENCIES = host-pkgconf
STRONGSWAN_CONF_OPTS += \ STRONGSWAN_CONF_OPTS += \
--without-lib-prefix \ --without-lib-prefix \
--enable-pkcs11=yes \ --enable-pkcs11=yes \
--enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no) \ --enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no) \
--enable-socket-default=$(if $(BR2_INET_IPV6),yes,no) \ --enable-socket-default=$(if $(BR2_INET_IPV6),yes,no) \
--enable-openssl=$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),yes,no) \ --enable-openssl=$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),yes,no) \
--enable-gcrypt=$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),yes,no) \ --enable-gcrypt=$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),yes,no) \
--enable-gmp=$(if $(BR2_PACKAGE_STRONGSWAN_GMP),yes,no) \ --enable-gmp=$(if $(BR2_PACKAGE_STRONGSWAN_GMP),yes,no) \
--enable-af-alg=$(if $(BR2_PACKAGE_STRONGSWAN_AF_ALG),yes,no) \ --enable-af-alg=$(if $(BR2_PACKAGE_STRONGSWAN_AF_ALG),yes,no) \
--enable-curl=$(if $(BR2_PACKAGE_STRONGSWAN_CURL),yes,no) \ --enable-curl=$(if $(BR2_PACKAGE_STRONGSWAN_CURL),yes,no) \
--enable-charon=$(if $(BR2_PACKAGE_STRONGSWAN_CHARON),yes,no) \ --enable-charon=$(if $(BR2_PACKAGE_STRONGSWAN_CHARON),yes,no) \
--enable-tnccs-11=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),yes,no) \ --enable-tnccs-11=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),yes,no) \
--enable-tnccs-20=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_20),yes,no) \ --enable-tnccs-20=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_20),yes,no) \
--enable-tnccs-dynamic=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC),yes,no) \ --enable-tnccs-dynamic=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC),yes,no) \
--enable-eap-sim-pcsc=$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),yes,no) \ --enable-eap-sim-pcsc=$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),yes,no) \
--enable-unity=$(if $(BR2_PACKAGE_STRONGSWAN_UNITY),yes,no) \ --enable-unity=$(if $(BR2_PACKAGE_STRONGSWAN_UNITY),yes,no) \
--enable-stroke=$(if $(BR2_PACKAGE_STRONGSWAN_STROKE),yes,no) \ --enable-stroke=$(if $(BR2_PACKAGE_STRONGSWAN_STROKE),yes,no) \
--enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQL),yes,no) \ --enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQL),yes,no) \
--enable-tools=$(if $(BR2_PACKAGE_STRONGSWAN_TOOLS),yes,no) \ --enable-tools=$(if $(BR2_PACKAGE_STRONGSWAN_TOOLS),yes,no) \
--enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no) --enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no)
ifeq ($(BR2_PACKAGE_STRONGSWAN_EAP),y) ifeq ($(BR2_PACKAGE_STRONGSWAN_EAP),y)
STRONGSWAN_CONF_OPTS += \ STRONGSWAN_CONF_OPTS += \
--enable-eap-sim \ --enable-eap-sim \
--enable-eap-sim-file \ --enable-eap-sim-file \
--enable-eap-aka \ --enable-eap-aka \
--enable-eap-aka-3gpp2 \ --enable-eap-aka-3gpp2 \
--enable-eap-simaka-sql \ --enable-eap-simaka-sql \
--enable-eap-simaka-pseudonym \ --enable-eap-simaka-pseudonym \
--enable-eap-simaka-reauth \ --enable-eap-simaka-reauth \
--enable-eap-identity \ --enable-eap-identity \
--enable-eap-md5 \ --enable-eap-md5 \
--enable-eap-gtc \ --enable-eap-gtc \
--enable-eap-mschapv2 \ --enable-eap-mschapv2 \
--enable-eap-tls \ --enable-eap-tls \
--enable-eap-ttls \ --enable-eap-ttls \
--enable-eap-peap \ --enable-eap-peap \
--enable-eap-tnc \ --enable-eap-tnc \
--enable-eap-dynamic \ --enable-eap-dynamic \
--enable-eap-radius --enable-eap-radius
STRONGSWAN_DEPENDENCIES += gmp STRONGSWAN_DEPENDENCIES += gmp
endif endif
STRONGSWAN_DEPENDENCIES += \ STRONGSWAN_DEPENDENCIES += \
$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),openssl) \ $(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),openssl) \
$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),libgcrypt) \ $(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),libgcrypt) \
$(if $(BR2_PACKAGE_STRONGSWAN_GMP),gmp) \ $(if $(BR2_PACKAGE_STRONGSWAN_GMP),gmp) \
$(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl) \ $(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl) \
$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2) \ $(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2) \
$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite) $(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite)
ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y) ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y)
STRONGSWAN_DEPENDENCIES += \ STRONGSWAN_DEPENDENCIES += \
$(if $(BR2_PACKAGE_SQLITE),sqlite) \ $(if $(BR2_PACKAGE_SQLITE),sqlite) \
$(if $(BR2_PACKAGE_MYSQL),mysql) $(if $(BR2_PACKAGE_MYSQL),mysql)
endif endif
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -26,12 +26,12 @@ VDE2_AUTORECONF = YES
# Note: disabled features can be added with corresponding dependencies # Note: disabled features can be added with corresponding dependencies
# in future commits. # in future commits.
VDE2_CONF_OPTS = --disable-experimental \ VDE2_CONF_OPTS = --disable-experimental \
--disable-cryptcab \ --disable-cryptcab \
--disable-pcap \ --disable-pcap \
--disable-python \ --disable-python \
--disable-profile \ --disable-profile \
--disable-kernel-switch \ --disable-kernel-switch \
--enable-tuntap \ --enable-tuntap \
# Package does not build in parallel due to improper make rules # Package does not build in parallel due to improper make rules
VDE2_MAKE = $(MAKE1) VDE2_MAKE = $(MAKE1)

View File

@ -252,9 +252,9 @@ endif
ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y) ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
VLC_CONF_OPTS += --enable-qt VLC_CONF_OPTS += --enable-qt
VLC_CONF_ENV += \ VLC_CONF_ENV += \
ac_cv_path_MOC=$(HOST_DIR)/usr/bin/moc \ ac_cv_path_MOC=$(HOST_DIR)/usr/bin/moc \
ac_cv_path_RCC=$(HOST_DIR)/usr/bin/rcc \ ac_cv_path_RCC=$(HOST_DIR)/usr/bin/rcc \
ac_cv_path_UIC=$(HOST_DIR)/usr/bin/uic ac_cv_path_UIC=$(HOST_DIR)/usr/bin/uic
VLC_DEPENDENCIES += qt VLC_DEPENDENCIES += qt
else else
VLC_CONF_OPTS += --disable-qt VLC_CONF_OPTS += --disable-qt

View File

@ -11,7 +11,7 @@ XCURSOR_TRANSPARENT_THEME_LICENSE = GPLv2
XCURSOR_TRANSPARENT_THEME_LICENSE_FILES = COPYING XCURSOR_TRANSPARENT_THEME_LICENSE_FILES = COPYING
define ICONS_DEFAULT_CONFIG_INSTALL define ICONS_DEFAULT_CONFIG_INSTALL
$(INSTALL) -m 0755 -D package/x11r7/xcursor-transparent-theme/index.theme \ $(INSTALL) -m 0755 -D package/x11r7/xcursor-transparent-theme/index.theme \
$(TARGET_DIR)/usr/share/icons/default/index.theme $(TARGET_DIR)/usr/share/icons/default/index.theme
endef endef

View File

@ -11,7 +11,7 @@ YMPD_LICENSE_FILE = LICENSE
YMPD_DEPENDENCIES = libmpdclient YMPD_DEPENDENCIES = libmpdclient
define YMPD_MAKE_HOST_TOOL define YMPD_MAKE_HOST_TOOL
$(HOSTCC) $(HOST_CFLAGS) $(@D)/htdocs/mkdata.c -o $(@D)/mkdata $(HOSTCC) $(HOST_CFLAGS) $(@D)/htdocs/mkdata.c -o $(@D)/mkdata
endef endef
YMPD_PRE_BUILD_HOOKS += YMPD_MAKE_HOST_TOOL YMPD_PRE_BUILD_HOOKS += YMPD_MAKE_HOST_TOOL