From ba8fc2c7d1332a879942ae6fca3dd34d90b8b391 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 23 Oct 2017 13:56:41 +0200 Subject: [PATCH 1/3] - align some variables to tango's names --- ...{busybox-ax.config => busybox-hd51.config} | 0 ...ech_ax.config => ct-ng-armbox_hd51.config} | 0 ...-ax.config => kernel-4.10-bcm7251s.config} | 0 archive-server/get-image.php | 4 +- archive-server/get-kernel.php | 4 +- make/bootstrap.mk | 2 +- make/crosstool.mk | 10 +- make/environment.mk | 34 ++--- make/images.mk | 118 +++++++++--------- make/{kernel-axt.mk => kernel-arm.mk} | 10 +- make/neutrino.mk | 6 +- make/ni.mk | 6 +- make/plugins.mk | 2 +- make/static.mk | 2 +- make/system-libs.mk | 4 +- make/system-tools.mk | 2 +- .../{axtech/ax => armbox/hd51}/bin/.gitignore | 0 .../ax => armbox/hd51}/boot/.gitignore | 0 .../{axtech/ax => armbox/hd51}/dev/.gitignore | 0 .../{axtech/ax => armbox/hd51}/etc/exports | 0 .../ax => armbox/hd51}/etc/filesystems | 0 .../{axtech/ax => armbox/hd51}/etc/fstab | 0 .../{axtech/ax => armbox/hd51}/etc/group | 0 .../{axtech/ax => armbox/hd51}/etc/hosts | 0 .../{axtech/ax => armbox/hd51}/etc/inetd.conf | 0 .../ax => armbox/hd51}/etc/init.d/.gitignore | 0 .../ax => armbox/hd51}/etc/init.d/coredump | 0 .../ax => armbox/hd51}/etc/init.d/crond | 0 .../{axtech/ax => armbox/hd51}/etc/init.d/emu | 0 .../ax => armbox/hd51}/etc/init.d/fstab | 0 .../ax => armbox/hd51}/etc/init.d/functions | 0 .../ax => armbox/hd51}/etc/init.d/globals | 0 .../ax => armbox/hd51}/etc/init.d/hostname | 0 .../ax => armbox/hd51}/etc/init.d/inetd | 0 .../ax => armbox/hd51}/etc/init.d/networking | 0 .../ax => armbox/hd51}/etc/init.d/ntpdate | 0 .../ax => armbox/hd51}/etc/init.d/oscamfix | 0 .../{axtech/ax => armbox/hd51}/etc/init.d/rcK | 0 .../{axtech/ax => armbox/hd51}/etc/init.d/rcS | 0 .../{axtech/ax => armbox/hd51}/etc/init.d/sdX | 0 .../hd51}/etc/init.d/start_neutrino | 0 .../ax => armbox/hd51}/etc/init.d/syslogd | 0 .../{axtech/ax => armbox/hd51}/etc/inittab | 0 .../{axtech/ax => armbox/hd51}/etc/issue.net | 0 .../{axtech/ax => armbox/hd51}/etc/mdev.conf | 0 skel-root/{axtech/ax => armbox/hd51}/etc/mtab | 0 .../hd51}/etc/network/if-down.d/.gitignore | 0 .../etc/network/if-post-down.d/.gitignore | 0 .../hd51}/etc/network/if-post-up.d/.gitignore | 0 .../hd51}/etc/network/if-pre-up.d/.gitignore | 0 .../hd51}/etc/network/if-up.d/.gitignore | 0 .../ax => armbox/hd51}/etc/network/interfaces | 0 .../hd51}/etc/network/post-wlan0.sh | 0 .../hd51}/etc/network/pre-wlan0.sh | 0 .../ax => armbox/hd51}/etc/nsswitch.conf | 0 .../{axtech/ax => armbox/hd51}/etc/passwd | 0 .../{axtech/ax => armbox/hd51}/etc/profile | 0 .../ax => armbox/hd51}/etc/profile.local | 0 .../{axtech/ax => armbox/hd51}/etc/protocols | 0 .../{axtech/ax => armbox/hd51}/etc/services | 0 .../{axtech/ax => armbox/hd51}/etc/shells | 0 .../hd51}/lib/firmware/.gitignore | 0 .../hd51}/lib/mdev/common/mdev-log-only | 0 .../hd51}/lib/mdev/common/mdev-modprobe | 0 .../hd51}/lib/mdev/common/mdev-module | 0 .../hd51}/lib/mdev/fs/mdev-mmcblk | 0 .../ax => armbox/hd51}/lib/mdev/fs/mdev-mount | 0 .../ax => armbox/hd51}/lib/mdev/net/mdev-wlan | 0 .../hd51}/lib/mdev/usb/coldplug-setenv | 0 .../ax => armbox/hd51}/lib/mdev/usb/mdev-usb | 0 .../ax => armbox/hd51}/media/.gitignore | 0 .../{axtech/ax => armbox/hd51}/mnt/.gitignore | 0 .../ax => armbox/hd51}/proc/.gitignore | 0 .../{axtech/ax => armbox/hd51}/sbin/service | 0 .../hd51}/share/udhcpc/default.script | 0 .../{axtech/ax => armbox/hd51}/srv/.gitignore | 0 .../{axtech/ax => armbox/hd51}/sys/.gitignore | 0 .../{axtech/ax => armbox/hd51}/tmp/.gitignore | 0 .../ax => armbox/hd51}/usr/bin/.gitignore | 0 .../ax => armbox/hd51}/var/bin/.gitignore | 0 .../ax => armbox/hd51}/var/etc/.gitignore | 0 .../hd51}/var/etc/init.d/.gitignore | 0 .../ax => armbox/hd51}/var/keys/.gitignore | 0 .../ax => armbox/hd51}/var/root/.gitignore | 0 .../hd51}/var/spool/cron/crontabs/.gitignore | 0 85 files changed, 105 insertions(+), 99 deletions(-) rename archive-configs/{busybox-ax.config => busybox-hd51.config} (100%) rename archive-configs/{ct-ng-axtech_ax.config => ct-ng-armbox_hd51.config} (100%) rename archive-configs/{kernel-4.10-ax.config => kernel-4.10-bcm7251s.config} (100%) rename make/{kernel-axt.mk => kernel-arm.mk} (91%) rename skel-root/{axtech/ax => armbox/hd51}/bin/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/boot/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/dev/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/exports (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/filesystems (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/fstab (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/group (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/hosts (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/inetd.conf (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/init.d/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/init.d/coredump (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/init.d/crond (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/init.d/emu (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/init.d/fstab (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/init.d/functions (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/init.d/globals (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/init.d/hostname (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/init.d/inetd (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/init.d/networking (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/init.d/ntpdate (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/init.d/oscamfix (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/init.d/rcK (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/init.d/rcS (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/init.d/sdX (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/init.d/start_neutrino (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/init.d/syslogd (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/inittab (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/issue.net (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/mdev.conf (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/mtab (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/network/if-down.d/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/network/if-post-down.d/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/network/if-post-up.d/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/network/if-pre-up.d/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/network/if-up.d/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/network/interfaces (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/network/post-wlan0.sh (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/network/pre-wlan0.sh (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/nsswitch.conf (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/passwd (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/profile (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/profile.local (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/protocols (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/services (100%) rename skel-root/{axtech/ax => armbox/hd51}/etc/shells (100%) rename skel-root/{axtech/ax => armbox/hd51}/lib/firmware/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/lib/mdev/common/mdev-log-only (100%) rename skel-root/{axtech/ax => armbox/hd51}/lib/mdev/common/mdev-modprobe (100%) rename skel-root/{axtech/ax => armbox/hd51}/lib/mdev/common/mdev-module (100%) rename skel-root/{axtech/ax => armbox/hd51}/lib/mdev/fs/mdev-mmcblk (100%) rename skel-root/{axtech/ax => armbox/hd51}/lib/mdev/fs/mdev-mount (100%) rename skel-root/{axtech/ax => armbox/hd51}/lib/mdev/net/mdev-wlan (100%) rename skel-root/{axtech/ax => armbox/hd51}/lib/mdev/usb/coldplug-setenv (100%) rename skel-root/{axtech/ax => armbox/hd51}/lib/mdev/usb/mdev-usb (100%) rename skel-root/{axtech/ax => armbox/hd51}/media/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/mnt/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/proc/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/sbin/service (100%) rename skel-root/{axtech/ax => armbox/hd51}/share/udhcpc/default.script (100%) rename skel-root/{axtech/ax => armbox/hd51}/srv/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/sys/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/tmp/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/usr/bin/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/var/bin/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/var/etc/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/var/etc/init.d/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/var/keys/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/var/root/.gitignore (100%) rename skel-root/{axtech/ax => armbox/hd51}/var/spool/cron/crontabs/.gitignore (100%) diff --git a/archive-configs/busybox-ax.config b/archive-configs/busybox-hd51.config similarity index 100% rename from archive-configs/busybox-ax.config rename to archive-configs/busybox-hd51.config diff --git a/archive-configs/ct-ng-axtech_ax.config b/archive-configs/ct-ng-armbox_hd51.config similarity index 100% rename from archive-configs/ct-ng-axtech_ax.config rename to archive-configs/ct-ng-armbox_hd51.config diff --git a/archive-configs/kernel-4.10-ax.config b/archive-configs/kernel-4.10-bcm7251s.config similarity index 100% rename from archive-configs/kernel-4.10-ax.config rename to archive-configs/kernel-4.10-bcm7251s.config diff --git a/archive-server/get-image.php b/archive-server/get-image.php index 2189f659..62408861 100644 --- a/archive-server/get-image.php +++ b/archive-server/get-image.php @@ -34,10 +34,10 @@ if ($boxtype == "coolstream" || $boxtype == "cst") # CST $boxtype_sc = "cst"; } -elseif ($boxtype == "axtech" || $boxtype == "axt") +elseif ($boxtype == "armbox" || $boxtype == "arm") { # AX Tech - $boxtype_sc = "axt"; + $boxtype_sc = "arm"; } # release/ni320-YYYYMMDDHHMM-cst-kronos.img diff --git a/archive-server/get-kernel.php b/archive-server/get-kernel.php index ec3a817e..ee49e33e 100644 --- a/archive-server/get-kernel.php +++ b/archive-server/get-kernel.php @@ -33,10 +33,10 @@ if ($boxtype == "coolstream" || $boxtype == "cst") $kernel_name = "vmlinux.ub.gz"; } } -elseif ($boxtype == "axtech" || $boxtype == "axt") +elseif ($boxtype == "armbox" || $boxtype == "arm") { # AX Tech - $boxtype_sc = "axt"; + $boxtype_sc = "arm"; } # release/kernel-cst-kronos-vmlinux.ub.gz diff --git a/make/bootstrap.mk b/make/bootstrap.mk index 11af7371..ff131917 100644 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -3,7 +3,7 @@ BOOTSTRAP = targetprefix $(D) $(BUILD_TMP) $(CROSS_DIR) $(STAGING_DIR) $(IMAGE_DIR) $(UPDATE_DIR) $(HOSTPREFIX)/bin includes-and-libs modules host-preqs BOOTSTRAP += $(TARGETLIB)/libc.so.6 -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 ax)) +ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51)) BOOTSTRAP += static blobs endif diff --git a/make/crosstool.mk b/make/crosstool.mk index 836c797e..76961739 100644 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -5,15 +5,15 @@ crosstool: crosstool-$(BOXARCH)-$(BOXSERIES) crosstools: make crosstool-arm-hd1 BOXSERIES=hd1 make crosstool-arm-hd2 BOXSERIES=hd2 - make crosstool-arm-ax BOXSERIES=ax + make crosstool-arm-hd51 BOXSERIES=hd51 crosstools-renew: make ccache-clean BOXSERIES=hd1 rm -rf $(BASE_DIR)/cross/$(BOXARCH)/hd1 make ccache-clean BOXSERIES=hd2 rm -rf $(BASE_DIR)/cross/$(BOXARCH)/hd2 - make ccache-clean BOXSERIES=ax - rm -rf $(BASE_DIR)/cross/$(BOXARCH)/ax + make ccache-clean BOXSERIES=hd51 + rm -rf $(BASE_DIR)/cross/$(BOXARCH)/hd51 rm -rf $(HOSTPREFIX)/bin/arm-* rm -rf $(HOSTPREFIX)/bin/pkg-config rm -rf $(BASE_DIR)/static @@ -86,7 +86,7 @@ crosstool-arm-hd2: CROSS_DIR-check $(ARCHIVE)/gcc-linaro-$(GCC_VER).tar.xz $(SOU rm -f $(CROSS_DIR)/$(TARGET)/sys-root/lib/libstdc++.so.6.0.20-gdb.py $(REMOVE)/crosstool-ng -crosstool-arm-ax: CROSS_DIR-check +crosstool-arm-hd51: CROSS_DIR-check make $(BUILD_TMP) $(REMOVE)/crosstool-ng cd $(BUILD_TMP) && \ @@ -95,7 +95,7 @@ crosstool-arm-ax: CROSS_DIR-check git checkout 1dbb06f2 && \ unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE && \ cd $(BUILD_TMP)/crosstool-ng && \ - cp -a $(CONFIGS)/ct-ng-axtech_ax.config .config && \ + cp -a $(CONFIGS)/ct-ng-armbox_hd51.config .config && \ sed -i "s@^CT_PARALLEL_JOBS=.*@CT_PARALLEL_JOBS=$(NUM_CPUS)@" .config && \ export NI_BASE_DIR=$(BASE_DIR) && \ export CT_BASE_DIR=$(CROSS_BASE); \ diff --git a/make/environment.mk b/make/environment.mk index 2793348b..cac6ac9d 100644 --- a/make/environment.mk +++ b/make/environment.mk @@ -24,15 +24,15 @@ BASE_DIR := $(shell pwd) # / / | | \ # BOXMODEL nevis apollo shiner kronos kronos_v2 -# - AX Technologies ----------------------------------------------------------- +# - AX Technologies / Mutant -------------------------------------------------- -# BOXTYPE axtech +# BOXTYPE armbox # | -# BOXSERIES ax +# BOXSERIES hd51 # | -# BOXFAMILY ax +# BOXFAMILY bcm7251s # | -# BOXMODEL hd51 +# BOXMODEL hd51 # ----------------------------------------------------------------------------- @@ -46,9 +46,9 @@ ifneq ($(BOXSERIES),) BOXTYPE = coolstream BOXFAMILY = apollo BOXMODEL = apollo - else ifeq ($(BOXSERIES), ax) - BOXTYPE = axtech - BOXFAMILY = ax + else ifeq ($(BOXSERIES), hd51) + BOXTYPE = armbox + BOXFAMILY = bcm7251s BOXMODEL = hd51 else $(error $(BOXTYPE) BOXSERIES $(BOXSERIES) not supported) @@ -68,9 +68,9 @@ else ifneq ($(BOXFAMILY),) BOXTYPE = coolstream BOXSERIES = hd2 BOXMODEL = kronos - else ifeq ($(BOXFAMILY), ax) - BOXTYPE = axtech - BOXSERIES = ax + else ifeq ($(BOXFAMILY), bcm7251s) + BOXTYPE = armbox + BOXSERIES = hd51 BOXMODEL = hd51 else $(error $(BOXTYPE) BOXFAMILY $(BOXFAMILY) not supported) @@ -91,9 +91,9 @@ else ifneq ($(BOXMODEL),) BOXSERIES = hd2 BOXFAMILY = kronos else ifeq ($(BOXMODEL), hd51) - BOXTYPE = axtech - BOXSERIES = ax - BOXFAMILY = ax + BOXTYPE = armbox + BOXSERIES = hd51 + BOXFAMILY = bcm7251s else $(error $(BOXTYPE) BOXMODEL $(BOXMODEL) not supported) endif @@ -103,8 +103,8 @@ endif ifeq ($(BOXTYPE), coolstream) BOXTYPE_SC = cst BOXARCH = arm -else ifeq ($(BOXTYPE), axtech) - BOXTYPE_SC = axt +else ifeq ($(BOXTYPE), armbox) + BOXTYPE_SC = arm BOXARCH = arm endif @@ -205,7 +205,7 @@ ifeq ($(BOXSERIES), hd2) endif endif -ifeq ($(BOXSERIES), ax) +ifeq ($(BOXSERIES), hd51) KERNEL_VERSION = 4.10.12 KERNEL_VERSION_FULL = $(KERNEL_VERSION) KERNEL_BRANCH = ni/4.10.x diff --git a/make/images.mk b/make/images.mk index 4048938c..73824868 100644 --- a/make/images.mk +++ b/make/images.mk @@ -82,29 +82,29 @@ devtable-remove: images: ifeq ($(BOXMODEL), nevis) - make flash-image ERASE_SIZE=0x20000 BOXNAME="HD1, BSE, Neo, Neo², Zee" + make flash-image-cst ERASE_SIZE=0x20000 BOXNAME="HD1, BSE, Neo, Neo², Zee" endif ifeq ($(BOXFAMILY), apollo) - make flash-image ERASE_SIZE=0x40000 BOXNAME="Tank" IMAGE_SUFFIX=$(BOXTYPE_SC)-apollo - make flash-image ERASE_SIZE=0x20000 BOXNAME="Trinity" IMAGE_SUFFIX=$(BOXTYPE_SC)-shiner + make flash-image-cst ERASE_SIZE=0x40000 BOXNAME="Tank" IMAGE_SUFFIX=$(BOXTYPE_SC)-apollo + make flash-image-cst ERASE_SIZE=0x20000 BOXNAME="Trinity" IMAGE_SUFFIX=$(BOXTYPE_SC)-shiner endif ifeq ($(BOXMODEL), kronos) - make flash-image ERASE_SIZE=0x20000 BOXNAME="Zee², Trinity V2" + make flash-image-cst ERASE_SIZE=0x20000 BOXNAME="Zee², Trinity V2" endif ifeq ($(BOXMODEL), kronos_v2) - make flash-image ERASE_SIZE=0x20000 BOXNAME="Link, Trinity Duo" + make flash-image-cst ERASE_SIZE=0x20000 BOXNAME="Link, Trinity Duo" endif ifeq ($(BOXMODEL), hd51) - #make flash-image-axt-single - make flash-image-axt-multi - make flash-image-axt-minimal + make flash-image-arm + #make flash-image-arm-single + make flash-image-arm-multi endif -flash-image: IMAGE_NAME=$(IMAGE_PREFIX)-$(IMAGE_SUFFIX) -flash-image: IMAGE_DESC="$(BOXNAME) [$(IMAGE_SUFFIX)][$(BOXSERIES)] $(shell echo $(IMAGE_TYPE_STRING) | sed 's/.*/\u&/')" -flash-image: IMAGE_MD5FILE=$(IMAGE_TYPE_STRING)-$(IMAGE_SUFFIX).txt -flash-image: IMAGE_DATE=$(shell cat $(BOX)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-) -flash-image: +flash-image-cst: IMAGE_NAME=$(IMAGE_PREFIX)-$(IMAGE_SUFFIX) +flash-image-cst: IMAGE_DESC="$(BOXNAME) [$(IMAGE_SUFFIX)][$(BOXSERIES)] $(shell echo $(IMAGE_TYPE_STRING) | sed 's/.*/\u&/')" +flash-image-cst: IMAGE_MD5FILE=$(IMAGE_TYPE_STRING)-$(IMAGE_SUFFIX).txt +flash-image-cst: IMAGE_DATE=$(shell cat $(BOX)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-) +flash-image-cst: make devtable mkfs.jffs2 -e $(ERASE_SIZE) $(MKFSFLAGS) -o $(IMAGE_DIR)/$(IMAGE_NAME).img make devtable-remove @@ -137,18 +137,18 @@ ifdef IMAGE_TO_CHECK fi endif -### AX-TECH +### armbox hd51 # general -AX_IMAGE_NAME = disk -AX_BOOT_IMAGE = boot.img -AX_IMAGE_LINK = $(AX_IMAGE_NAME).ext4 -AX_IMAGE_ROOTFS_SIZE = 294912 -AX_BUILD_TMP = $(BUILD_TMP)/tmp +HD51_IMAGE_NAME = disk +HD51_BOOT_IMAGE = boot.img +HD51_IMAGE_LINK = $(HD51_IMAGE_NAME).ext4 +HD51_IMAGE_ROOTFS_SIZE = 294912 +HD51_BUILD_TMP = $(BUILD_TMP)/tmp # emmc image EMMC_IMAGE_SIZE = 3817472 -EMMC_IMAGE = $(AX_BUILD_TMP)/$(AX_IMAGE_NAME).img +EMMC_IMAGE = $(HD51_BUILD_TMP)/$(HD51_IMAGE_NAME).img # partition sizes BLOCK_SIZE = 512 @@ -174,28 +174,28 @@ FOURTH_KERNEL_PARTITION_OFFSET = $(shell expr $(THRID_ROOTFS_PARTITION_OFFSET) \ FOURTH_ROOTFS_PARTITION_OFFSET = $(shell expr $(FOURTH_KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE)) SWAP_PARTITION_OFFSET = $(shell expr $(FOURTH_ROOTFS_PARTITION_OFFSET) \+ $(ROOTFS_PARTITION_SIZE_MULTI)) -flash-image-axt-single: - mkdir -p $(AX_BUILD_TMP) +flash-image-arm-single: + mkdir -p $(HD51_BUILD_TMP) # Create a sparse image block - dd if=/dev/zero of=$(AX_BUILD_TMP)/$(AX_IMAGE_LINK) seek=$(shell expr $(AX_IMAGE_ROOTFS_SIZE) \* $(BLOCK_SECTOR)) count=0 bs=$(BLOCK_SIZE) - mkfs.ext4 -F $(AX_BUILD_TMP)/$(AX_IMAGE_LINK) -d $(BOX) + dd if=/dev/zero of=$(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) seek=$(shell expr $(HD51_IMAGE_ROOTFS_SIZE) \* $(BLOCK_SECTOR)) count=0 bs=$(BLOCK_SIZE) + mkfs.ext4 -F $(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) -d $(BOX) # Error codes 0-3 indicate successfull operation of fsck (no errors or errors corrected) - fsck.ext4 -pvfD $(AX_BUILD_TMP)/$(AX_IMAGE_LINK) || [ $? -le 3 ] + fsck.ext4 -pvfD $(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) || [ $? -le 3 ] dd if=/dev/zero of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) count=0 seek=$(shell expr $(EMMC_IMAGE_SIZE) \* $(BLOCK_SECTOR)) parted -s $(EMMC_IMAGE) mklabel gpt parted -s $(EMMC_IMAGE) unit KiB mkpart boot fat16 $(IMAGE_ROOTFS_ALIGNMENT) $(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \+ $(BOOT_PARTITION_SIZE)) parted -s $(EMMC_IMAGE) unit KiB mkpart kernel1 $(KERNEL_PARTITION_OFFSET) $(shell expr $(KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE)) parted -s $(EMMC_IMAGE) unit KiB mkpart rootfs1 ext4 $(ROOTFS_PARTITION_OFFSET) $(shell expr $(ROOTFS_PARTITION_OFFSET) \+ $(ROOTFS_PARTITION_SIZE_SINGLE)) parted -s $(EMMC_IMAGE) unit KiB mkpart storage ext4 $(STORAGE_PARTITION_OFFSET_SINGLE) $(shell expr $(EMMC_IMAGE_SIZE) \- 1024) - dd if=/dev/zero of=$(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) bs=$(BLOCK_SIZE) count=$(shell expr $(BOOT_PARTITION_SIZE) \* $(BLOCK_SECTOR)) - mkfs.msdos -S 512 $(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) - echo "boot emmcflash0.kernel1 'root=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=12'" > $(AX_BUILD_TMP)/STARTUP_1 - mcopy -i $(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) -v $(AX_BUILD_TMP)/STARTUP_1 :: - dd conv=notrunc if=$(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \* $(BLOCK_SECTOR)) + dd if=/dev/zero of=$(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) bs=$(BLOCK_SIZE) count=$(shell expr $(BOOT_PARTITION_SIZE) \* $(BLOCK_SECTOR)) + mkfs.msdos -S 512 $(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) + echo "boot emmcflash0.kernel1 'root=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=12'" > $(HD51_BUILD_TMP)/STARTUP_1 + mcopy -i $(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(HD51_BUILD_TMP)/STARTUP_1 :: + dd conv=notrunc if=$(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \* $(BLOCK_SECTOR)) dd conv=notrunc if=$(ZIMAGE_DTB) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(KERNEL_PARTITION_OFFSET) \* $(BLOCK_SECTOR)) - resize2fs $(AX_BUILD_TMP)/$(AX_IMAGE_LINK) $(ROOTFS_PARTITION_SIZE_SINGLE)k + resize2fs $(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) $(ROOTFS_PARTITION_SIZE_SINGLE)k # Truncate on purpose - dd if=$(AX_BUILD_TMP)/$(AX_IMAGE_LINK) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(ROOTFS_PARTITION_OFFSET) \* $(BLOCK_SECTOR)) count=$(shell expr $(AX_IMAGE_ROOTFS_SIZE) \* $(BLOCK_SECTOR)) + dd if=$(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(ROOTFS_PARTITION_OFFSET) \* $(BLOCK_SECTOR)) count=$(shell expr $(HD51_IMAGE_ROOTFS_SIZE) \* $(BLOCK_SECTOR)) # Create final USB-image mkdir -p $(IMAGE_DIR)/$(BOXMODEL) cp $(ZIMAGE_DTB) $(IMAGE_DIR)/$(BOXMODEL)/kernel.bin @@ -208,15 +208,15 @@ flash-image-axt-single: zip -r $(IMAGE_PREFIX)-$(IMAGE_SUFFIX)_single_usb.zip $(BOXMODEL)/* # cleanup rm -rf $(IMAGE_DIR)/$(BOXMODEL) - rm -rf $(AX_BUILD_TMP) + rm -rf $(HD51_BUILD_TMP) -flash-image-axt-multi: - mkdir -p $(AX_BUILD_TMP) +flash-image-arm-multi: + mkdir -p $(HD51_BUILD_TMP) # Create a sparse image block - dd if=/dev/zero of=$(AX_BUILD_TMP)/$(AX_IMAGE_LINK) seek=$(shell expr $(AX_IMAGE_ROOTFS_SIZE) \* $(BLOCK_SECTOR)) count=0 bs=$(BLOCK_SIZE) - mkfs.ext4 -F $(AX_BUILD_TMP)/$(AX_IMAGE_LINK) -d $(BOX) + dd if=/dev/zero of=$(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) seek=$(shell expr $(HD51_IMAGE_ROOTFS_SIZE) \* $(BLOCK_SECTOR)) count=0 bs=$(BLOCK_SIZE) + mkfs.ext4 -F $(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) -d $(BOX) # Error codes 0-3 indicate successfull operation of fsck (no errors or errors corrected) - fsck.ext4 -pvfD $(AX_BUILD_TMP)/$(AX_IMAGE_LINK) || [ $? -le 3 ] + fsck.ext4 -pvfD $(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) || [ $? -le 3 ] dd if=/dev/zero of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) count=0 seek=$(shell expr $(EMMC_IMAGE_SIZE) \* $(BLOCK_SECTOR)) parted -s $(EMMC_IMAGE) mklabel gpt parted -s $(EMMC_IMAGE) unit KiB mkpart boot fat16 $(IMAGE_ROOTFS_ALIGNMENT) $(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \+ $(BOOT_PARTITION_SIZE)) @@ -229,23 +229,23 @@ flash-image-axt-multi: parted -s $(EMMC_IMAGE) unit KiB mkpart kernel4 $(FOURTH_KERNEL_PARTITION_OFFSET) $(shell expr $(FOURTH_KERNEL_PARTITION_OFFSET) \+ $(KERNEL_PARTITION_SIZE)) parted -s $(EMMC_IMAGE) unit KiB mkpart rootfs4 ext4 $(FOURTH_ROOTFS_PARTITION_OFFSET) $(shell expr $(FOURTH_ROOTFS_PARTITION_OFFSET) \+ $(ROOTFS_PARTITION_SIZE_MULTI)) parted -s $(EMMC_IMAGE) unit KiB mkpart swap linux-swap $(SWAP_PARTITION_OFFSET) $(shell expr $(EMMC_IMAGE_SIZE) \- 1024) - dd if=/dev/zero of=$(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) bs=$(BLOCK_SIZE) count=$(shell expr $(BOOT_PARTITION_SIZE) \* $(BLOCK_SECTOR)) - mkfs.msdos -S 512 $(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) - echo "boot emmcflash0.kernel1 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p3 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(AX_BUILD_TMP)/STARTUP - echo "boot emmcflash0.kernel1 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p3 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(AX_BUILD_TMP)/STARTUP_1 - echo "boot emmcflash0.kernel2 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p5 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(AX_BUILD_TMP)/STARTUP_2 - echo "boot emmcflash0.kernel3 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p7 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(AX_BUILD_TMP)/STARTUP_3 - echo "boot emmcflash0.kernel4 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p9 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(AX_BUILD_TMP)/STARTUP_4 - mcopy -i $(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) -v $(AX_BUILD_TMP)/STARTUP :: - mcopy -i $(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) -v $(AX_BUILD_TMP)/STARTUP_1 :: - mcopy -i $(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) -v $(AX_BUILD_TMP)/STARTUP_2 :: - mcopy -i $(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) -v $(AX_BUILD_TMP)/STARTUP_3 :: - mcopy -i $(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) -v $(AX_BUILD_TMP)/STARTUP_4 :: - dd conv=notrunc if=$(AX_BUILD_TMP)/$(AX_BOOT_IMAGE) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \* $(BLOCK_SECTOR)) + dd if=/dev/zero of=$(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) bs=$(BLOCK_SIZE) count=$(shell expr $(BOOT_PARTITION_SIZE) \* $(BLOCK_SECTOR)) + mkfs.msdos -S 512 $(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) + echo "boot emmcflash0.kernel1 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p3 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(HD51_BUILD_TMP)/STARTUP + echo "boot emmcflash0.kernel1 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p3 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(HD51_BUILD_TMP)/STARTUP_1 + echo "boot emmcflash0.kernel2 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p5 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(HD51_BUILD_TMP)/STARTUP_2 + echo "boot emmcflash0.kernel3 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p7 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(HD51_BUILD_TMP)/STARTUP_3 + echo "boot emmcflash0.kernel4 'brcm_cma=440M@328M brcm_cma=192M@768M root=/dev/mmcblk0p9 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(HD51_BUILD_TMP)/STARTUP_4 + mcopy -i $(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(HD51_BUILD_TMP)/STARTUP :: + mcopy -i $(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(HD51_BUILD_TMP)/STARTUP_1 :: + mcopy -i $(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(HD51_BUILD_TMP)/STARTUP_2 :: + mcopy -i $(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(HD51_BUILD_TMP)/STARTUP_3 :: + mcopy -i $(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) -v $(HD51_BUILD_TMP)/STARTUP_4 :: + dd conv=notrunc if=$(HD51_BUILD_TMP)/$(HD51_BOOT_IMAGE) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \* $(BLOCK_SECTOR)) dd conv=notrunc if=$(ZIMAGE_DTB) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(KERNEL_PARTITION_OFFSET) \* $(BLOCK_SECTOR)) - resize2fs $(AX_BUILD_TMP)/$(AX_IMAGE_LINK) $(ROOTFS_PARTITION_SIZE_MULTI)k + resize2fs $(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) $(ROOTFS_PARTITION_SIZE_MULTI)k # Truncate on purpose - dd if=$(AX_BUILD_TMP)/$(AX_IMAGE_LINK) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(ROOTFS_PARTITION_OFFSET) \* $(BLOCK_SECTOR)) count=$(shell expr $(AX_IMAGE_ROOTFS_SIZE) \* $(BLOCK_SECTOR)) + dd if=$(HD51_BUILD_TMP)/$(HD51_IMAGE_LINK) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(ROOTFS_PARTITION_OFFSET) \* $(BLOCK_SECTOR)) count=$(shell expr $(HD51_IMAGE_ROOTFS_SIZE) \* $(BLOCK_SECTOR)) # Create final USB-image mkdir -p $(IMAGE_DIR)/$(BOXMODEL) cp $(ZIMAGE_DTB) $(IMAGE_DIR)/$(BOXMODEL)/kernel.bin @@ -258,9 +258,14 @@ flash-image-axt-multi: zip -r $(IMAGE_PREFIX)-$(IMAGE_SUFFIX)_multi_usb.zip $(BOXMODEL)/* # cleanup rm -rf $(IMAGE_DIR)/$(BOXMODEL) - rm -rf $(AX_BUILD_TMP) + rm -rf $(HD51_BUILD_TMP) -flash-image-axt-minimal: +flash-image-arm: BOXNAME="AX/Mut@nt" +flash-image-arm: IMAGE_NAME=$(IMAGE_PREFIX)-$(IMAGE_SUFFIX) +flash-image-arm: IMAGE_DESC="$(BOXNAME) [$(IMAGE_SUFFIX)][$(BOXSERIES)] $(shell echo $(IMAGE_TYPE_STRING) | sed 's/.*/\u&/')" +flash-image-arm: IMAGE_MD5FILE=$(IMAGE_TYPE_STRING)-$(IMAGE_SUFFIX).txt +flash-image-arm: IMAGE_DATE=$(shell cat $(BOX)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-) +flash-image-arm: mkdir -p $(IMAGE_DIR)/$(BOXMODEL) cp $(ZIMAGE_DTB) $(IMAGE_DIR)/$(BOXMODEL)/kernel.bin cd $(BOX); \ @@ -268,5 +273,6 @@ flash-image-axt-minimal: bzip2 $(IMAGE_DIR)/$(BOXMODEL)/rootfs.tar # Create minimal image cd $(IMAGE_DIR)/$(BOXMODEL); \ - tar -czf $(IMAGE_DIR)/$(IMAGE_PREFIX)-$(IMAGE_SUFFIX).tgz kernel.bin rootfs.tar.bz2 + tar -czf $(IMAGE_DIR)/$(IMAGE_NAME).tgz kernel.bin rootfs.tar.bz2 rm -rf $(IMAGE_DIR)/$(BOXMODEL) + echo $(IMAGE_URL)/$(IMAGE_NAME).tgz $(IMAGE_TYPE)$(IMAGE_VERSION)$(IMAGE_DATE) `md5sum $(IMAGE_DIR)/$(IMAGE_NAME).tgz | cut -c1-32` $(IMAGE_DESC) $(IMAGE_VERSION_STRING) >> $(IMAGE_DIR)/$(IMAGE_MD5FILE) diff --git a/make/kernel-axt.mk b/make/kernel-arm.mk similarity index 91% rename from make/kernel-axt.mk rename to make/kernel-arm.mk index 429593db..a5bfa3e7 100644 --- a/make/kernel-axt.mk +++ b/make/kernel-arm.mk @@ -1,4 +1,4 @@ -# makefile to build axtech kernel +# makefile to build armbox kernel DTB = $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/dts/$(KERNEL_DTB).dtb ZIMAGE = $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/arm/boot/zImage @@ -7,7 +7,7 @@ MODULES_DIR = $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules/lib/modules/$(KERNEL_ TARGETMODULES = $(TARGETLIB)/modules/$(KERNEL_VERSION_FULL) -$(D)/kernel-axt: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGETPREFIX) +$(D)/kernel-arm: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGETPREFIX) cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && \ git checkout $(KERNEL_BRANCH) && \ tar -C $(SOURCE_DIR) -cp $(NI_LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x @@ -25,11 +25,11 @@ $(D)/kernel-axt: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGETPREFIX) $(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install && \ touch $@ -kernel-axt-modules: $(D)/kernel-axt +kernel-arm-modules: $(D)/kernel-arm cp -a $(MODULES_DIR)/kernel $(TARGETMODULES) cp -a $(MODULES_DIR)/modules.builtin $(TARGETMODULES) cp -a $(MODULES_DIR)/modules.order $(TARGETMODULES) - make depmod-axt + make depmod-arm -depmod-axt: +depmod-arm: PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGETPREFIX) $(KERNEL_VERSION_FULL) diff --git a/make/neutrino.mk b/make/neutrino.mk index fbdb6430..16041034 100644 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -9,7 +9,7 @@ ifeq ($(USE_LIBSTB-HAL), yes) NEUTRINO_DEPS += libstb-hal endif -ifeq ($(BOXSERIES), ax) +ifeq ($(BOXSERIES), hd51) NEUTRINO_DEPS += $(D)/gst_plugins_dvbmediasink endif @@ -23,7 +23,7 @@ endif ifeq ($(BOXSERIES), hd2) N_CFLAGS += -DFB_HW_ACCELERATION endif -ifeq ($(BOXSERIES), ax) +ifeq ($(BOXSERIES), hd51) N_CFLAGS += $(shell $(PKG_CONFIG) --cflags --libs gstreamer-1.0) N_CFLAGS += $(shell $(PKG_CONFIG) --cflags --libs gstreamer-audio-1.0) N_CFLAGS += $(shell $(PKG_CONFIG) --cflags --libs gstreamer-video-1.0) @@ -60,7 +60,7 @@ ifeq ($(USE_LIBSTB-HAL), yes) endif N_CONFIGURE_ADDITIONS = -ifeq ($(BOXSERIES), ax) +ifeq ($(BOXSERIES), hd51) N_CONFIGURE_ADDITIONS += \ --enable-reschange endif diff --git a/make/ni.mk b/make/ni.mk index cf5aead4..b5e7ae82 100644 --- a/make/ni.mk +++ b/make/ni.mk @@ -5,7 +5,7 @@ init: preqs crosstools bootstrap # -- wrapper-targets for Neutrino-Updates ------------------------------------- -BOXSERIES_UPDATE = hd2 ax +BOXSERIES_UPDATE = hd2 hd51 ifneq ($(DEBUG), yes) BOXSERIES_UPDATE += hd1 endif @@ -77,7 +77,7 @@ ni-image: make -j$(NUM_CPUS) wget make -j$(NUM_CPUS) iconv make -j$(NUM_CPUS) streamripper -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 ax)) +ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51)) make channellogos make -j$(NUM_CPUS) less make -j$(NUM_CPUS) parted @@ -89,7 +89,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 ax)) make -j$(NUM_CPUS) minicom make -j$(NUM_CPUS) mc endif - ifeq ($(BOXSERIES), ax) + ifeq ($(BOXSERIES), hd51) make -j$(NUM_CPUS) ofgwrite make -j$(NUM_CPUS) aio-grab make stb-startup diff --git a/make/plugins.mk b/make/plugins.mk index ee5b261c..999f9fa1 100644 --- a/make/plugins.mk +++ b/make/plugins.mk @@ -76,7 +76,7 @@ plugins-all: $(D)/neutrino \ plugins-hd1: # nothing to do plugins-hd2: # nothing to do -plugins-ax: \ +plugins-hd51: \ showiframe ################ diff --git a/make/static.mk b/make/static.mk index df8be15f..c9258a82 100644 --- a/make/static.mk +++ b/make/static.mk @@ -3,7 +3,7 @@ static: cortex-strings CORTEX-STRINGS_CONF = -ifneq ($(BOXSERIES), ax) +ifneq ($(BOXSERIES), hd51) CORTEX-STRINGS_CONF = --without-neon endif diff --git a/make/system-libs.mk b/make/system-libs.mk index 0f891af8..8b31c0ea 100644 --- a/make/system-libs.mk +++ b/make/system-libs.mk @@ -133,7 +133,7 @@ $(D)/libcurl: $(D)/zlib $(D)/openssl $(ARCHIVE)/curl-$(LIBCURL_VER).tar.bz2 | $( touch $@ LIBPNG_CONF = -ifneq ($(BOXSERIES), ax) +ifneq ($(BOXSERIES), hd51) LIBPNG_CONF = --disable-arm-neon endif @@ -385,7 +385,7 @@ ifeq ($(BOXSERIES), hd1) --extra-cflags="-Wno-deprecated-declarations -I$(TARGETINCLUDE)" endif -ifeq ($(BOXSERIES), ax) +ifeq ($(BOXSERIES), hd51) FFMPEG_CONFIGURE = \ --enable-encoder=mpeg2video \ --enable-muxer=mpeg2video \ diff --git a/make/system-tools.mk b/make/system-tools.mk index 52caa956..dcf400b0 100644 --- a/make/system-tools.mk +++ b/make/system-tools.mk @@ -549,7 +549,7 @@ $(D)/samba-hd1: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA33_VER).tar.gz | $(TARGETPREFI $(REMOVE)/samba-$(SAMBA33_VER) touch $@ -$(D)/samba-ax \ +$(D)/samba-hd51 \ $(D)/samba-hd2: $(D)/zlib $(ARCHIVE)/samba-$(SAMBA36_VER).tar.gz | $(TARGETPREFIX) $(UNTAR)/samba-$(SAMBA36_VER).tar.gz cd $(BUILD_TMP)/samba-$(SAMBA36_VER) && \ diff --git a/skel-root/axtech/ax/bin/.gitignore b/skel-root/armbox/hd51/bin/.gitignore similarity index 100% rename from skel-root/axtech/ax/bin/.gitignore rename to skel-root/armbox/hd51/bin/.gitignore diff --git a/skel-root/axtech/ax/boot/.gitignore b/skel-root/armbox/hd51/boot/.gitignore similarity index 100% rename from skel-root/axtech/ax/boot/.gitignore rename to skel-root/armbox/hd51/boot/.gitignore diff --git a/skel-root/axtech/ax/dev/.gitignore b/skel-root/armbox/hd51/dev/.gitignore similarity index 100% rename from skel-root/axtech/ax/dev/.gitignore rename to skel-root/armbox/hd51/dev/.gitignore diff --git a/skel-root/axtech/ax/etc/exports b/skel-root/armbox/hd51/etc/exports similarity index 100% rename from skel-root/axtech/ax/etc/exports rename to skel-root/armbox/hd51/etc/exports diff --git a/skel-root/axtech/ax/etc/filesystems b/skel-root/armbox/hd51/etc/filesystems similarity index 100% rename from skel-root/axtech/ax/etc/filesystems rename to skel-root/armbox/hd51/etc/filesystems diff --git a/skel-root/axtech/ax/etc/fstab b/skel-root/armbox/hd51/etc/fstab similarity index 100% rename from skel-root/axtech/ax/etc/fstab rename to skel-root/armbox/hd51/etc/fstab diff --git a/skel-root/axtech/ax/etc/group b/skel-root/armbox/hd51/etc/group similarity index 100% rename from skel-root/axtech/ax/etc/group rename to skel-root/armbox/hd51/etc/group diff --git a/skel-root/axtech/ax/etc/hosts b/skel-root/armbox/hd51/etc/hosts similarity index 100% rename from skel-root/axtech/ax/etc/hosts rename to skel-root/armbox/hd51/etc/hosts diff --git a/skel-root/axtech/ax/etc/inetd.conf b/skel-root/armbox/hd51/etc/inetd.conf similarity index 100% rename from skel-root/axtech/ax/etc/inetd.conf rename to skel-root/armbox/hd51/etc/inetd.conf diff --git a/skel-root/axtech/ax/etc/init.d/.gitignore b/skel-root/armbox/hd51/etc/init.d/.gitignore similarity index 100% rename from skel-root/axtech/ax/etc/init.d/.gitignore rename to skel-root/armbox/hd51/etc/init.d/.gitignore diff --git a/skel-root/axtech/ax/etc/init.d/coredump b/skel-root/armbox/hd51/etc/init.d/coredump similarity index 100% rename from skel-root/axtech/ax/etc/init.d/coredump rename to skel-root/armbox/hd51/etc/init.d/coredump diff --git a/skel-root/axtech/ax/etc/init.d/crond b/skel-root/armbox/hd51/etc/init.d/crond similarity index 100% rename from skel-root/axtech/ax/etc/init.d/crond rename to skel-root/armbox/hd51/etc/init.d/crond diff --git a/skel-root/axtech/ax/etc/init.d/emu b/skel-root/armbox/hd51/etc/init.d/emu similarity index 100% rename from skel-root/axtech/ax/etc/init.d/emu rename to skel-root/armbox/hd51/etc/init.d/emu diff --git a/skel-root/axtech/ax/etc/init.d/fstab b/skel-root/armbox/hd51/etc/init.d/fstab similarity index 100% rename from skel-root/axtech/ax/etc/init.d/fstab rename to skel-root/armbox/hd51/etc/init.d/fstab diff --git a/skel-root/axtech/ax/etc/init.d/functions b/skel-root/armbox/hd51/etc/init.d/functions similarity index 100% rename from skel-root/axtech/ax/etc/init.d/functions rename to skel-root/armbox/hd51/etc/init.d/functions diff --git a/skel-root/axtech/ax/etc/init.d/globals b/skel-root/armbox/hd51/etc/init.d/globals similarity index 100% rename from skel-root/axtech/ax/etc/init.d/globals rename to skel-root/armbox/hd51/etc/init.d/globals diff --git a/skel-root/axtech/ax/etc/init.d/hostname b/skel-root/armbox/hd51/etc/init.d/hostname similarity index 100% rename from skel-root/axtech/ax/etc/init.d/hostname rename to skel-root/armbox/hd51/etc/init.d/hostname diff --git a/skel-root/axtech/ax/etc/init.d/inetd b/skel-root/armbox/hd51/etc/init.d/inetd similarity index 100% rename from skel-root/axtech/ax/etc/init.d/inetd rename to skel-root/armbox/hd51/etc/init.d/inetd diff --git a/skel-root/axtech/ax/etc/init.d/networking b/skel-root/armbox/hd51/etc/init.d/networking similarity index 100% rename from skel-root/axtech/ax/etc/init.d/networking rename to skel-root/armbox/hd51/etc/init.d/networking diff --git a/skel-root/axtech/ax/etc/init.d/ntpdate b/skel-root/armbox/hd51/etc/init.d/ntpdate similarity index 100% rename from skel-root/axtech/ax/etc/init.d/ntpdate rename to skel-root/armbox/hd51/etc/init.d/ntpdate diff --git a/skel-root/axtech/ax/etc/init.d/oscamfix b/skel-root/armbox/hd51/etc/init.d/oscamfix similarity index 100% rename from skel-root/axtech/ax/etc/init.d/oscamfix rename to skel-root/armbox/hd51/etc/init.d/oscamfix diff --git a/skel-root/axtech/ax/etc/init.d/rcK b/skel-root/armbox/hd51/etc/init.d/rcK similarity index 100% rename from skel-root/axtech/ax/etc/init.d/rcK rename to skel-root/armbox/hd51/etc/init.d/rcK diff --git a/skel-root/axtech/ax/etc/init.d/rcS b/skel-root/armbox/hd51/etc/init.d/rcS similarity index 100% rename from skel-root/axtech/ax/etc/init.d/rcS rename to skel-root/armbox/hd51/etc/init.d/rcS diff --git a/skel-root/axtech/ax/etc/init.d/sdX b/skel-root/armbox/hd51/etc/init.d/sdX similarity index 100% rename from skel-root/axtech/ax/etc/init.d/sdX rename to skel-root/armbox/hd51/etc/init.d/sdX diff --git a/skel-root/axtech/ax/etc/init.d/start_neutrino b/skel-root/armbox/hd51/etc/init.d/start_neutrino similarity index 100% rename from skel-root/axtech/ax/etc/init.d/start_neutrino rename to skel-root/armbox/hd51/etc/init.d/start_neutrino diff --git a/skel-root/axtech/ax/etc/init.d/syslogd b/skel-root/armbox/hd51/etc/init.d/syslogd similarity index 100% rename from skel-root/axtech/ax/etc/init.d/syslogd rename to skel-root/armbox/hd51/etc/init.d/syslogd diff --git a/skel-root/axtech/ax/etc/inittab b/skel-root/armbox/hd51/etc/inittab similarity index 100% rename from skel-root/axtech/ax/etc/inittab rename to skel-root/armbox/hd51/etc/inittab diff --git a/skel-root/axtech/ax/etc/issue.net b/skel-root/armbox/hd51/etc/issue.net similarity index 100% rename from skel-root/axtech/ax/etc/issue.net rename to skel-root/armbox/hd51/etc/issue.net diff --git a/skel-root/axtech/ax/etc/mdev.conf b/skel-root/armbox/hd51/etc/mdev.conf similarity index 100% rename from skel-root/axtech/ax/etc/mdev.conf rename to skel-root/armbox/hd51/etc/mdev.conf diff --git a/skel-root/axtech/ax/etc/mtab b/skel-root/armbox/hd51/etc/mtab similarity index 100% rename from skel-root/axtech/ax/etc/mtab rename to skel-root/armbox/hd51/etc/mtab diff --git a/skel-root/axtech/ax/etc/network/if-down.d/.gitignore b/skel-root/armbox/hd51/etc/network/if-down.d/.gitignore similarity index 100% rename from skel-root/axtech/ax/etc/network/if-down.d/.gitignore rename to skel-root/armbox/hd51/etc/network/if-down.d/.gitignore diff --git a/skel-root/axtech/ax/etc/network/if-post-down.d/.gitignore b/skel-root/armbox/hd51/etc/network/if-post-down.d/.gitignore similarity index 100% rename from skel-root/axtech/ax/etc/network/if-post-down.d/.gitignore rename to skel-root/armbox/hd51/etc/network/if-post-down.d/.gitignore diff --git a/skel-root/axtech/ax/etc/network/if-post-up.d/.gitignore b/skel-root/armbox/hd51/etc/network/if-post-up.d/.gitignore similarity index 100% rename from skel-root/axtech/ax/etc/network/if-post-up.d/.gitignore rename to skel-root/armbox/hd51/etc/network/if-post-up.d/.gitignore diff --git a/skel-root/axtech/ax/etc/network/if-pre-up.d/.gitignore b/skel-root/armbox/hd51/etc/network/if-pre-up.d/.gitignore similarity index 100% rename from skel-root/axtech/ax/etc/network/if-pre-up.d/.gitignore rename to skel-root/armbox/hd51/etc/network/if-pre-up.d/.gitignore diff --git a/skel-root/axtech/ax/etc/network/if-up.d/.gitignore b/skel-root/armbox/hd51/etc/network/if-up.d/.gitignore similarity index 100% rename from skel-root/axtech/ax/etc/network/if-up.d/.gitignore rename to skel-root/armbox/hd51/etc/network/if-up.d/.gitignore diff --git a/skel-root/axtech/ax/etc/network/interfaces b/skel-root/armbox/hd51/etc/network/interfaces similarity index 100% rename from skel-root/axtech/ax/etc/network/interfaces rename to skel-root/armbox/hd51/etc/network/interfaces diff --git a/skel-root/axtech/ax/etc/network/post-wlan0.sh b/skel-root/armbox/hd51/etc/network/post-wlan0.sh similarity index 100% rename from skel-root/axtech/ax/etc/network/post-wlan0.sh rename to skel-root/armbox/hd51/etc/network/post-wlan0.sh diff --git a/skel-root/axtech/ax/etc/network/pre-wlan0.sh b/skel-root/armbox/hd51/etc/network/pre-wlan0.sh similarity index 100% rename from skel-root/axtech/ax/etc/network/pre-wlan0.sh rename to skel-root/armbox/hd51/etc/network/pre-wlan0.sh diff --git a/skel-root/axtech/ax/etc/nsswitch.conf b/skel-root/armbox/hd51/etc/nsswitch.conf similarity index 100% rename from skel-root/axtech/ax/etc/nsswitch.conf rename to skel-root/armbox/hd51/etc/nsswitch.conf diff --git a/skel-root/axtech/ax/etc/passwd b/skel-root/armbox/hd51/etc/passwd similarity index 100% rename from skel-root/axtech/ax/etc/passwd rename to skel-root/armbox/hd51/etc/passwd diff --git a/skel-root/axtech/ax/etc/profile b/skel-root/armbox/hd51/etc/profile similarity index 100% rename from skel-root/axtech/ax/etc/profile rename to skel-root/armbox/hd51/etc/profile diff --git a/skel-root/axtech/ax/etc/profile.local b/skel-root/armbox/hd51/etc/profile.local similarity index 100% rename from skel-root/axtech/ax/etc/profile.local rename to skel-root/armbox/hd51/etc/profile.local diff --git a/skel-root/axtech/ax/etc/protocols b/skel-root/armbox/hd51/etc/protocols similarity index 100% rename from skel-root/axtech/ax/etc/protocols rename to skel-root/armbox/hd51/etc/protocols diff --git a/skel-root/axtech/ax/etc/services b/skel-root/armbox/hd51/etc/services similarity index 100% rename from skel-root/axtech/ax/etc/services rename to skel-root/armbox/hd51/etc/services diff --git a/skel-root/axtech/ax/etc/shells b/skel-root/armbox/hd51/etc/shells similarity index 100% rename from skel-root/axtech/ax/etc/shells rename to skel-root/armbox/hd51/etc/shells diff --git a/skel-root/axtech/ax/lib/firmware/.gitignore b/skel-root/armbox/hd51/lib/firmware/.gitignore similarity index 100% rename from skel-root/axtech/ax/lib/firmware/.gitignore rename to skel-root/armbox/hd51/lib/firmware/.gitignore diff --git a/skel-root/axtech/ax/lib/mdev/common/mdev-log-only b/skel-root/armbox/hd51/lib/mdev/common/mdev-log-only similarity index 100% rename from skel-root/axtech/ax/lib/mdev/common/mdev-log-only rename to skel-root/armbox/hd51/lib/mdev/common/mdev-log-only diff --git a/skel-root/axtech/ax/lib/mdev/common/mdev-modprobe b/skel-root/armbox/hd51/lib/mdev/common/mdev-modprobe similarity index 100% rename from skel-root/axtech/ax/lib/mdev/common/mdev-modprobe rename to skel-root/armbox/hd51/lib/mdev/common/mdev-modprobe diff --git a/skel-root/axtech/ax/lib/mdev/common/mdev-module b/skel-root/armbox/hd51/lib/mdev/common/mdev-module similarity index 100% rename from skel-root/axtech/ax/lib/mdev/common/mdev-module rename to skel-root/armbox/hd51/lib/mdev/common/mdev-module diff --git a/skel-root/axtech/ax/lib/mdev/fs/mdev-mmcblk b/skel-root/armbox/hd51/lib/mdev/fs/mdev-mmcblk similarity index 100% rename from skel-root/axtech/ax/lib/mdev/fs/mdev-mmcblk rename to skel-root/armbox/hd51/lib/mdev/fs/mdev-mmcblk diff --git a/skel-root/axtech/ax/lib/mdev/fs/mdev-mount b/skel-root/armbox/hd51/lib/mdev/fs/mdev-mount similarity index 100% rename from skel-root/axtech/ax/lib/mdev/fs/mdev-mount rename to skel-root/armbox/hd51/lib/mdev/fs/mdev-mount diff --git a/skel-root/axtech/ax/lib/mdev/net/mdev-wlan b/skel-root/armbox/hd51/lib/mdev/net/mdev-wlan similarity index 100% rename from skel-root/axtech/ax/lib/mdev/net/mdev-wlan rename to skel-root/armbox/hd51/lib/mdev/net/mdev-wlan diff --git a/skel-root/axtech/ax/lib/mdev/usb/coldplug-setenv b/skel-root/armbox/hd51/lib/mdev/usb/coldplug-setenv similarity index 100% rename from skel-root/axtech/ax/lib/mdev/usb/coldplug-setenv rename to skel-root/armbox/hd51/lib/mdev/usb/coldplug-setenv diff --git a/skel-root/axtech/ax/lib/mdev/usb/mdev-usb b/skel-root/armbox/hd51/lib/mdev/usb/mdev-usb similarity index 100% rename from skel-root/axtech/ax/lib/mdev/usb/mdev-usb rename to skel-root/armbox/hd51/lib/mdev/usb/mdev-usb diff --git a/skel-root/axtech/ax/media/.gitignore b/skel-root/armbox/hd51/media/.gitignore similarity index 100% rename from skel-root/axtech/ax/media/.gitignore rename to skel-root/armbox/hd51/media/.gitignore diff --git a/skel-root/axtech/ax/mnt/.gitignore b/skel-root/armbox/hd51/mnt/.gitignore similarity index 100% rename from skel-root/axtech/ax/mnt/.gitignore rename to skel-root/armbox/hd51/mnt/.gitignore diff --git a/skel-root/axtech/ax/proc/.gitignore b/skel-root/armbox/hd51/proc/.gitignore similarity index 100% rename from skel-root/axtech/ax/proc/.gitignore rename to skel-root/armbox/hd51/proc/.gitignore diff --git a/skel-root/axtech/ax/sbin/service b/skel-root/armbox/hd51/sbin/service similarity index 100% rename from skel-root/axtech/ax/sbin/service rename to skel-root/armbox/hd51/sbin/service diff --git a/skel-root/axtech/ax/share/udhcpc/default.script b/skel-root/armbox/hd51/share/udhcpc/default.script similarity index 100% rename from skel-root/axtech/ax/share/udhcpc/default.script rename to skel-root/armbox/hd51/share/udhcpc/default.script diff --git a/skel-root/axtech/ax/srv/.gitignore b/skel-root/armbox/hd51/srv/.gitignore similarity index 100% rename from skel-root/axtech/ax/srv/.gitignore rename to skel-root/armbox/hd51/srv/.gitignore diff --git a/skel-root/axtech/ax/sys/.gitignore b/skel-root/armbox/hd51/sys/.gitignore similarity index 100% rename from skel-root/axtech/ax/sys/.gitignore rename to skel-root/armbox/hd51/sys/.gitignore diff --git a/skel-root/axtech/ax/tmp/.gitignore b/skel-root/armbox/hd51/tmp/.gitignore similarity index 100% rename from skel-root/axtech/ax/tmp/.gitignore rename to skel-root/armbox/hd51/tmp/.gitignore diff --git a/skel-root/axtech/ax/usr/bin/.gitignore b/skel-root/armbox/hd51/usr/bin/.gitignore similarity index 100% rename from skel-root/axtech/ax/usr/bin/.gitignore rename to skel-root/armbox/hd51/usr/bin/.gitignore diff --git a/skel-root/axtech/ax/var/bin/.gitignore b/skel-root/armbox/hd51/var/bin/.gitignore similarity index 100% rename from skel-root/axtech/ax/var/bin/.gitignore rename to skel-root/armbox/hd51/var/bin/.gitignore diff --git a/skel-root/axtech/ax/var/etc/.gitignore b/skel-root/armbox/hd51/var/etc/.gitignore similarity index 100% rename from skel-root/axtech/ax/var/etc/.gitignore rename to skel-root/armbox/hd51/var/etc/.gitignore diff --git a/skel-root/axtech/ax/var/etc/init.d/.gitignore b/skel-root/armbox/hd51/var/etc/init.d/.gitignore similarity index 100% rename from skel-root/axtech/ax/var/etc/init.d/.gitignore rename to skel-root/armbox/hd51/var/etc/init.d/.gitignore diff --git a/skel-root/axtech/ax/var/keys/.gitignore b/skel-root/armbox/hd51/var/keys/.gitignore similarity index 100% rename from skel-root/axtech/ax/var/keys/.gitignore rename to skel-root/armbox/hd51/var/keys/.gitignore diff --git a/skel-root/axtech/ax/var/root/.gitignore b/skel-root/armbox/hd51/var/root/.gitignore similarity index 100% rename from skel-root/axtech/ax/var/root/.gitignore rename to skel-root/armbox/hd51/var/root/.gitignore diff --git a/skel-root/axtech/ax/var/spool/cron/crontabs/.gitignore b/skel-root/armbox/hd51/var/spool/cron/crontabs/.gitignore similarity index 100% rename from skel-root/axtech/ax/var/spool/cron/crontabs/.gitignore rename to skel-root/armbox/hd51/var/spool/cron/crontabs/.gitignore From a68fd77d3245795d696b141fdf9d5ccca1c5f0ec Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 23 Oct 2017 14:11:16 +0200 Subject: [PATCH 2/3] - images.mk: remove double string from server's textfile --- make/images.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/images.mk b/make/images.mk index 73824868..d01ac109 100644 --- a/make/images.mk +++ b/make/images.mk @@ -262,7 +262,7 @@ flash-image-arm-multi: flash-image-arm: BOXNAME="AX/Mut@nt" flash-image-arm: IMAGE_NAME=$(IMAGE_PREFIX)-$(IMAGE_SUFFIX) -flash-image-arm: IMAGE_DESC="$(BOXNAME) [$(IMAGE_SUFFIX)][$(BOXSERIES)] $(shell echo $(IMAGE_TYPE_STRING) | sed 's/.*/\u&/')" +flash-image-arm: IMAGE_DESC="$(BOXNAME) [$(IMAGE_SUFFIX)] $(shell echo $(IMAGE_TYPE_STRING) | sed 's/.*/\u&/')" flash-image-arm: IMAGE_MD5FILE=$(IMAGE_TYPE_STRING)-$(IMAGE_SUFFIX).txt flash-image-arm: IMAGE_DATE=$(shell cat $(BOX)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-) flash-image-arm: From 4c5926551d8bd91a5824cbfa5c78addadd481946 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 23 Oct 2017 14:19:33 +0200 Subject: [PATCH 3/3] - update server's update-script --- archive-server/update.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/archive-server/update.php b/archive-server/update.php index c0d4c4c5..482af02c 100644 --- a/archive-server/update.php +++ b/archive-server/update.php @@ -15,9 +15,9 @@ $chip_type = trim($_GET["chip_type"]); if ($revision == 1) //FIXME { - # AX-Technologies - $boxtype_sc = "axt"; - $boxseries = "ax"; + # AX/Mutant + $boxtype_sc = "arm"; + $boxseries = "hd51"; $boxmodel = "hd51"; } elseif ($revision == 6 || $revision == 7 || $revision == 8 || $revision == 10)