Browse Source

- buildsystem-helpers: turn TOUCH-variable into define

master
vanhofen 2 years ago
parent
commit
8dc2b03b0c
  1. 11
      make/buildsystem-helpers.mk
  2. 28
      make/linux-kernel.mk
  3. 28
      make/target-blobs.mk
  4. 2
      make/target-ffmpeg-coolstream.mk
  5. 2
      package/busybox/busybox.mk
  6. 2
      package/ca-bundle/ca-bundle.mk
  7. 4
      package/crosstool-ng/crosstool-ng.mk
  8. 2
      package/djmount/djmount.mk
  9. 2
      package/doscam-webif-skin/doscam-webif-skin.mk
  10. 2
      package/gettext/gettext.mk
  11. 2
      package/graphlcd-base/graphlcd-base.mk
  12. 2
      package/libstb-hal/libstb-hal.mk
  13. 4
      package/lua/lua.mk
  14. 2
      package/luajson/luajson.mk
  15. 2
      package/neutrino-mediathek/neutrino-mediathek.mk
  16. 2
      package/neutrino-plugins/neutrino-plugins.mk
  17. 2
      package/neutrino/neutrino.mk
  18. 2
      package/samba/samba.mk
  19. 2
      package/samba33/samba33.mk
  20. 2
      package/samba36/samba36.mk

11
make/buildsystem-helpers.mk

@ -19,6 +19,12 @@ endef
# -----------------------------------------------------------------------------
define TOUCH
@touch $(if $(findstring host-,$(@)),$(HOST_DEPS_DIR),$(DEPS_DIR))/$(@)
endef
# -----------------------------------------------------------------------------
# download archives into download directory
GET_ARCHIVE = wget --no-check-certificate -t3 -T60 -c -P
@ -159,7 +165,7 @@ define HOST_FOLLOWUP
$(REMOVE)/$($(PKG)_DIR)
$(foreach hook,$($(PKG)_HOST_FINALIZE_HOOKS),$(call $(hook))$(sep))
$(foreach hook,$($(PKG)_POST_FOLLOWUP_HOOKS),$(call $(hook))$(sep))
$(TOUCH)
$(call TOUCH)
endef
define TARGET_FOLLOWUP
@ -170,7 +176,7 @@ define TARGET_FOLLOWUP
$(REMOVE)/$($(PKG)_DIR)
$(foreach hook,$($(PKG)_TARGET_FINALIZE_HOOKS),$(call $(hook))$(sep))
$(foreach hook,$($(PKG)_POST_FOLLOWUP_HOOKS),$(call $(hook))$(sep))
$(TOUCH)
$(call TOUCH)
endef
# -----------------------------------------------------------------------------
@ -199,7 +205,6 @@ CD = set -e; cd
CHDIR = $(CD) $(BUILD_DIR)
MKDIR = $(INSTALL) -d $(BUILD_DIR)
CPDIR = cp -a -t $(BUILD_DIR) $(DL_DIR)
TOUCH = @touch $(if $(findstring host-,$(@)),$(HOST_DEPS_DIR),$(DEPS_DIR))/$(@)
SED = $(shell which sed || type -p sed || echo sed) -i -e
GET_GIT_ARCHIVE = support/scripts/get-git-archive.sh

28
make/linux-kernel.mk

@ -241,7 +241,7 @@ kernel.do_prepare: | $(DEPS_DIR) $(BUILD_DIR)
ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61 multiboxse))
$(INSTALL_DATA) $(PKG_FILES_DIR)/initramfs-subdirboot.cpio.gz $(KERNEL_OBJ_DIR)
endif
$(TOUCH)
$(call TOUCH)
kernel.do_prepare_git:
$(MAKE) kernel.do_checkout
@ -263,22 +263,22 @@ kernel.do_compile: kernel.do_prepare
ifneq ($(KERNEL_DTB),$(empty))
cat $(KERNEL_ZIMAGE) $(KERNEL_DTB) > $(KERNEL_ZIMAGE_DTB)
endif
$(TOUCH)
$(call TOUCH)
# -----------------------------------------------------------------------------
kernel: kernel-$(BOXTYPE) kernel-modules-$(BOXTYPE)
$(TOUCH)
$(call TOUCH)
# -----------------------------------------------------------------------------
kernel-coolstream: kernel-coolstream-$(BOXSERIES)
$(TOUCH)
$(call TOUCH)
kernel-coolstream-hd1: kernel.do_compile | $(IMAGE_DIR)
$(HOST_MKIMAGE) -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE) $(TARGET_localstatedir)/update/zImage
$(INSTALL_DATA) $(TARGET_localstatedir)/update/zImage $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img
$(TOUCH)
$(call TOUCH)
kernel-coolstream-hd2: kernel.do_compile | $(IMAGE_DIR)
$(HOST_MKIMAGE) -A $(TARGET_ARCH) -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE_DTB) $(TARGET_localstatedir)/update/vmlinux.ub.gz
@ -292,19 +292,19 @@ ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner))
$(INSTALL_DATA) $(TARGET_localstatedir)/update/vmlinux.ub.gz $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-apollo-vmlinux.ub.gz
endif
endif
$(TOUCH)
$(call TOUCH)
kernel-armbox: kernel.do_compile | $(IMAGE_DIR)
$(TOUCH)
$(call TOUCH)
kernel-mipsbox: kernel.do_compile | $(IMAGE_DIR)
gzip -9c < $(KERNEL_VMLINUX) > $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL).bin
$(TOUCH)
$(call TOUCH)
# -----------------------------------------------------------------------------
kernel-modules-coolstream: kernel-modules-coolstream-$(BOXSERIES)
$(TOUCH)
$(call TOUCH)
STRIP_MODULES_COOLSTREAM_HD1 =
STRIP_MODULES_COOLSTREAM_HD1 += kernel/drivers/mtd/devices/mtdram.ko
@ -327,7 +327,7 @@ kernel-modules-coolstream-hd1: kernel-coolstream
rm -f $(TARGET_modulesdir)/usb-storage.ko # already builtin
$(LINUX_RUN_DEPMOD)
find $(TARGET_modulesdir) -type f -name 'modules.*' -not -name 'modules.dep' -print0 | xargs -0 rm --
$(TOUCH)
$(call TOUCH)
kernel-modules-coolstream-hd2: kernel-coolstream
$(INSTALL) -d $(TARGET_modulesdir)
@ -336,7 +336,7 @@ kernel-modules-coolstream-hd2: kernel-coolstream
$(INSTALL_DATA) $(KERNEL_modulesdir)/modules.order $(TARGET_modulesdir)
$(LINUX_RUN_DEPMOD)
make rtl8192eu
$(TOUCH)
$(call TOUCH)
kernel-modules-armbox: kernel-armbox
$(INSTALL) -d $(TARGET_modulesdir)
@ -352,7 +352,7 @@ endif
ifeq ($(BOXSERIES),hd6x)
make hd6x-mali-drivers
endif
$(TOUCH)
$(call TOUCH)
kernel-modules-mipsbox: kernel-mipsbox
$(INSTALL) -d $(TARGET_modulesdir)
@ -360,13 +360,13 @@ kernel-modules-mipsbox: kernel-mipsbox
$(INSTALL_DATA) $(KERNEL_modulesdir)/modules.builtin $(TARGET_modulesdir)
$(INSTALL_DATA) $(KERNEL_modulesdir)/modules.order $(TARGET_modulesdir)
$(LINUX_RUN_DEPMOD)
$(TOUCH)
$(call TOUCH)
# -----------------------------------------------------------------------------
vmlinuz-initrd: $(DL_DIR)/$(VMLINUZ_INITRD_SOURCE)
$(UNTAR)/$(VMLINUZ_INITRD_SOURCE)
$(TOUCH)
$(call TOUCH)
# -----------------------------------------------------------------------------

28
make/target-blobs.mk

@ -17,17 +17,17 @@ endif
ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse))
$(MAKE) vuplus-platform-util
endif
$(TOUCH)
$(call TOUCH)
# -----------------------------------------------------------------------------
firmware: firmware-boxmodel firmware-wireless
$(TOUCH)
$(call TOUCH)
firmware-boxmodel: $(SOURCE_DIR)/$(NI_DRIVERS_BIN) | $(TARGET_DIR)
$(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/lib-firmware/.,$(TARGET_base_libdir)/firmware)
$(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/lib-firmware-dvb/.,$(TARGET_base_libdir)/firmware)
$(TOUCH)
$(call TOUCH)
ifeq ($(BOXMODEL),nevis)
FIRMWARE_WIRELESS = rt2870.bin
@ -43,7 +43,7 @@ firmware-wireless: $(SOURCE_DIR)/$(NI_DRIVERS_BIN) | $(TARGET_DIR)
for firmware in $(FIRMWARE_WIRELESS); do \
$(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/general/firmware-wireless/$$firmware $(TARGET_base_libdir)/firmware/$$firmware; \
done
$(TOUCH)
$(call TOUCH)
# -----------------------------------------------------------------------------
@ -163,7 +163,7 @@ ifeq ($(BOXMODEL),nevis)
ln -sf $(KERNEL_VERSION) $(TARGET_modulesdir)-$(BOXMODEL)
endif
$(LINUX_RUN_DEPMOD)
$(TOUCH)
$(call TOUCH)
hd51-drivers \
bre2ze4k-drivers \
@ -171,7 +171,7 @@ h7-drivers: $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) | $(TARGET_DIR)
$(INSTALL) -d $(TARGET_modulesdir)/extra
unzip -o $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) -d $(TARGET_modulesdir)/extra
$(LINUX_RUN_DEPMOD)
$(TOUCH)
$(call TOUCH)
hd60-drivers \
hd61-drivers \
@ -181,7 +181,7 @@ multiboxse-drivers: $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) | $(TARGET_DIR)
$(TARGET_RM) $(TARGET_modulesdir)/extra/hi_play.ko
mv $(TARGET_modulesdir)/extra/turnoff_power $(TARGET_bindir)
$(LINUX_RUN_DEPMOD)
$(TOUCH)
$(call TOUCH)
vusolo4k-drivers \
vuduo4k-drivers \
@ -195,7 +195,7 @@ vuplus-drivers: $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) | $(TARGET_DIR)
$(INSTALL) -d $(TARGET_modulesdir)/extra
tar -xf $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) -C $(TARGET_modulesdir)/extra
$(LINUX_RUN_DEPMOD)
$(TOUCH)
$(call TOUCH)
# -----------------------------------------------------------------------------
@ -285,14 +285,14 @@ h7-libgles: $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) | $(TARGET_DIR)
unzip -o $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) -d $(TARGET_libdir)
ln -sf libv3ddriver.so $(TARGET_libdir)/libEGL.so
ln -sf libv3ddriver.so $(TARGET_libdir)/libGLESv2.so
$(TOUCH)
$(call TOUCH)
$(DL_DIR)/$(HD6X_LIBGLES_HEADERS_SOURCE):
$(download) $(HD6X_LIBGLES_HEADERS_SITE)/$(HD6X_LIBGLES_HEADERS_SOURCE)
hd6x-libgles-headers: $(DL_DIR)/$(HD6X_LIBGLES_HEADERS_SOURCE) | $(TARGET_DIR)
unzip -o $(DL_DIR)/$(HD6X_LIBGLES_HEADERS_SOURCE) -d $(TARGET_includedir)
$(TOUCH)
$(call TOUCH)
hd60-libgles \
hd61-libgles \
@ -304,7 +304,7 @@ multiboxse-libgles: $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) | $(TARGET_DIR)
ln -sf libMali.so libGLESv1_CM.so.1.1; ln -sf libGLESv1_CM.so.1.1 libGLESv1_CM.so.1; ln -sf libGLESv1_CM.so.1 libGLESv1_CM.so; \
ln -sf libMali.so libGLESv2.so.2.0; ln -sf libGLESv2.so.2.0 libGLESv2.so.2; ln -sf libGLESv2.so.2 libGLESv2.so; \
ln -sf libMali.so libgbm.so
$(TOUCH)
$(call TOUCH)
vusolo4k-libgles \
vuduo4k-libgles \
@ -321,7 +321,7 @@ vuplus-libgles: $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) | $(TARGET_DIR)
ln -sf libv3ddriver.so $(TARGET_libdir)/libGLESv2.so
$(INSTALL_COPY) $(BUILD_DIR)/$(BOXMODEL_LIBGLES_DIR)/include/* $(TARGET_includedir)
$(REMOVE)/$(BOXMODEL_LIBGLES_DIR)
$(TOUCH)
$(call TOUCH)
# -----------------------------------------------------------------------------
@ -362,7 +362,7 @@ multiboxse-libs: $(DL_DIR)/$(BOXMODEL_LIBS_SOURCE) | $(TARGET_DIR)
$(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL_LIBS_DIR)/ffmpeg/* $(TARGET_libdir)/hisilicon
ln -sf /lib/ld-linux-armhf.so.3 $(TARGET_libdir)/hisilicon/ld-linux.so
$(REMOVE)/$(BOXMODEL_LIBS_DIR)
$(TOUCH)
$(call TOUCH)
# -----------------------------------------------------------------------------
@ -422,4 +422,4 @@ ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuduo4k))
$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/bp3flash.sh $(TARGET_bindir)/bp3flash.sh
endif
$(REMOVE)/$(BOXMODEL_PLATFORM_UTIL_DIR)
$(TOUCH)
$(call TOUCH)

2
make/target-ffmpeg-coolstream.mk

@ -193,4 +193,4 @@ ffmpeg: $(FFMPEG_DEPENDENCIES) | $(TARGET_DIR)
$(MAKE); \
$(MAKE) install DESTDIR=$(TARGET_DIR)
$(REMOVE)/$(NI_FFMPEG)
$(TOUCH)
$(call TOUCH)

2
package/busybox/busybox.mk

@ -150,4 +150,4 @@ busybox: $(BUSYBOX_DEPENDENCIES) $(DL_DIR)/$(BUSYBOX_SOURCE) | $(TARGET_DIR)
$($(PKG)_ADD_TO_SHELLS)
$($(PKG)_INSTALL_FILES)
$(REMOVE)/$(PKG_DIR)
$(TOUCH)
$(call TOUCH)

2
package/ca-bundle/ca-bundle.mk

@ -17,4 +17,4 @@ ca-bundle: $(DL_DIR)/$(CA_BUNDLE_SOURCE) | $(TARGET_DIR)
$(CD) $(DL_DIR); \
curl --remote-name --remote-time -z $(PKG_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) || true
$(INSTALL_DATA) -D $(DL_DIR)/$(PKG_SOURCE) $(TARGET_DIR)/$(CA_BUNDLE_DIR)/$(CA_BUNDLE_CRT)
$(TOUCH)
$(call TOUCH)

4
package/crosstool-ng/crosstool-ng.mk

@ -111,7 +111,7 @@ crosstool-ng.do_prepare: | $(DEPS_DIR) $(BUILD_DIR)
test -f ./configure || ./bootstrap; \
./configure --enable-local; \
MAKELEVEL=0 make
$(TOUCH)
$(call TOUCH)
crosstool-ng.do_compile: crosstool-ng.do_prepare
$(CHDIR)/$($(PKG)_DIR); \
@ -119,7 +119,7 @@ crosstool-ng.do_compile: crosstool-ng.do_prepare
export $($(PKG)_EXPORT); \
./ct-ng oldconfig; \
./ct-ng build
$(TOUCH)
$(call TOUCH)
# -----------------------------------------------------------------------------

2
package/djmount/djmount.mk

@ -32,4 +32,4 @@ djmount: $(DJMOUNT_DEPENDENCIES) $(DL_DIR)/$(DJMOUNT_SOURCE) | $(TARGET_DIR)
$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/djmount.init $(TARGET_sysconfdir)/init.d/djmount
$(UPDATE-RC.D) djmount defaults 75 25
$(REMOVE)/$(PKG_DIR)
$(TOUCH)
$(call TOUCH)

2
package/doscam-webif-skin/doscam-webif-skin.mk

@ -7,4 +7,4 @@
doscam-webif-skin:
$(INSTALL_DATA) -D $(PKG_FILES_DIR)/doscam_ni-dark.css $(TARGET_datadir)/doscam/skin/doscam_ni-dark.css
$(INSTALL_DATA) -D $(PKG_FILES_DIR)/IC_doscam_ni.tpl $(TARGET_datadir)/doscam/tpl/IC_doscam_ni.tpl
$(TOUCH)
$(call TOUCH)

2
package/gettext/gettext.mk

@ -35,4 +35,4 @@ gettext: $(DL_DIR)/$(GETTEXT_SOURCE) | $(TARGET_DIR)
$(MAKE) -C gettext-runtime install DESTDIR=$(TARGET_DIR)
$(call REWRITE_LIBTOOL)
$(REMOVE)/$(PKG_DIR)
$(TOUCH)
$(call TOUCH)

2
package/graphlcd-base/graphlcd-base.mk

@ -29,4 +29,4 @@ graphlcd-base: $(GRAPHLCD_BASE_DEPENDENCIES) | $(TARGET_DIR)
$(MAKE) install DESTDIR=$(TARGET_DIR) PREFIX=$(prefix)
$(TARGET_RM) $(TARGET_sysconfdir)/udev
$(REMOVE)/$(PKG_DIR)
$(TOUCH)
$(call TOUCH)

2
package/libstb-hal/libstb-hal.mk

@ -53,7 +53,7 @@ libstb-hal: $(LIBSTB_HAL_BUILD_DIR)/config.status
$(MAKE) -C $(LIBSTB_HAL_BUILD_DIR)
$(MAKE) -C $(LIBSTB_HAL_BUILD_DIR) install DESTDIR=$(NEUTRINO_INST_DIR)
$(call REWRITE_LIBTOOL)
$(TOUCH)
$(call TOUCH)
# -----------------------------------------------------------------------------

4
package/lua/lua.mk

@ -30,7 +30,7 @@ lua: $(LUA_DEPENDENCIES) $(DL_DIR)/$(LUA_SOURCE) | $(TARGET_DIR)
$(MAKE) pc INSTALL_TOP=$(TARGET_prefix) > $(TARGET_libdir)/pkgconfig/lua.pc
$(TARGET_RM) $(TARGET_bindir)/luac
$(REMOVE)/$(LUA_DIR)
$(TOUCH)
$(call TOUCH)
# -----------------------------------------------------------------------------
@ -55,4 +55,4 @@ host-lua: $(DL_DIR)/$(HOST_LUA_SOURCE) | $(HOST_DIR)
$(MAKE) linux; \
$(MAKE) install INSTALL_TOP=$(HOST_DIR) INSTALL_MAN=$(HOST_DIR)/share/man/man1
$(REMOVE)/$(PKG_DIR)
$(TOUCH)
$(call TOUCH)

2
package/luajson/luajson.mk

@ -15,4 +15,4 @@ luajson: $(DL_DIR)/$(LUAJSON_SOURCE) | $(TARGET_DIR)
curl --remote-name --time-cond $(PKG_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) || true
$(INSTALL_DATA) -D $(DL_DIR)/$(PKG_SOURCE) $(TARGET_datadir)/lua/$(LUA_ABIVERSION)
ln -sf $(PKG_SOURCE) $(TARGET_datadir)/lua/$(LUA_ABIVERSION)/json.lua
$(TOUCH)
$(call TOUCH)

2
package/neutrino-mediathek/neutrino-mediathek.mk

@ -20,4 +20,4 @@ neutrino-mediathek: $(SHARE_PLUGINS) | $(TARGET_DIR)
# temporarily use beta-version from our board
rm -rf $(SHARE_PLUGINS)/neutrino-mediathek*
$(INSTALL_COPY) $(SOURCE_DIR)/$(NI_NEUTRINO_PLUGINS)/scripts-lua/plugins/mediathek/* $(SHARE_PLUGINS)/
$(TOUCH)
$(call TOUCH)

2
package/neutrino-plugins/neutrino-plugins.mk

@ -120,7 +120,7 @@ neutrino-plugins: neutrino $(NEUTRINO_PLUGINS_BUILD_DIR)/config.status
$(MAKE) -C $(NEUTRINO_PLUGINS_BUILD_DIR)
$(MAKE) -C $(NEUTRINO_PLUGINS_BUILD_DIR) install DESTDIR=$(TARGET_DIR)
$(NEUTRINO_PLUGINS_RUNLEVEL_LINKS_INSTALL)
$(TOUCH)
$(call TOUCH)
# -----------------------------------------------------------------------------

2
package/neutrino/neutrino.mk

@ -167,7 +167,7 @@ neutrino: $(NEUTRINO_BUILD_DIR)/config.status
$(MAKE) -C $(NEUTRINO_BUILD_DIR)
$(MAKE) -C $(NEUTRINO_BUILD_DIR) install DESTDIR=$(NEUTRINO_INST_DIR)
$(INSTALL_EXEC) $(PKG_FILES_DIR)/start_neutrino $(TARGET_sysconfdir)/init.d/start_neutrino
$(TOUCH)
$(call TOUCH)
# -----------------------------------------------------------------------------

2
package/samba/samba.mk

@ -5,4 +5,4 @@
################################################################################
samba: $(if $(filter $(BOXSERIES),hd1),samba33,samba36)
$(TOUCH)
$(call TOUCH)

2
package/samba33/samba33.mk

@ -71,4 +71,4 @@ samba33: | $(TARGET_DIR)
$(UPDATE-RC.D) samba defaults 75 25
$(TARGET_RM) $(addprefix $(TARGET_bindir)/,testparm findsmb smbtar smbclient smbpasswd)
$(REMOVE)/$(PKG_DIR)
$(TOUCH)
$(call TOUCH)

2
package/samba36/samba36.mk

@ -69,4 +69,4 @@ samba36: $(SAMBA36_DEPENDENCIES) $(DL_DIR)/$(SAMBA36_SOURCE) | $(TARGET_DIR)
$(UPDATE-RC.D) samba defaults 75 25
$(TARGET_RM) $(addprefix $(TARGET_bindir)/,testparm findsmb smbtar smbclient smbpasswd)
$(REMOVE)/$(PKG_DIR)
$(TOUCH)
$(call TOUCH)

Loading…
Cancel
Save