diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index 91e6e085..cff5cddf 100644 --- a/configs/aarch64_defconfig +++ b/configs/aarch64_defconfig @@ -142,6 +142,7 @@ BR2_PACKAGE_IITO=y BR2_PACKAGE_K8S_LOGGER=y BR2_PACKAGE_KEYACK=y BR2_PACKAGE_KLISH_PLUGIN_INFIX=y +BR2_PACKAGE_LANDING=y BR2_PACKAGE_LOWDOWN=y BR2_PACKAGE_MCD=y BR2_PACKAGE_MDNS_ALIAS=y diff --git a/configs/r2s_defconfig b/configs/r2s_defconfig index 9fa864a5..b363b47b 100644 --- a/configs/r2s_defconfig +++ b/configs/r2s_defconfig @@ -171,6 +171,7 @@ BR2_PACKAGE_IITO=y BR2_PACKAGE_K8S_LOGGER=y BR2_PACKAGE_KEYACK=y BR2_PACKAGE_KLISH_PLUGIN_INFIX=y +BR2_PACKAGE_LANDING=y BR2_PACKAGE_LOWDOWN=y BR2_PACKAGE_MCD=y BR2_PACKAGE_MDNS_ALIAS=y diff --git a/configs/x86_64_defconfig b/configs/x86_64_defconfig index 86d8b455..4bd01e31 100644 --- a/configs/x86_64_defconfig +++ b/configs/x86_64_defconfig @@ -145,6 +145,7 @@ BR2_PACKAGE_IITO=y BR2_PACKAGE_K8S_LOGGER=y BR2_PACKAGE_KEYACK=y BR2_PACKAGE_KLISH_PLUGIN_INFIX=y +BR2_PACKAGE_LANDING=y BR2_PACKAGE_LOWDOWN=y BR2_PACKAGE_MCD=y BR2_PACKAGE_MDNS_ALIAS=y diff --git a/package/Config.in b/package/Config.in index 6c8333dd..f5b89777 100644 --- a/package/Config.in +++ b/package/Config.in @@ -5,6 +5,7 @@ source "$BR2_EXTERNAL_INFIX_PATH/package/statd/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/factory/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/faux/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/finit/Config.in" +source "$BR2_EXTERNAL_INFIX_PATH/package/greenpak-programmer/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/ifupdown-ng/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/iito/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/k8s-logger/Config.in" @@ -12,13 +13,13 @@ source "$BR2_EXTERNAL_INFIX_PATH/package/keyack/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/klish-plugin-infix/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/klish/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/klish-plugin-sysrepo/Config.in" -source "$BR2_EXTERNAL_INFIX_PATH/package/python-statd/Config.in" +source "$BR2_EXTERNAL_INFIX_PATH/package/landing/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/libsrx/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/lowdown/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/mcd/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/mdns-alias/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/netbrowse/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/podman/Config.in" +source "$BR2_EXTERNAL_INFIX_PATH/package/python-statd/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/skeleton-init-finit/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/tetris/Config.in" -source "$BR2_EXTERNAL_INFIX_PATH/package/greenpak-programmer/Config.in" diff --git a/package/landing/Config.in b/package/landing/Config.in new file mode 100644 index 00000000..bddbfea5 --- /dev/null +++ b/package/landing/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LANDING + bool "Landing page (temporary)" + help + Temporary landing page before upcoming webui. + + https://github.com/kernelkit/infix diff --git a/package/landing/landing.hash b/package/landing/landing.hash new file mode 100644 index 00000000..beca753f --- /dev/null +++ b/package/landing/landing.hash @@ -0,0 +1 @@ +sha256 fff5e150e496c6bb6035ae388ee13cf2d0df842335e5145a4b902ef6b7892088 LICENSE diff --git a/package/landing/landing.mk b/package/landing/landing.mk new file mode 100644 index 00000000..92de7142 --- /dev/null +++ b/package/landing/landing.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# landing +# +################################################################################ + +LANDING_VERSION = 1.0 +LANDING_SITE_METHOD = local +LANDING_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/landing +LANDING_LICENSE = ISC +LANDING_LICENSE_FILES = LICENSE + +define LANDING_INSTALL_TARGET_CMDS + cp $(@D)/*.html $(TARGET_DIR)/usr/html/ + cp $(@D)/*.png $(TARGET_DIR)/usr/html/ +endef + +$(eval $(generic-package)) diff --git a/board/common/rootfs/usr/html/50x.html b/src/landing/50x.html similarity index 100% rename from board/common/rootfs/usr/html/50x.html rename to src/landing/50x.html diff --git a/src/landing/LICENSE b/src/landing/LICENSE new file mode 100644 index 00000000..65e3295d --- /dev/null +++ b/src/landing/LICENSE @@ -0,0 +1,14 @@ +Copyright (c) 2024 The KernelKit Authors + +Permission to use, copy, modify, and/or distribute this software for any purpose +with or without fee is hereby granted, provided that the above copyright notice +and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. + diff --git a/src/landing/README.md b/src/landing/README.md new file mode 100644 index 00000000..44a2a2d4 --- /dev/null +++ b/src/landing/README.md @@ -0,0 +1,7 @@ +Default Landing Page for Infix +============================== + +This is a temporary landing page for the Infix web interface pending the +upcoming RESTCONF based WebUI application. + +Use `gen.sh` to update `index.html` from the top-level project README.md diff --git a/board/common/rootfs/usr/html/gen.sh b/src/landing/gen.sh similarity index 100% rename from board/common/rootfs/usr/html/gen.sh rename to src/landing/gen.sh diff --git a/board/common/rootfs/usr/html/hpstr-template.html b/src/landing/hpstr-template.html similarity index 100% rename from board/common/rootfs/usr/html/hpstr-template.html rename to src/landing/hpstr-template.html diff --git a/board/common/rootfs/usr/html/index.html b/src/landing/index.html similarity index 100% rename from board/common/rootfs/usr/html/index.html rename to src/landing/index.html diff --git a/board/common/rootfs/usr/html/logo.png b/src/landing/logo.png similarity index 100% rename from board/common/rootfs/usr/html/logo.png rename to src/landing/logo.png diff --git a/board/common/rootfs/usr/html/ttyd.png b/src/landing/ttyd.png similarity index 100% rename from board/common/rootfs/usr/html/ttyd.png rename to src/landing/ttyd.png