From 8c868fd221f2de28297a6d36500096e1690bd247 Mon Sep 17 00:00:00 2001 From: Markham Date: Thu, 6 Oct 2022 10:12:51 +0200 Subject: [PATCH] fix kernel-modules --- make/bootstrap.mk | 1 + make/cleantargets.mk | 1 + make/environment-build.mk | 1 + make/flashimage.mk | 5 ++--- make/kernel-arm.mk | 6 +++--- make/rootfs.mk | 38 ++++++++++++++++++-------------------- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/make/bootstrap.mk b/make/bootstrap.mk index 4a01f2e..c29ab4b 100755 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -12,6 +12,7 @@ BOOTSTRAP += $(D)/host_mtd-utils BOOTSTRAP += $(D)/host_mkcramfs BOOTSTRAP += $(D)/host_mksquashfs ifeq ($(BOXTYPE), armbox) +BOOTSTRAP += $(D)/host_mkimage BOOTSTRAP += $(D)/host_resize2fs BOOTSTRAP += $(D)/host_dosfstools BOOTSTRAP += $(D)/cortex-strings diff --git a/make/cleantargets.mk b/make/cleantargets.mk index b4493d6..5dcd57d 100755 --- a/make/cleantargets.mk +++ b/make/cleantargets.mk @@ -35,6 +35,7 @@ neutrino-clean: -make -C $(NEUTRINO_OBJDIR) uninstall distclean -rm -rf $(BUILD_TMP)/neutrino-hd -rm -rf $(BUILD_TMP)/rootfs + -rm -rf $(BUILD_TMP)/install -rm -rf $(D)/neutrino-hd rootfs-clean: diff --git a/make/environment-build.mk b/make/environment-build.mk index c23a632..7490e25 100755 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -14,6 +14,7 @@ PATCHES = $(BASE_DIR)/archive-patches IMAGEFILES = $(BASE_DIR)/archive-imagefiles BUILD_TMP = $(BASE_DIR)/build_tmp D = $(BASE_DIR)/deps +ROOTFS_DIR = $(BUILD_TMP)/rootfs # backwards compatibility DEPDIR = $(D) diff --git a/make/flashimage.mk b/make/flashimage.mk index 5637446..ac27a9b 100755 --- a/make/flashimage.mk +++ b/make/flashimage.mk @@ -35,8 +35,7 @@ RELEASE_DIR = $(BUILD_TMP)/install/linuxrootfs1 else RELEASE_DIR = $(BUILD_TMP)/install endif -IMAGE_DIR = $(BUILD_TMP)/image -ROOTFS = $(BUILD_TMP)/rootfs +IMAGE_DIR = $(BUILD_TMP)/image datadir = /usr/share # emmc image @@ -194,7 +193,7 @@ flash-prepare: $(START_BUILD) rm -fr $(RELEASE_DIR) mkdir -p $(RELEASE_DIR) - cp -r $(BUILD_TMP)/rootfs/. $(RELEASE_DIR) + cp -r $(ROOTFS_DIR)/. $(RELEASE_DIR) $(MAKE) flash-customize tar zcf $(BUILD_TMP)/rootfs.tar.gz -C $(RELEASE_DIR) --owner=0 --group=0 .; \ rm -fr $(RELEASE_DIR)/oldroot diff --git a/make/kernel-arm.mk b/make/kernel-arm.mk index be3c526..8203a75 100644 --- a/make/kernel-arm.mk +++ b/make/kernel-arm.mk @@ -155,7 +155,7 @@ else KERNEL_IMAGE = zImage endif -kernel: kernel-$(BOXTYPE) kernel-modules-$(BOXTYPE) +kernel: $(D)/kernel-$(BOXTYPE) $(D)/kernel-modules-$(BOXTYPE) $(D)/kernel-armbox: $(D)/kernel.do_compile ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x hd6x)) @@ -194,7 +194,7 @@ $(D)/kernel.do_prepare: $(ARCHIVE)/$(KERNEL_SRC) $(PATCHES)/armbox/$(KERNEL_CONF #endif $(TOUCH) -$(D)/kernel.do_compile: $(D)/kernel.do_prepare $(D)/host_mkimage +$(D)/kernel.do_compile: $(D)/kernel.do_prepare $(START_BUILD) ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x hd6x)) set -e; cd $(BUILD_TMP)/$(KERNEL_DIR); \ @@ -205,7 +205,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x hd6x)) endif #KERNEL = $(D)/kernel -$(D)/kernel-modules-armbox: kernel-armbox +$(D)/kernel-modules-armbox: $(D)/kernel-armbox install -d $(TARGET_modulesdir) install -d $(TARGET_modulesdir)/extra cp -a $(KERNEL_modulesdir)/kernel $(TARGET_modulesdir) diff --git a/make/rootfs.mk b/make/rootfs.mk index 7c63d96..c178581 100755 --- a/make/rootfs.mk +++ b/make/rootfs.mk @@ -1,38 +1,36 @@ # try to package a complete root fs for the box target -BOX = $(BUILD_TMP)/rootfs - $(D)/rootfs: $(D)/driver $(START_BUILD) - rm -rf $(BOX) - cp -a $(TARGETPREFIX) $(BOX) - mkdir -p $(BOX)/oldroot - rm -rf $(BOX)/include $(BOX)/mymodules - rm -rf $(BOX)/share/{aclocal,gdb,locale,doc} # locale not (yet) needed by anything - rm -rf $(BOX)/lib/{pkgconfig,gettext} - rm -f $(BOX)/lib/libvorbisenc* - find $(BOX)/share/tuxbox/neutrino/locale/ -type f \ + rm -rf $(ROOTFS_DIR) + cp -a $(TARGETPREFIX) $(ROOTFS_DIR) + mkdir -p $(ROOTFS_DIR)/oldroot + rm -rf $(ROOTFS_DIR)/include $(ROOTFS_DIR)/mymodules + rm -rf $(ROOTFS_DIR)/share/{aclocal,gdb,locale,doc} # locale not (yet) needed by anything + rm -rf $(ROOTFS_DIR)/lib/{pkgconfig,gettext} + rm -f $(ROOTFS_DIR)/lib/libvorbisenc* + find $(ROOTFS_DIR)/share/tuxbox/neutrino/locale/ -type f \ ! -name deutsch.locale ! -name english.locale | xargs --no-run-if-empty rm - find $(BOX) -name .gitignore -type f -print0 | xargs --no-run-if-empty -0 rm -f - find $(BOX)/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs --no-run-if-empty -0 rm -f - du -sh $(BOX) + find $(ROOTFS_DIR) -name .gitignore -type f -print0 | xargs --no-run-if-empty -0 rm -f + find $(ROOTFS_DIR)/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs --no-run-if-empty -0 rm -f + du -sh $(ROOTFS_DIR) @echo "" @echo " ****************************************************************************** " @echo -e " \033[32m!!! The following warnings from strip are harmless !!!\033[0m " @echo " ****************************************************************************** " - find $(BOX)/bin -type f -print0 | xargs -0 $(TARGET)-strip || true - find $(BOX)/sbin -type f -print0 | xargs -0 $(TARGET)-strip || true - find $(BOX)/lib -path $(BOX)/lib/modules -prune -o -type f -print0 | xargs -0 $(TARGET)-strip || true - find $(BOX)/var/bin -type f -print0 | xargs -0 $(TARGET)-strip 2>/dev/null || true - find $(BOX)/var/sbin -type f -print0 | xargs -0 $(TARGET)-strip 2>/dev/null || true - du -sh $(BOX) + find $(ROOTFS_DIR)/bin -type f -print0 | xargs -0 $(TARGET)-strip || true + find $(ROOTFS_DIR)/sbin -type f -print0 | xargs -0 $(TARGET)-strip || true + find $(ROOTFS_DIR)/lib -path $(ROOTFS_DIR)/lib/modules -prune -o -type f -print0 | xargs -0 $(TARGET)-strip || true + find $(ROOTFS_DIR)/var/bin -type f -print0 | xargs -0 $(TARGET)-strip 2>/dev/null || true + find $(ROOTFS_DIR)/var/sbin -type f -print0 | xargs -0 $(TARGET)-strip 2>/dev/null || true + du -sh $(ROOTFS_DIR) if [ "$(BOXSERIES)" = hd2 ]; then \ $(MAKE) symlinks; \ fi symlinks: $(START_BUILD) - pushd $(BOX)/lib; \ + pushd $(ROOTFS_DIR)/lib; \ ln -sf libuClibc-$(UCLIBC_VER).so libcrypt.so.0; \ ln -sf libuClibc-$(UCLIBC_VER).so libdl.so.0; \ ln -sf libuClibc-$(UCLIBC_VER).so libpthread.so.0; \ -- 2.39.5