From 6597822db133af10e271e14711ed32f22bffba3c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 25 Jun 2019 04:26:03 +0200 Subject: [PATCH] - rename system-*.mk => target-*.mk --- Makefile | 20 +++++----- ...m-development.mk => target-development.mk} | 0 ...mpeg-armbox.mk => target-ffmpeg-armbox.mk} | 0 ...lstream.mk => target-ffmpeg-coolstream.mk} | 0 ...r-unused.mk => target-gstreamer-unused.mk} | 0 ...m-libs-unused.mk => target-libs-unused.mk} | 0 make/{system-libs.mk => target-libs.mk} | 0 make/{system-lua.mk => target-lua.mk} | 0 make/{rootfs.mk => target-rootfs.mk} | 37 +++++++++---------- make/{system-scripts.mk => target-scripts.mk} | 0 ...tools-unused.mk => target-tools-unused.mk} | 0 make/{system-tools.mk => target-tools.mk} | 0 12 files changed, 28 insertions(+), 29 deletions(-) rename make/{system-development.mk => target-development.mk} (100%) rename make/{system-ffmpeg-armbox.mk => target-ffmpeg-armbox.mk} (100%) rename make/{system-ffmpeg-coolstream.mk => target-ffmpeg-coolstream.mk} (100%) rename make/{system-gstreamer-unused.mk => target-gstreamer-unused.mk} (100%) rename make/{system-libs-unused.mk => target-libs-unused.mk} (100%) rename make/{system-libs.mk => target-libs.mk} (100%) rename make/{system-lua.mk => target-lua.mk} (100%) rename make/{rootfs.mk => target-rootfs.mk} (99%) rename make/{system-scripts.mk => target-scripts.mk} (100%) rename make/{system-tools-unused.mk => target-tools-unused.mk} (100%) rename make/{system-tools.mk => target-tools.mk} (100%) diff --git a/Makefile b/Makefile index 3488c7d8..4758b39b 100755 --- a/Makefile +++ b/Makefile @@ -135,17 +135,17 @@ include make/linux-drivers.mk include make/neutrino.mk include make/neutrino-plugins.mk include make/prerequisites.mk -include make/rootfs.mk include make/static-libs.mk -include make/system-development.mk -include make/system-ffmpeg-$(BOXTYPE).mk -include make/system-gstreamer-unused.mk -include make/system-libs-unused.mk -include make/system-libs.mk -include make/system-lua.mk -include make/system-scripts.mk -include make/system-tools-unused.mk -include make/system-tools.mk +include make/target-development.mk +include make/target-ffmpeg-$(BOXTYPE).mk +include make/target-gstreamer-unused.mk +include make/target-libs-unused.mk +include make/target-libs.mk +include make/target-lua.mk +include make/target-rootfs.mk +include make/target-scripts.mk +include make/target-tools-unused.mk +include make/target-tools.mk include make/host-tools.mk include make/update.mk diff --git a/make/system-development.mk b/make/target-development.mk similarity index 100% rename from make/system-development.mk rename to make/target-development.mk diff --git a/make/system-ffmpeg-armbox.mk b/make/target-ffmpeg-armbox.mk similarity index 100% rename from make/system-ffmpeg-armbox.mk rename to make/target-ffmpeg-armbox.mk diff --git a/make/system-ffmpeg-coolstream.mk b/make/target-ffmpeg-coolstream.mk similarity index 100% rename from make/system-ffmpeg-coolstream.mk rename to make/target-ffmpeg-coolstream.mk diff --git a/make/system-gstreamer-unused.mk b/make/target-gstreamer-unused.mk similarity index 100% rename from make/system-gstreamer-unused.mk rename to make/target-gstreamer-unused.mk diff --git a/make/system-libs-unused.mk b/make/target-libs-unused.mk similarity index 100% rename from make/system-libs-unused.mk rename to make/target-libs-unused.mk diff --git a/make/system-libs.mk b/make/target-libs.mk similarity index 100% rename from make/system-libs.mk rename to make/target-libs.mk diff --git a/make/system-lua.mk b/make/target-lua.mk similarity index 100% rename from make/system-lua.mk rename to make/target-lua.mk diff --git a/make/rootfs.mk b/make/target-rootfs.mk similarity index 99% rename from make/rootfs.mk rename to make/target-rootfs.mk index 162e1dcd..99610529 100644 --- a/make/rootfs.mk +++ b/make/target-rootfs.mk @@ -34,23 +34,6 @@ $(TARGET_DIR)/var/etc/update.urls: | $(TARGET_DIR) # ----------------------------------------------------------------------------- -e2-multiboot: | $(TARGET_DIR) - mkdir -p $(TARGET_DIR)/usr/bin - echo -e "#!/bin/sh\necho Nope!" > $(TARGET_DIR)/usr/bin/enigma2 - chmod 0755 $(TARGET_DIR)/usr/bin/enigma2 - # - echo -e "NI $(IMAGE_VERSION) \\\n \\\l\n" > $(TARGET_DIR)/etc/issue - # - mkdir -p $(TARGET_SHARE_DIR) - touch $(TARGET_SHARE_DIR)/bootlogo.mvi - # - mkdir -p $(TARGET_DIR)/var/lib/opkg - touch $(TARGET_DIR)/var/lib/opkg/status - # - cp -a $(TARGET_DIR)/.version $(TARGET_DIR)/etc/image-version - -# ----------------------------------------------------------------------------- - # create symbolic links in TARGET_DIR symbolic-links: | $(TARGET_DIR) $(CD) $(TARGET_DIR); \ @@ -88,6 +71,23 @@ endif # ----------------------------------------------------------------------------- +e2-multiboot: | $(TARGET_DIR) + mkdir -p $(TARGET_DIR)/usr/bin + echo -e "#!/bin/sh\necho Nope!" > $(TARGET_DIR)/usr/bin/enigma2 + chmod 0755 $(TARGET_DIR)/usr/bin/enigma2 + # + echo -e "NI $(IMAGE_VERSION) \\\n \\\l\n" > $(TARGET_DIR)/etc/issue + # + mkdir -p $(TARGET_SHARE_DIR) + touch $(TARGET_SHARE_DIR)/bootlogo.mvi + # + mkdir -p $(TARGET_DIR)/var/lib/opkg + touch $(TARGET_DIR)/var/lib/opkg/status + # + cp -a $(TARGET_DIR)/.version $(TARGET_DIR)/etc/image-version + +# ----------------------------------------------------------------------------- + personalize: | $(TARGET_DIR) $(call local-script,$(notdir $@),start) @LOCAL_ROOT=$(LOCAL_DIR)/root; \ @@ -189,11 +189,10 @@ PHONY += target-finish PHONY += .version $(TARGET_DIR)/.version PHONY += update.urls $(TARGET_DIR)/var/etc/update.urls PHONY += symbolic-links +PHONY += e2-multiboot PHONY += personalize PHONY += rootfs PHONY += $(ROOTFS) PHONY += rootfs-cleanup PHONY += rootfs-strip - -PHONY += e2-multiboot diff --git a/make/system-scripts.mk b/make/target-scripts.mk similarity index 100% rename from make/system-scripts.mk rename to make/target-scripts.mk diff --git a/make/system-tools-unused.mk b/make/target-tools-unused.mk similarity index 100% rename from make/system-tools-unused.mk rename to make/target-tools-unused.mk diff --git a/make/system-tools.mk b/make/target-tools.mk similarity index 100% rename from make/system-tools.mk rename to make/target-tools.mk