Skip to content

Commit 85ee76b

Browse files
troglobittroglobit
committed
Fix system container build
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
1 parent a1a4c3d commit 85ee76b

File tree

6 files changed

+4
-4
lines changed

6 files changed

+4
-4
lines changed

board/httpd/rootfs/etc/httpd.conf renamed to board/common/rootfs/etc/httpd.conf

File renamed without changes.

board/httpd/rootfs/var/www/index.html renamed to board/common/rootfs/var/www/index.html

File renamed without changes.

‎configs/httpd_amd64_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to curiOS"
1010
BR2_INIT_NONE=y
1111
# BR2_TARGET_GENERIC_GETTY is not set
1212
# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
13-
BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CURIOS_PATH)/board/httpd/rootfs"
13+
BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CURIOS_PATH)/board/common/rootfs $(BR2_EXTERNAL_CURIOS_PATH)/board/httpd/rootfs"
1414
BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_CURIOS_PATH)/board/common/post-build.sh"
1515
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_CURIOS_PATH)/board/common/post-image.sh"
1616
BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_CURIOS_PATH}/board/httpd/busybox_defconfig"

‎configs/httpd_arm64_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to curiOS"
1111
BR2_INIT_NONE=y
1212
# BR2_TARGET_GENERIC_GETTY is not set
1313
# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
14-
BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CURIOS_PATH)/board/httpd/rootfs"
14+
BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CURIOS_PATH)/board/common/rootfs $(BR2_EXTERNAL_CURIOS_PATH)/board/httpd/rootfs"
1515
BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_CURIOS_PATH)/board/common/post-build.sh"
1616
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_CURIOS_PATH)/board/common/post-image.sh"
1717
BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_CURIOS_PATH}/board/httpd/busybox_defconfig"

‎configs/system_amd64_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ BR2_TARGET_GENERIC_HOSTNAME="curiOS"
99
BR2_TARGET_GENERIC_ISSUE="Welcome to curiOS"
1010
# BR2_TARGET_GENERIC_GETTY is not set
1111
# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
12-
BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CURIOS_PATH)/board/common/rootfs $(BR2_EXTERNAL_CURIOS_PATH)/board/httpd/rootfs $(BR2_EXTERNAL_CURIOS_PATH)/board/nftables/rootfs $(BR2_EXTERNAL_CURIOS_PATH)/board/system/rootfs"
12+
BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CURIOS_PATH)/board/common/rootfs $(BR2_EXTERNAL_CURIOS_PATH)/board/nftables/rootfs $(BR2_EXTERNAL_CURIOS_PATH)/board/system/rootfs"
1313
BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_CURIOS_PATH)/board/common/post-build.sh"
1414
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_CURIOS_PATH)/board/common/post-image.sh"
1515
BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_CURIOS_PATH)/board/system/busybox_defconfig"

‎configs/system_arm64_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ BR2_TARGET_GENERIC_HOSTNAME="curiOS"
1010
BR2_TARGET_GENERIC_ISSUE="Welcome to curiOS"
1111
# BR2_TARGET_GENERIC_GETTY is not set
1212
# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
13-
BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CURIOS_PATH)/board/common/rootfs $(BR2_EXTERNAL_CURIOS_PATH)/board/httpd/rootfs $(BR2_EXTERNAL_CURIOS_PATH)/board/nftables/rootfs $(BR2_EXTERNAL_CURIOS_PATH)/board/system/rootfs"
13+
BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_CURIOS_PATH)/board/common/rootfs $(BR2_EXTERNAL_CURIOS_PATH)/board/nftables/rootfs $(BR2_EXTERNAL_CURIOS_PATH)/board/system/rootfs"
1414
BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_CURIOS_PATH)/board/common/post-build.sh"
1515
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_CURIOS_PATH)/board/common/post-image.sh"
1616
BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_CURIOS_PATH)/board/system/busybox_defconfig"

0 commit comments

Comments
 (0)