Richard AlpeandJoachim Wiberg f56ca0d0ca confd: fix json merging when generating factory config ...

jq -s 'add' didn't merge data, i.e.:

hostname.json:
"ietf-system:system": {
  "hostname": { }
}

auth.json:
"ietf-system:system": {
  "authentication": { }
}

Didn't become:
"ietf-system:system": {
  "authentication": { }
  "hostname": { }
}

Signed-off-by: Richard Alpe <richard@bit42.se>

2023-05-25 08:24:31 +02:00

..

dev-key

common: Generate a new dev cert with a distant expiry date

2023-02-28 11:00:15 +01:00

rootfs

confd: fix json merging when generating factory config

2023-05-25 08:24:31 +02:00

uboot

common: Prettify output from Infix extensions to the build system

2023-03-13 09:57:04 +01:00

busybox_defconfig

configs: switch from ifupdown2 to ifupdown-ng

2023-01-19 18:09:26 +01:00

common.mk

rauc: Initial support

2023-03-13 14:46:37 +01:00

Config.in

Simplify and refine NETCONF and Classic build variants

2023-04-27 09:59:35 +02:00

genimage.cfg

common: Use plain SquashFS images on disk

2023-03-13 09:55:16 +01:00

genimage.cfg.in

common: Unify disk image generation across aarch64 and amd64

2023-03-13 09:57:03 +01:00

lib.sh

common: Mark output from Infix shell scripts similarly to Make

2023-03-13 09:57:04 +01:00

mkdisk.sh

Rename amd64 -> x86_64 and native -> classic

2023-04-27 09:59:35 +02:00

mkfit.sh

Roll out final product branding

2022-12-05 21:09:05 +01:00

mkgns3a.sh

board/common: artifact naming overhaul

2023-04-28 18:18:16 +02:00

mkmmc.sh

common: Use plain SquashFS images on disk

2023-03-13 09:55:16 +01:00

mkrauc.sh

board/common: artifact naming overhaul

2023-04-28 18:18:16 +02:00

post-build.sh

board/common: allow /bin/bash as login shell (BusyBox symlink)

2023-04-28 19:00:51 +02:00

post-image.sh

board/common: for consistency, preserve x86_64 even in filenames

2023-04-29 12:47:30 +02:00

rauc-hooks.sh

rauc: Initial support

2023-03-13 14:46:37 +01:00

rootfs.its

common: Use plain SquashFS images on disk

2023-03-13 09:55:16 +01:00

sign.sh

common: Use plain SquashFS images on disk

2023-03-13 09:55:16 +01:00

xattrs

configs: split defconfigs in default (NETCONF) and simplificed (native)

2023-04-27 09:59:35 +02:00