Changeset 939


Ignore:
Timestamp:
Feb 27, 2021, 5:17:50 PM (11 months ago)
Author:
amain
Message:

Fix extra module version

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/arch/octeon/erlite2/arch.mk

    r938 r939  
    1616# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717
    18 ifneq ($(findstring openwrt,$(MAKECMDGOALS)),)
    19 $(info Architecture: $(TARGET_ARCH))
    20 $(info Target      : $(TARGET))
    21 $(info Sub target  : $(SUB_TARGET))
    22 $(info Profile     : $(PROFILE))
    23 $(info )
    24 endif
    2518
    2619URL                      := http://mirror.debwrt.net
    27 UBNT_VERSION             := $(CONFIG_DEBWRT_FIRMWARE_MIPS_OCTEON_ERLITE2_VERSION)
     20UBNT_VERSION             := $(call qstrip,$(CONFIG_DEBWRT_FIRMWARE_MIPS_OCTEON_ERLITE2_VERSION))
    2821UBNT_BOARD               := ER-e100
    2922FIRMWARE                 := $(UBNT_BOARD).$(UBNT_VERSION).tar
     
    4134OPENWRT_PATCH_DIRS:= "$(OPENWRT_PATCHES_DIR)/all" \
    4235        "$(OPENWRT_PATCHES_DIR)/$(OPENWRT_BRANCH)"
     36
     37# Override sub-target, and include erlite version
     38SUB_TARGET := erlite-$(UBNT_VERSION)
     39
     40ifneq ($(findstring openwrt,$(MAKECMDGOALS)),)
     41$(info Architecture: $(TARGET_ARCH))
     42$(info Target      : $(TARGET))
     43$(info Sub target  : $(SUB_TARGET))
     44$(info Profile     : $(PROFILE))
     45$(info )
     46endif
    4347
    4448openwrt/all: openwrt/build
     
    9094        touch $@
    9195
     96UBNT_UNAME=$(shell sudo chroot $(DEBIAN_BUILD_DIR) make -s ARCH=mips -C /usr/src/erlite2/kernel kernelrelease)
    9297openwrt/build/kernel-install: openwrt/build/kernel
    9398        @echo "Make parallelization: $(subst -j,,$(PJOBS))"
     
    111116        mkdir -p $(SRC_DIR)/mnt
    112117        sudo mount $(SRC_DIR)/squashfs.tmp $(SRC_DIR)/mnt
    113         sudo mkdir -p $(SRC_DIR)/install/lib/modules/$(OPENWRT_LINUX_UNAME_VERSION)/extra
    114         find $(SRC_DIR)/mnt/lib/modules/*/extra -type f \
    115          | sudo xargs cp --target-directory $(SRC_DIR)/install/lib/modules/$(OPENWRT_LINUX_UNAME_VERSION)/extra
     118        sudo mkdir -p $(SRC_DIR)/install/lib/modules/$(UBNT_UNAME)/extra; \
     119        find $(SRC_DIR)/mnt/lib/modules/$(UBNT_UNAME)/extra -type f \
     120         | sudo xargs cp --target-directory $(SRC_DIR)/install/lib/modules/$(UBNT_UNAME)/extra
    116121        sudo umount $(SRC_DIR)/mnt
    117122        touch $@
Note: See TracChangeset for help on using the changeset viewer.