diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2019-05-20 17:47:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-20 17:47:50 +0200 |
commit | cdf070e20556a13ecda308833fd5c314d20547ab (patch) | |
tree | f62f36ca4b7b2f26644f9d7f2fdb7e6fdee0154d /classes | |
parent | 195135f3d01fecc099bfec43d56b87c28c9aa8a0 (diff) | |
parent | 99992959999ce9f6ad5fdae5a96262a5e0e59b5e (diff) | |
download | meta-updater-cdf070e20556a13ecda308833fd5c314d20547ab.tar.gz |
Merge pull request #514 from advancedtelematic/fix/rocko/backport
Fix/rocko/backport
Diffstat (limited to 'classes')
-rw-r--r-- | classes/image_types_ostree.bbclass | 7 | ||||
-rw-r--r-- | classes/sota.bbclass | 2 | ||||
-rw-r--r-- | classes/sota_am335x-evm-wifi.bbclass | 1 | ||||
-rw-r--r-- | classes/sota_m3ulcb.bbclass | 3 | ||||
-rw-r--r-- | classes/sota_minnowboard.bbclass | 4 | ||||
-rw-r--r-- | classes/sota_porter.bbclass | 2 | ||||
-rw-r--r-- | classes/sota_qemux86-64.bbclass | 2 | ||||
-rw-r--r-- | classes/sota_raspberrypi.bbclass | 3 |
8 files changed, 20 insertions, 4 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index f3b1b33..134f5f5 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -224,6 +224,11 @@ IMAGE_CMD_garagesign () { | |||
224 | # Push may fail due to race condition when multiple build machines try to push simultaneously | 224 | # Push may fail due to race condition when multiple build machines try to push simultaneously |
225 | # in which case targets.json should be pulled again and the whole procedure repeated | 225 | # in which case targets.json should be pulled again and the whole procedure repeated |
226 | push_success=0 | 226 | push_success=0 |
227 | target_url="" | ||
228 | if [ -n "${GARAGE_TARGET_URL}" ]; then | ||
229 | target_url='--url ${GARAGE_TARGET_URL}' | ||
230 | fi | ||
231 | |||
227 | for push_retries in $( seq 3 ); do | 232 | for push_retries in $( seq 3 ); do |
228 | garage-sign targets pull --repo tufrepo \ | 233 | garage-sign targets pull --repo tufrepo \ |
229 | --home-dir ${GARAGE_SIGN_REPO} | 234 | --home-dir ${GARAGE_SIGN_REPO} |
@@ -233,7 +238,7 @@ IMAGE_CMD_garagesign () { | |||
233 | --format OSTREE \ | 238 | --format OSTREE \ |
234 | --version ${target_version} \ | 239 | --version ${target_version} \ |
235 | --length 0 \ | 240 | --length 0 \ |
236 | --url "${GARAGE_TARGET_URL}" \ | 241 | ${target_url} \ |
237 | --sha256 ${ostree_target_hash} \ | 242 | --sha256 ${ostree_target_hash} \ |
238 | --hardwareids ${SOTA_HARDWARE_ID} | 243 | --hardwareids ${SOTA_HARDWARE_ID} |
239 | garage-sign targets sign --repo tufrepo \ | 244 | garage-sign targets sign --repo tufrepo \ |
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 1517ceb..cb00a80 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass | |||
@@ -38,7 +38,7 @@ GARAGE_SIGN_REPO ?= "${DEPLOY_DIR_IMAGE}/garage_sign_repo" | |||
38 | GARAGE_SIGN_KEYNAME ?= "garage-key" | 38 | GARAGE_SIGN_KEYNAME ?= "garage-key" |
39 | GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}" | 39 | GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}" |
40 | GARAGE_TARGET_VERSION ?= "" | 40 | GARAGE_TARGET_VERSION ?= "" |
41 | GARAGE_TARGET_URL ?= "https://example.com/" | 41 | GARAGE_TARGET_URL ?= "" |
42 | 42 | ||
43 | SOTA_MACHINE ??="none" | 43 | SOTA_MACHINE ??="none" |
44 | SOTA_MACHINE_rpi ?= "raspberrypi" | 44 | SOTA_MACHINE_rpi ?= "raspberrypi" |
diff --git a/classes/sota_am335x-evm-wifi.bbclass b/classes/sota_am335x-evm-wifi.bbclass index adefb47..1458d44 100644 --- a/classes/sota_am335x-evm-wifi.bbclass +++ b/classes/sota_am335x-evm-wifi.bbclass | |||
@@ -7,7 +7,6 @@ IMAGE_BOOT_FILES_sota = "bootfiles/*" | |||
7 | OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 root=/dev/ram0 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/mmcblk0p2 console=ttyO0,115200n8l" | 7 | OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 root=/dev/ram0 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/mmcblk0p2 console=ttyO0,115200n8l" |
8 | 8 | ||
9 | IMAGE_INSTALL_append_sota = " uim iw wl18xx-calibrator wlconf wl18xx-fw hostapd wpa-supplicant" | 9 | IMAGE_INSTALL_append_sota = " uim iw wl18xx-calibrator wlconf wl18xx-fw hostapd wpa-supplicant" |
10 | IMAGE_INSTALL_remove_sota = " connman connman-client" | ||
11 | 10 | ||
12 | PREFERRED_VERSION_linux-ti-staging_sota = "4.4.54+gitAUTOINC+ecd4eada6f" | 11 | PREFERRED_VERSION_linux-ti-staging_sota = "4.4.54+gitAUTOINC+ecd4eada6f" |
13 | 12 | ||
diff --git a/classes/sota_m3ulcb.bbclass b/classes/sota_m3ulcb.bbclass index 4ddcf9e..7c57ae5 100644 --- a/classes/sota_m3ulcb.bbclass +++ b/classes/sota_m3ulcb.bbclass | |||
@@ -6,3 +6,6 @@ IMAGE_BOOT_FILES_sota += "renesas-ota-bootfiles/*" | |||
6 | 6 | ||
7 | OSTREE_BOOTLOADER ?= "u-boot" | 7 | OSTREE_BOOTLOADER ?= "u-boot" |
8 | UBOOT_MACHINE_sota = "m3ulcb_defconfig" | 8 | UBOOT_MACHINE_sota = "m3ulcb_defconfig" |
9 | |||
10 | PREFERRED_RPROVIDER_virtual/network-configuration ?= "connman" | ||
11 | IMAGE_INSTALL_append_sota = " virtual/network-configuration " | ||
diff --git a/classes/sota_minnowboard.bbclass b/classes/sota_minnowboard.bbclass index 63510e3..a907217 100644 --- a/classes/sota_minnowboard.bbclass +++ b/classes/sota_minnowboard.bbclass | |||
@@ -6,5 +6,7 @@ IMAGE_BOOT_FILES_sota = "" | |||
6 | 6 | ||
7 | IMAGE_FSTYPES_remove_sota = "live hddimg" | 7 | IMAGE_FSTYPES_remove_sota = "live hddimg" |
8 | OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 console=ttyS0,115200 console=tty0" | 8 | OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 console=ttyS0,115200 console=tty0" |
9 | |||
10 | IMAGE_INSTALL_append = " minnowboard-efi-startup" | 9 | IMAGE_INSTALL_append = " minnowboard-efi-startup" |
10 | |||
11 | PREFERRED_RPROVIDER_virtual/network-configuration ?= "connman" | ||
12 | IMAGE_INSTALL_append_sota = " virtual/network-configuration " | ||
diff --git a/classes/sota_porter.bbclass b/classes/sota_porter.bbclass index 75ae579..80062e1 100644 --- a/classes/sota_porter.bbclass +++ b/classes/sota_porter.bbclass | |||
@@ -7,3 +7,5 @@ IMAGE_BOOT_FILES_sota += "porter-bootfiles/*" | |||
7 | OSTREE_BOOTLOADER ?= "u-boot" | 7 | OSTREE_BOOTLOADER ?= "u-boot" |
8 | UBOOT_MACHINE_sota = "porter_config" | 8 | UBOOT_MACHINE_sota = "porter_config" |
9 | 9 | ||
10 | PREFERRED_RPROVIDER_virtual/network-configuration ?= "connman" | ||
11 | IMAGE_INSTALL_append_sota = " virtual/network-configuration " | ||
diff --git a/classes/sota_qemux86-64.bbclass b/classes/sota_qemux86-64.bbclass index 82efe52..8acb976 100644 --- a/classes/sota_qemux86-64.bbclass +++ b/classes/sota_qemux86-64.bbclass | |||
@@ -12,3 +12,5 @@ IMAGE_ROOTFS_EXTRA_SPACE = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', '655 | |||
12 | 12 | ||
13 | # fix for u-boot/swig build issue | 13 | # fix for u-boot/swig build issue |
14 | HOSTTOOLS_NONFATAL += "x86_64-linux-gnu-gcc" | 14 | HOSTTOOLS_NONFATAL += "x86_64-linux-gnu-gcc" |
15 | |||
16 | IMAGE_INSTALL_append_sota = " virtual/network-configuration " | ||
diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass index 49aa298..5cbf4c0 100644 --- a/classes/sota_raspberrypi.bbclass +++ b/classes/sota_raspberrypi.bbclass | |||
@@ -3,6 +3,9 @@ RPI_USE_U_BOOT_sota = "1" | |||
3 | KERNEL_CLASSES_append_sota = " kernel-fitimage" | 3 | KERNEL_CLASSES_append_sota = " kernel-fitimage" |
4 | KERNEL_IMAGETYPE_sota = "fitImage" | 4 | KERNEL_IMAGETYPE_sota = "fitImage" |
5 | 5 | ||
6 | DEV_MATCH_DIRECTIVE_pn-networkd-dhcp-conf = "Driver=smsc95xx lan78xx" | ||
7 | IMAGE_INSTALL_append_sota = " virtual/network-configuration " | ||
8 | |||
6 | PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" | 9 | PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" |
7 | UBOOT_ENTRYPOINT_sota ?= "0x00008000" | 10 | UBOOT_ENTRYPOINT_sota ?= "0x00008000" |
8 | 11 | ||