Changeset 903

Timestamp:

Jan 15, 2017, 7:02:56 PM (2 years ago)

Author:

amain

Message:

native: octeon erlite install

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• arch/octeon/erlite/arch-deliver.mk (added)
• arch/octeon/erlite/arch.mk (modified) (8 diffs)
• rules/debwrt.mk (modified) (2 diffs)

trunk/Makefile

@@ -38 +38 @@
 ifeq ($(CONFIG_DEBWRT_FIRMWARE_NATIVE),y)
         include arch/octeon/erlite/arch.mk
+        include arch/octeon/erlite/arch-deliver.mk
 else
         include openwrt/openwrt.mk

trunk/arch/octeon/erlite/arch.mk

@@ -25 +25 @@
 
 URL                      := http://mirror.debwrt.net
-VERSION                  := e100.v1.9.1.4939093
-FIRMWARE                 := ER-$(VERSION).tar
-GPL                      := GPL.ER-$(VERSION).tar.bz2
+UBNT_VERSION             := e100.v1.9.1.4939093
+FIRMWARE                 := ER-$(UBNT_VERSION).tar
+GPL                      := GPL.ER-$(UBNT_VERSION).tar.bz2
 URL_FIRMWARE             := $(URL)/$(FIRMWARE)
 URL_GPL                  := $(URL)/$(GPL)
@@ -62 +62 @@
                  openwrt/build/binutils \
                  openwrt/build/gcc \
-                 openwrt/build/kernel
+                 openwrt/build/kernel \
+                 openwrt/build/kernel-install
         touch $@
 
@@ -68 +69 @@
         @echo "Make parallelization: $(subst -j,,$(PJOBS))"
         mkdir -p openwrt/build # hack
+        mkdir -p $(SRC_DIR)/build/binutils
         mkdir -p $(SRC_DIR)/cross
         sudo chroot $(DEBIAN_BUILD_DIR) \
@@ -79 +81 @@
         @echo "Make parallelization: $(subst -j,,$(PJOBS))"
         mkdir -p openwrt/build # hack
+        mkdir -p $(SRC_DIR)/build/gcc
         mkdir -p $(SRC_DIR)/cross
         sudo chroot $(DEBIAN_BUILD_DIR) \
              bash -c "cd /usr/src/erlite/build/gcc; \
                       ../../extract/gcc-$(GCC_VERSION)/configure --prefix=/usr/src/erlite/cross --target mips64-octeon-linux-gnu --enable-languages=c --disable-multilib"
+        sudo chroot $(DEBIAN_BUILD_DIR) make $(PJOBS) -C /usr/src/erlite/build/gcc all-gcc
         sudo patch -p0 -d $(SRC_DIR_GCC) <arch/octeon/erlite/patches/gcc-install.patch
-        sudo chroot $(DEBIAN_BUILD_DIR) make $(PJOBS) -C /usr/src/erlite/build/gcc all-gcc
         sudo chroot $(DEBIAN_BUILD_DIR) make $(PJOBS) -C /usr/src/erlite/build/gcc install-gcc
         touch $@
@@ -91 +94 @@
         @echo "Make parallelization: $(subst -j,,$(PJOBS))"
         mkdir -p openwrt/build # hack
-        mkdir -p $(SRC_DIR)/install
         if [ ! -e $(SRC_DIR_KERNEL)/.config.org ]; \
         then \
@@ -97 +99 @@
         fi
         cp .config $(SRC_DIR_KERNEL)/.config.debwrt
+        echo 'CONFIG_LOCALVERSION="-DebWrt"' >>$(SRC_DIR_KERNEL)/.config.debwrt
         sudo chroot $(DEBIAN_BUILD_DIR) \
              bash -c "cd /usr/src/erlite/kernel; \
@@ -106 +109 @@
              bash -c "export PATH=/usr/src/erlite/cross/bin:$${PATH}; \
                       make ARCH=mips $(PJOBS) -C /usr/src/erlite/kernel"
+        touch $@
+
+openwrt/build/kernel-install: openwrt/build/kernel
+        @echo "Make parallelization: $(subst -j,,$(PJOBS))"
+        sudo rm -rf $(SRC_DIR)/install
+        mkdir -p $(SRC_DIR)/install
+        sudo chroot $(DEBIAN_BUILD_DIR) \
+             bash -c "export PATH=/usr/src/erlite/cross/bin:$${PATH}; \
+                      make ARCH=mips INSTALL_HDR_PATH=/usr/src/erlite/install $(PJOBS) -C /usr/src/erlite/kernel headers_install"
         sudo chroot $(DEBIAN_BUILD_DIR) \
              bash -c "export PATH=/usr/src/erlite/cross/bin:$${PATH}; \
                       make ARCH=mips INSTALL_MOD_PATH=/usr/src/erlite/install $(PJOBS) -C /usr/src/erlite/kernel modules_install"
+        sudo chroot $(DEBIAN_BUILD_DIR) \
+             bash -c "export PATH=/usr/src/erlite/cross/bin:$${PATH}; \
+                      { \
+                          echo -n OPENWRT_LINUX_VERSION=; \
+                          make -s ARCH=mips -C /usr/src/erlite/kernel kernelversion; \
+                          echo -n OPENWRT_LINUX_UNAME_VERSION=; \
+                          make -s ARCH=mips -C /usr/src/erlite/kernel kernelrelease; \
+                      } >/usr/src/erlite/install/version.info"
         sudo chroot $(DEBIAN_BUILD_DIR) cp /usr/src/erlite/kernel/vmlinux /usr/src/erlite/install/vmlinux.64
         touch $@
@@ -167 +187 @@
         touch $@
 
-openwrt/clean: openwrt/deliver/clean
-        #-$(SCRIPT_CLEAN_EXEC) $(MAKE) -C $(OPENWRT_BUILD_DIR) clean V=$(V)
+openwrt/clean:
+        sudo chroot $(DEBIAN_BUILD_DIR) \
+             bash -c "export PATH=/usr/src/erlite/cross/bin:$${PATH}; \
+                      make ARCH=mips $(PJOBS) -C /usr/src/erlite/kernel clean" \
+             || true
+        rm -rf $(SRC_DIR)/install
         rm -f openwrt/all
-        rm -f openwrt/build
-        rm -f openwrt/deliver
-
-openwrt/dirclean: openwrt/deliver/clean
-        #-$(SCRIPT_CLEAN_EXEC) $(MAKE) -C $(OPENWRT_BUILD_DIR) dirclean V=$(V)
-        rm -f openwrt/all
-        rm -f openwrt/build
-        rm -f openwrt/deliver
-
-openwrt/distclean: openwrt/deliver/clean
-        #-$(SCRIPT_CLEAN_EXEC) $(MAKE) -C $(OPENWRT_BUILD_DIR) distclean V=$(V)
-        rm -f openwrt/all
-        rm -f openwrt/build
-        rm -f openwrt/deliver
-
-#openwrt/full-clean: openwrt/deliver/clean
-openwrt/full-clean:
-        rm -rf $(SRC_DIR)
+        rm -f openwrt/build/kernel
+
+openwrt/dirclean: openwrt/clean openwrt/deliver/clean
+        sudo rm -rf $(SRC_DIR_BUILD)
+        rm -f openwrt/build/binutils
+        rm -f openwrt/build/gcc
+
+openwrt/distclean: | openwrt/dirclean openwrt/deliver/clean
+        sudo rm -rf $(SRC_DIR)
         rm -f openwrt/download
         rm -f openwrt/extract
-        rm -f openwrt/all
-        rm -f openwrt/build
-        rm -f openwrt/deliver
         rm -f openwrt/patch
         rm -f openwrt/prepare
 
-.PHONY: openwrt/patches/uninstall \
-        openwrt/clean
-
+openwrt/full-clean: openwrt/distclean
+
+.PHONY: openwrt/clean
+

trunk/rules/debwrt.mk

@@ -54 +54 @@
 LINUX_VERSION:=$(call qstrip,$(CONFIG_DEBWRT_KERNEL_VERSION))
 
+ifeq ($(OPENWRT_LINUX_VERSION),)
+    OPENWRT_LINUX_VERSION = $(OPENWRT_LINUX_UNAME_VERSION)
+endif
+
 # (Git) project selection
 PROJECT:=$(call qstrip,$(CONFIG_PROJECT))
@@ -102 +106 @@
 
 # Image file containing OpenWrt kernel modules
-MODULES_TAR_GZ=debwrt-modules-$(TARGET_ARCH)-$(TARGET)-$(SUB_TARGET)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).tar.gz
+MODULES_TAR_GZ=debwrt-modules-$(TARGET_ARCH)-$(TARGET)-$(SUB_TARGET)-$(OPENWRT_LINUX_VERSION)-$(DEBWRT_VERSION).tar.gz
 
 # Image file containing OpenWrt kernel headers
-HEADERS_TAR_GZ=debwrt-headers-$(TARGET_ARCH)-$(TARGET)-$(SUB_TARGET)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).tar.gz
+HEADERS_TAR_GZ=debwrt-headers-$(TARGET_ARCH)-$(TARGET)-$(SUB_TARGET)-$(OPENWRT_LINUX_VERSION)-$(DEBWRT_VERSION).tar.gz
 
 # Filename of DebWrt firmware image
-TARGET_IMAGE_NAME_BIN=debwrt-firmware-$(TARGET)-$(SUB_TARGET)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).bin
-TARGET_IMAGE_NAME_TRX=debwrt-firmware-$(TARGET)-$(SUB_TARGET)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).trx
+TARGET_IMAGE_NAME_BIN=debwrt-firmware-$(TARGET)-$(SUB_TARGET)-$(OPENWRT_LINUX_VERSION)-$(DEBWRT_VERSION).bin
+TARGET_IMAGE_NAME_TRX=debwrt-firmware-$(TARGET)-$(SUB_TARGET)-$(OPENWRT_LINUX_VERSION)-$(DEBWRT_VERSION).trx
+TARGET_IMAGE_NAME_64=debwrt-firmware-$(TARGET)-$(SUB_TARGET)-$(OPENWRT_LINUX_VERSION)-$(DEBWRT_VERSION).64
 
 # OpenWrt patches directory