pomfi/balena-allwinner
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #129 from balena-os/klutchell/resin-img-rename

Browse source 
balena-allwinner: Rename resin image types to balena
This commit is contained in:
bulldozer-balena[bot] 2021-03-11 22:41:49 +00:00 • committed by GitHub
commit da77dc16d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 88 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
balena-yocto-scripts

@ -1 +1 @@
Subproject commit 23a936aaa192dd9110c3d6cafd174e357679f129
Subproject commit 3cfb908769d20683ccbda0ad0e565d64f8cb9760

6
bananapi-m1-plus.coffee
View file

@ -21,10 +21,10 @@ module.exports =
yocto:
machine: 'bananapi-m1-plus'
image: 'resin-image'
fstype: 'resinos-img'
image: 'balena-image'
fstype: 'balenaos-img'
version: 'yocto-warrior'
deployArtifact: 'resin-image-bananapi-m1-plus.resinos-img'
deployArtifact: 'balena-image-bananapi-m1-plus.balenaos-img'
compressed: true
configuration:

2
layers/meta-balena

@ -1 +1 @@
Subproject commit 9aed19a55bdaf7cfb54f69bb9f7d875df7cd4297
Subproject commit 6f4fb33cf92ac7d42b1a03df66f76d8d136e49ce

2
layers/meta-balena-allwinner/conf/samples/local.conf.sample
View file

@ -17,7 +17,7 @@ BALENA_STORAGE = "overlay2"
#SUPERVISOR_TAG ?= "master"
# Compress final raw image
#RESIN_RAW_IMG_COMPRESSION ?= "xz"
#BALENA_RAW_IMG_COMPRESSION ?= "xz"
# Parallelism Options
BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()}"

2
layers/meta-balena-allwinner/recipes-bsp/nanopi-air-bt/nanopi-air-bt.bb
View file

@ -1,7 +1,7 @@
SUMMARY = "Enable bluetooth on Nanopi Neo Air boards"
LICENSE="Apache-2.0"
LIC_FILES_CHKSUM = "file://${RESIN_COREBASE}/COPYING.Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
LIC_FILES_CHKSUM = "file://${BALENA_COREBASE}/COPYING.Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
DESCRIPTION = "Package contains udev rule, systemd service and a script to init the Ampak 6212A \
bluetooth chip for the Nanopi Neo Air board"

2
layers/meta-balena-allwinner/recipes-bsp/u-boot/files/resin-specific-env-integration-kconfig_reworked.patch
View file

@ -32,7 +32,7 @@ index 86b639d3e2..6cb5153406 100644
#else
const uchar default_environment[] = {
#endif
+ RESIN_ENV
+ BALENA_ENV
#ifndef CONFIG_USE_DEFAULT_ENV_FILE
#ifdef CONFIG_ENV_CALLBACK_LIST_DEFAULT
ENV_CALLBACK_VAR "=" CONFIG_ENV_CALLBACK_LIST_DEFAULT "\0"

1
layers/meta-balena-allwinner/recipes-core/images/balena-image-flasher.bbappend Normal file
View file

@ -0,0 +1 @@
include balena-image.inc

1
layers/meta-balena-allwinner/recipes-core/images/balena-image.bbappend Normal file
View file

@ -0,0 +1 @@
include balena-image.inc

72
layers/meta-balena-allwinner/recipes-core/images/resin-image.inc → layers/meta-balena-allwinner/recipes-core/images/balena-image.inc
View file

@ -2,36 +2,36 @@
# Orange Pi Plus2
#
IMAGE_FSTYPES_append_orangepi-plus2 = " resinos-img"
IMAGE_FSTYPES_append_orangepi-plus2 = " balenaos-img"
# Customize resinos-img
RESIN_IMAGE_BOOTLOADER_orangepi-plus2 = "u-boot"
RESIN_BOOT_PARTITION_FILES_orangepi-plus2 = " \
# Customize balenaos-img
BALENA_IMAGE_BOOTLOADER_orangepi-plus2 = "u-boot"
BALENA_BOOT_PARTITION_FILES_orangepi-plus2 = " \
${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin:/${KERNEL_IMAGETYPE} \
sun8i-h3-orangepi-plus.dtb:/dtb/sun8i-h3-orangepi-plus.dtb \
u-boot-sunxi-with-spl.bin: \
"
IMAGE_CMD_resinos-img_append_orangepi-plus2 () {
IMAGE_CMD_balenaos-img_append_orangepi-plus2 () {
# Orange Pi Plus2 needs uboot written at a specific location
dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${RESIN_RAW_IMG} conv=notrunc seek=8 bs=1024
dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${BALENA_RAW_IMG} conv=notrunc seek=8 bs=1024
}
#
# Orange Pi One
#
IMAGE_FSTYPES_append_orange-pi-one = " resinos-img"
IMAGE_FSTYPES_append_orange-pi-one = " balenaos-img"
# Customize resinos-img
RESIN_IMAGE_BOOTLOADER_orange-pi-one = "u-boot"
RESIN_BOOT_PARTITION_FILES_orange-pi-one = " \
# Customize balenaos-img
BALENA_IMAGE_BOOTLOADER_orange-pi-one = "u-boot"
BALENA_BOOT_PARTITION_FILES_orange-pi-one = " \
${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin:/${KERNEL_IMAGETYPE} \
sun8i-h3-orangepi-one.dtb:/dtb/sun8i-h3-orangepi-one.dtb \
u-boot-sunxi-with-spl.bin: \
"
IMAGE_CMD_resinos-img_append_orange-pi-one () {
IMAGE_CMD_balenaos-img_append_orange-pi-one () {
# Orange Pi One needs uboot written at a specific location
dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${RESIN_RAW_IMG} conv=notrunc seek=8 bs=1024
dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${BALENA_RAW_IMG} conv=notrunc seek=8 bs=1024
}
@ -39,29 +39,29 @@ IMAGE_CMD_resinos-img_append_orange-pi-one () {
# bananapi-M1+
#
IMAGE_FSTYPES_append_bananapi-m1-plus = " resinos-img"
IMAGE_FSTYPES_append_bananapi-m1-plus = " balenaos-img"
# Customize resinos-img
RESIN_IMAGE_BOOTLOADER_bananapi-m1-plus = "u-boot"
RESIN_BOOT_PARTITION_FILES_bananapi-m1-plus = " \
# Customize balenaos-img
BALENA_IMAGE_BOOTLOADER_bananapi-m1-plus = "u-boot"
BALENA_BOOT_PARTITION_FILES_bananapi-m1-plus = " \
${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin:/${KERNEL_IMAGETYPE} \
sun7i-a20-bananapi-m1-plus.dtb:/dtb/sun7i-a20-bananapi-m1-plus.dtb\
u-boot-sunxi-with-spl.bin: \
"
IMAGE_CMD_resinos-img_append_bananapi-m1-plus () {
IMAGE_CMD_balenaos-img_append_bananapi-m1-plus () {
# bananapi-M1+ needs uboot written at a specific location
dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${RESIN_RAW_IMG} conv=notrunc seek=8 bs=1024
dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${BALENA_RAW_IMG} conv=notrunc seek=8 bs=1024
}
#
# orange-pi-lite
#
IMAGE_FSTYPES_append_orange-pi-lite = " resinos-img"
IMAGE_FSTYPES_append_orange-pi-lite = " balenaos-img"
# Customize resinos-img
RESIN_IMAGE_BOOTLOADER_orange-pi-lite = "u-boot"
RESIN_BOOT_PARTITION_FILES_orange-pi-lite = " \
# Customize balenaos-img
BALENA_IMAGE_BOOTLOADER_orange-pi-lite = "u-boot"
BALENA_BOOT_PARTITION_FILES_orange-pi-lite = " \
${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin:/${KERNEL_IMAGETYPE} \
sun8i-h3-orangepi-lite.dtb:/dtb/sun8i-h3-orangepi-lite.dtb \
sun8i-h3-fixup.scr:/dtb/overlay/sun8i-h3-fixup.scr \
@ -86,9 +86,9 @@ RESIN_BOOT_PARTITION_FILES_orange-pi-lite = " \
boot.scr:/boot.scr \
"
IMAGE_CMD_resinos-img_append_orange-pi-lite () {
IMAGE_CMD_balenaos-img_append_orange-pi-lite () {
# orange-pi-lite needs uboot written at a specific location
dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${RESIN_RAW_IMG} conv=notrunc seek=8 bs=1024
dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${BALENA_RAW_IMG} conv=notrunc seek=8 bs=1024
}
@ -96,11 +96,11 @@ IMAGE_CMD_resinos-img_append_orange-pi-lite () {
# Orange Pi Zero
#
IMAGE_FSTYPES_append_orange-pi-zero = " resinos-img"
IMAGE_FSTYPES_append_orange-pi-zero = " balenaos-img"
#Customize resinos-img
RESIN_IMAGE_BOOTLOADER_orange-pi-zero = "u-boot"
RESIN_BOOT_PARTITION_FILES_orange-pi-zero = " \
#Customize balenaos-img
BALENA_IMAGE_BOOTLOADER_orange-pi-zero = "u-boot"
BALENA_BOOT_PARTITION_FILES_orange-pi-zero = " \
${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin:/${KERNEL_IMAGETYPE} \
sun8i-h2-plus-orangepi-zero.dtb:/dtb/sun8i-h2-plus-orangepi-zero.dtb \
sun8i-h3-fixup.scr:/dtb/overlay/sun8i-h3-fixup.scr \
@ -125,27 +125,27 @@ RESIN_BOOT_PARTITION_FILES_orange-pi-zero = " \
boot.scr:/boot.scr \
u-boot-sunxi-with-spl.bin: \
"
IMAGE_CMD_resinos-img_append_orange-pi-zero () {
IMAGE_CMD_balenaos-img_append_orange-pi-zero () {
# Orange Pi Zero needs uboot written at a specific location
dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${RESIN_RAW_IMG} conv=notrunc seek=8 bs=1024
dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${BALENA_RAW_IMG} conv=notrunc seek=8 bs=1024
}
#
# nanopi-neo-air
#
IMAGE_FSTYPES_append_nanopi-neo-air = " resinos-img"
IMAGE_FSTYPES_append_nanopi-neo-air = " balenaos-img"
# Customize resinos-img
RESIN_IMAGE_BOOTLOADER_nanopi-neo-air = "u-boot"
RESIN_BOOT_PARTITION_FILES_nanopi-neo-air = " \
# Customize balenaos-img
BALENA_IMAGE_BOOTLOADER_nanopi-neo-air = "u-boot"
BALENA_BOOT_PARTITION_FILES_nanopi-neo-air = " \
${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin:/${KERNEL_IMAGETYPE} \
sun8i-h3-nanopi-neo-air.dtb:/dtb/sun8i-h3-nanopi-neo-air.dtb \
u-boot-sunxi-with-spl.bin: \
boot.scr:/boot.scr \
"
IMAGE_CMD_resinos-img_append_nanopi-neo-air () {
IMAGE_CMD_balenaos-img_append_nanopi-neo-air () {
# nanopi-neo-air needs uboot written at a specific location
dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${RESIN_RAW_IMG} conv=notrunc seek=8 bs=1024
dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${BALENA_RAW_IMG} conv=notrunc seek=8 bs=1024
}

1
layers/meta-balena-allwinner/recipes-core/images/resin-image-flasher.bbappend
View file

@ -1 +0,0 @@
include resin-image.inc

1
layers/meta-balena-allwinner/recipes-core/images/resin-image.bbappend
View file

@ -1 +0,0 @@
include resin-image.inc

54
layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend
View file

@ -19,8 +19,8 @@ SRC_URI_append = " \
file://0001-arch-arm-Makefile-Partial-revert-of-https-github.com.patch \
"
RESIN_CONFIGS_append = " axp_power"
RESIN_CONFIGS_DEPS[axp_power] = "\
BALENA_CONFIGS_append = " axp_power"
BALENA_CONFIGS_DEPS[axp_power] = "\
CONFIG_TOUCHSCREEN_SUN4I=n \
CONFIG_IIO=y \
CONFIG_REGMAP_IRQ=y \
@ -28,17 +28,17 @@ RESIN_CONFIGS_DEPS[axp_power] = "\
CONFIG_MFD_AXP20X=y \
CONFIG_MFD_AXP20X_I2C=y \
"
RESIN_CONFIGS[axp_power] ="\
BALENA_CONFIGS[axp_power] ="\
CONFIG_AXP20X_POWER=y \
"
RESIN_CONFIGS_append_orangepi-plus2 = " wifi"
RESIN_CONFIGS_append_orange-pi-zero = " wifi"
RESIN_CONFIGS_append_orange-pi-lite = " wifi"
RESIN_CONFIGS_append_nanopi-neo-air = " wifi"
RESIN_CONFIGS_append_bananapi-m1-plus = " wifi"
BALENA_CONFIGS_append_orangepi-plus2 = " wifi"
BALENA_CONFIGS_append_orange-pi-zero = " wifi"
BALENA_CONFIGS_append_orange-pi-lite = " wifi"
BALENA_CONFIGS_append_nanopi-neo-air = " wifi"
BALENA_CONFIGS_append_bananapi-m1-plus = " wifi"
RESIN_CONFIGS[wifi] ="\
BALENA_CONFIGS[wifi] ="\
CONFIG_WIRELESS=y \
CONFIG_RFKILL=y \
CONFIG_CFG80211=m \
@ -47,59 +47,59 @@ RESIN_CONFIGS[wifi] ="\
CONFIG_WLAN_VENDOR_REALTEK=y \
"
RESIN_CONFIGS_append_orangepi-plus2 = " pl2303"
RESIN_CONFIGS_DEPS[pl2303] = "\
BALENA_CONFIGS_append_orangepi-plus2 = " pl2303"
BALENA_CONFIGS_DEPS[pl2303] = "\
CONFIG_USB_SERIAL=m \
"
RESIN_CONFIGS[pl2303] ="\
BALENA_CONFIGS[pl2303] ="\
CONFIG_USB_SERIAL_PL2303=m \
"
RESIN_CONFIGS_append_orangepi-plus2 = " hdmi"
RESIN_CONFIGS_DEPS[hdmi] = "\
BALENA_CONFIGS_append_orangepi-plus2 = " hdmi"
BALENA_CONFIGS_DEPS[hdmi] = "\
CONFIG_SUN8I_DE2_CCU=y \
"
RESIN_CONFIGS[hdmi] ="\
BALENA_CONFIGS[hdmi] ="\
CONFIG_DRM_SUN8I_DW_HDMI=y \
"
RESIN_CONFIGS_append = " huawei_modems"
RESIN_CONFIGS_DEPS[huawei_modems] = "\
BALENA_CONFIGS_append = " huawei_modems"
BALENA_CONFIGS_DEPS[huawei_modems] = "\
CONFIG_USB_SERIAL_OPTION=m \
CONFIG_USB_USBNET=m \
"
RESIN_CONFIGS[huawei_modems] ="\
BALENA_CONFIGS[huawei_modems] ="\
CONFIG_USB_NET_HUAWEI_CDC_NCM=m \
"
RESIN_CONFIGS_append = " cp210x"
RESIN_CONFIGS[cp210x] ="\
BALENA_CONFIGS_append = " cp210x"
BALENA_CONFIGS[cp210x] ="\
CONFIG_USB_SERIAL_CP210X=m \
"
RESIN_CONFIGS_append_orange-pi-lite = " \
BALENA_CONFIGS_append_orange-pi-lite = " \
8189fs \
"
RESIN_CONFIGS[8189fs] ?= " \
BALENA_CONFIGS[8189fs] ?= " \
CONFIG_RTL8189FS=m \
"
RESIN_CONFIGS_append = " \
BALENA_CONFIGS_append = " \
configfs \
"
RESIN_CONFIGS[configfs] = " \
BALENA_CONFIGS[configfs] = " \
CONFIG_OF_CONFIGFS=y \
CONFIG_OF_OVERLAY=y \
CONFIG_CONFIGFS_FS=m \
"
RESIN_CONFIGS_append_nanopi-neo-air = " hciuart"
RESIN_CONFIGS_DEPS[hciuart] = " \
BALENA_CONFIGS_append_nanopi-neo-air = " hciuart"
BALENA_CONFIGS_DEPS[hciuart] = " \
CONFIG_BT=m \
"
RESIN_CONFIGS[hciuart] = " \
BALENA_CONFIGS[hciuart] = " \
CONFIG_BT_HCIUART=m \
CONFIG_BT_HCIUART_H4=y \
"

6
nanopi-neo-air.coffee
View file

@ -36,10 +36,10 @@ module.exports =
yocto:
machine: 'nanopi-neo-air'
image: 'resin-image-flasher'
fstype: 'resinos-img'
image: 'balena-image-flasher'
fstype: 'balenaos-img'
version: 'yocto-warrior'
deployArtifact: 'resin-image-flasher-nanopi-neo-air.resinos-img'
deployArtifact: 'balena-image-flasher-nanopi-neo-air.balenaos-img'
compressed: true
configuration:

6
orange-pi-lite.coffee
View file

@ -21,10 +21,10 @@ module.exports =
yocto:
machine: 'orange-pi-lite'
image: 'resin-image'
fstype: 'resinos-img'
image: 'balena-image'
fstype: 'balenaos-img'
version: 'yocto-warrior'
deployArtifact: 'resin-image-orange-pi-lite.resinos-img'
deployArtifact: 'balena-image-orange-pi-lite.balenaos-img'
compressed: true
configuration:

6
orange-pi-one.coffee
View file

@ -22,10 +22,10 @@ module.exports =
yocto:
machine: 'orange-pi-one'
image: 'resin-image'
fstype: 'resinos-img'
image: 'balena-image'
fstype: 'balenaos-img'
version: 'yocto-warrior'
deployArtifact: 'resin-image-orange-pi-one.resinos-img'
deployArtifact: 'balena-image-orange-pi-one.balenaos-img'
compressed: true
configuration:

6
orange-pi-zero.coffee
View file

@ -22,10 +22,10 @@ module.exports =
yocto:
machine: 'orange-pi-zero'
image: 'resin-image'
fstype: 'resinos-img'
image: 'balena-image'
fstype: 'balenaos-img'
version: 'yocto-warrior'
deployArtifact: 'resin-image-orange-pi-zero.resinos-img'
deployArtifact: 'balena-image-orange-pi-zero.balenaos-img'
compressed: true
configuration:

6
orangepi-plus2.coffee
View file

@ -36,10 +36,10 @@ module.exports =
yocto:
machine: 'orangepi-plus2'
image: 'resin-image-flasher'
fstype: 'resinos-img'
image: 'balena-image-flasher'
fstype: 'balenaos-img'
version: 'yocto-warrior'
deployArtifact: 'resin-image-flasher-orangepi-plus2.resinos-img'
deployArtifact: 'balena-image-flasher-orangepi-plus2.balenaos-img'
compressed: true
configuration: