Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ jobs:
hi3516cv6xx) boot_kib=256 env_kib=64 read_kib=2048 ;;
hi3519dv500) boot_kib=512 env_kib=256 read_kib=6144 ;;
ssc325|ssc333|ssc335|ssc335de|ssc337|ssc337de) boot_kib=256 env_kib=64 read_kib=2048 ;;
ssc377|ssc377d|ssc377de|ssc377qe|ssc378de|ssc378qe) boot_kib=256 env_kib=64 read_kib=2048 ;;
*) echo "::error::create_split: no NOR boot area known for $1"; return 1 ;;
esac
}
Expand Down
20 changes: 20 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,26 @@ prepare:
sed -i 's|^HOST_CXXFLAGS += \$$(HOST_CFLAGS)$$|HOST_CXXFLAGS += $$(filter-out -std=%,$$(HOST_CFLAGS))|' \
$(TARGET)/buildroot-$(BR_VER)/package/Makefile.in; \
fi
@# Build host-tar without POSIX ACLs. Its configure finds the build host's
@# libacl on its own, and acl 2.4.0 declares acl_get_file_at(),
@# acl_set_file_at() and acl_delete_def_file_at() in <sys/acl.h>, with an
@# at_flags argument. tar 1.34's src/xattrs.c defines static wrappers of
@# the same names and different types, so host-tar stops with "conflicting
@# types for 'acl_get_file_at'", and with it every build from a fresh output
@# directory. Buildroot already builds the target tar --without-posix-acls
@# unless BR2_PACKAGE_ACL is set. The host tar only packs archives here and
@# needs no ACL support, and the wrappers sit under HAVE_POSIX_ACLS.
@# The flag goes in as its own `+=` line ahead of the host package's eval,
@# so it does not depend on how tar.mk spells HOST_TAR_CONF_OPTS; and if a
@# Buildroot bump moves that eval, prepare says so instead of leaving
@# host-tar to fail with the original error.
@if test -f $(TARGET)/buildroot-$(BR_VER)/package/tar/tar.mk; then \
tarmk=$(TARGET)/buildroot-$(BR_VER)/package/tar/tar.mk; \
grep -q '^HOST_TAR_CONF_OPTS += --without-posix-acls$$' $$tarmk || \
sed -i 's|^\$$(eval \$$(host-autotools-package))$$|HOST_TAR_CONF_OPTS += --without-posix-acls\n&|' $$tarmk; \
grep -q '^HOST_TAR_CONF_OPTS += --without-posix-acls$$' $$tarmk || { \
echo "prepare: could not add --without-posix-acls to host-tar in $$tarmk" >&2; exit 1; }; \
fi

help:
@printf "BR-OpenIPC usage:\n \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -944,6 +944,7 @@ CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_OF_PARTS is not set
# CONFIG_MTD_AFS_PARTS is not set
# CONFIG_MTD_REDBOOT_PARTS is not set
CONFIG_MTD_SPLIT_LAYOUT=y
# end of Partition parsers

#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -944,6 +944,7 @@ CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_OF_PARTS is not set
# CONFIG_MTD_AFS_PARTS is not set
# CONFIG_MTD_REDBOOT_PARTS is not set
CONFIG_MTD_SPLIT_LAYOUT=y
# end of Partition parsers

#
Expand Down
2 changes: 2 additions & 0 deletions br-ext-chip-sigmastar/configs/ssc377_lite_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,5 @@ BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6C=y
BR2_PACKAGE_VTUND_OPENIPC=y
BR2_PACKAGE_YAML_CLI=y
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_GENERAL_PATH)/scripts/post-image-split.sh"
BR2_OPENIPC_NOR_FIXED_PACKAGE=y
2 changes: 2 additions & 0 deletions br-ext-chip-sigmastar/configs/ssc377d_lite_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,5 @@ BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6C=y
BR2_PACKAGE_VTUND_OPENIPC=y
BR2_PACKAGE_YAML_CLI=y
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_GENERAL_PATH)/scripts/post-image-split.sh"
BR2_OPENIPC_NOR_FIXED_PACKAGE=y
2 changes: 2 additions & 0 deletions br-ext-chip-sigmastar/configs/ssc377de_lite_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,5 @@ BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6C=y
BR2_PACKAGE_VTUND_OPENIPC=y
BR2_PACKAGE_YAML_CLI=y
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_GENERAL_PATH)/scripts/post-image-split.sh"
BR2_OPENIPC_NOR_FIXED_PACKAGE=y
2 changes: 2 additions & 0 deletions br-ext-chip-sigmastar/configs/ssc377qe_lite_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,5 @@ BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6C=y
BR2_PACKAGE_VTUND_OPENIPC=y
BR2_PACKAGE_YAML_CLI=y
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_GENERAL_PATH)/scripts/post-image-split.sh"
BR2_OPENIPC_NOR_FIXED_PACKAGE=y
2 changes: 2 additions & 0 deletions br-ext-chip-sigmastar/configs/ssc378de_lite_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,5 @@ BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6C=y
BR2_PACKAGE_VTUND_OPENIPC=y
BR2_PACKAGE_YAML_CLI=y
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_GENERAL_PATH)/scripts/post-image-split.sh"
BR2_OPENIPC_NOR_FIXED_PACKAGE=y
2 changes: 2 additions & 0 deletions br-ext-chip-sigmastar/configs/ssc378qe_lite_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,5 @@ BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6C=y
BR2_PACKAGE_VTUND_OPENIPC=y
BR2_PACKAGE_YAML_CLI=y
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_GENERAL_PATH)/scripts/post-image-split.sh"
BR2_OPENIPC_NOR_FIXED_PACKAGE=y
Loading