summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/image.mk10
-rw-r--r--package/hush/files/config52
-rw-r--r--package/util-linux/Makefile6
-rw-r--r--package/weston/Makefile1
-rw-r--r--target/x86/Makefile2
-rw-r--r--target/x86_64/Makefile2
6 files changed, 41 insertions, 32 deletions
diff --git a/mk/image.mk b/mk/image.mk
index 405a2b2d5..35adc3ef6 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -164,9 +164,13 @@ ${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}/.adk
( \
echo "nod /dev/console 0644 0 0 c 5 1"; \
echo "nod /dev/tty 0644 0 0 c 5 0"; \
- for i in 0 1 2 3 4; do \
- echo "nod /dev/tty$$i 0644 0 0 c 4 $$$$i"; \
- done; \
+ echo "nod /dev/tty0 0644 0 0 c 4 0"; \
+ echo "nod /dev/tty1 0644 0 0 c 4 1"; \
+ echo "nod /dev/tty2 0644 0 0 c 4 2"; \
+ echo "nod /dev/tty3 0644 0 0 c 4 3"; \
+ echo "nod /dev/tty4 0644 0 0 c 4 4"; \
+ echo "nod /dev/tty5 0644 0 0 c 4 5"; \
+ echo "nod /dev/tty6 0644 0 0 c 4 6"; \
echo "nod /dev/null 0666 0 0 c 1 3"; \
echo "nod /dev/zero 0666 0 0 c 1 5"; \
echo "nod /dev/kmsg 0644 0 0 c 1 11"; \
diff --git a/package/hush/files/config b/package/hush/files/config
index 7e81b468e..a9d58aac4 100644
--- a/package/hush/files/config
+++ b/package/hush/files/config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.36.1
-# Thu Aug 31 12:09:53 2023
+# Wed Apr 9 19:47:50 2025
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -107,13 +107,13 @@ CONFIG_FEATURE_EDITING=y
CONFIG_FEATURE_EDITING_MAX_LEN=1024
# CONFIG_FEATURE_EDITING_VI is not set
CONFIG_FEATURE_EDITING_HISTORY=255
-CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
-CONFIG_FEATURE_REVERSE_SEARCH=y
-CONFIG_FEATURE_TAB_COMPLETION=y
-CONFIG_FEATURE_USERNAME_COMPLETION=y
-CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
-CONFIG_FEATURE_EDITING_WINCH=y
+# CONFIG_FEATURE_REVERSE_SEARCH is not set
+# CONFIG_FEATURE_TAB_COMPLETION is not set
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
+# CONFIG_FEATURE_EDITING_WINCH is not set
# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
# CONFIG_LOCALE_SUPPORT is not set
CONFIG_UNICODE_SUPPORT=y
@@ -1130,21 +1130,21 @@ CONFIG_BASH_IS_HUSH=y
# CONFIG_CTTYHACK is not set
CONFIG_HUSH=y
CONFIG_SHELL_HUSH=y
-CONFIG_HUSH_BASH_COMPAT=y
-CONFIG_HUSH_BRACE_EXPANSION=y
-CONFIG_HUSH_BASH_SOURCE_CURDIR=y
-CONFIG_HUSH_LINENO_VAR=y
+# CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_BRACE_EXPANSION is not set
+# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
+# CONFIG_HUSH_LINENO_VAR is not set
CONFIG_HUSH_INTERACTIVE=y
-CONFIG_HUSH_SAVEHISTORY=y
+# CONFIG_HUSH_SAVEHISTORY is not set
CONFIG_HUSH_JOB=y
-CONFIG_HUSH_TICK=y
-CONFIG_HUSH_IF=y
-CONFIG_HUSH_LOOPS=y
-CONFIG_HUSH_CASE=y
-CONFIG_HUSH_FUNCTIONS=y
-CONFIG_HUSH_LOCAL=y
-CONFIG_HUSH_RANDOM_SUPPORT=y
-CONFIG_HUSH_MODE_X=y
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
+# CONFIG_HUSH_MODE_X is not set
CONFIG_HUSH_ECHO=y
CONFIG_HUSH_PRINTF=y
CONFIG_HUSH_TEST=y
@@ -1169,15 +1169,15 @@ CONFIG_HUSH_GETOPTS=y
#
# Options common to all shells
#
-CONFIG_FEATURE_SH_MATH=y
-CONFIG_FEATURE_SH_MATH_64=y
-CONFIG_FEATURE_SH_MATH_BASE=y
+# CONFIG_FEATURE_SH_MATH is not set
+# CONFIG_FEATURE_SH_MATH_64 is not set
+# CONFIG_FEATURE_SH_MATH_BASE is not set
CONFIG_FEATURE_SH_EXTRA_QUIET=y
# CONFIG_FEATURE_SH_STANDALONE is not set
# CONFIG_FEATURE_SH_NOFORK is not set
-CONFIG_FEATURE_SH_READ_FRAC=y
-CONFIG_FEATURE_SH_HISTFILESIZE=y
-CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y
+# CONFIG_FEATURE_SH_READ_FRAC is not set
+# CONFIG_FEATURE_SH_HISTFILESIZE is not set
+# CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS is not set
#
# System Logging Utilities
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 06d320cb3..5e8f57851 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= util-linux
PKG_VERSION:= 2.40.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_HASH:= d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3
PKG_DESCR:= basic utilities
PKG_SECTION:= base/apps
@@ -162,8 +162,8 @@ mount-install:
$(INSTALL_BIN) $(WRKINST)/usr/bin/{u,}mount $(IDIR_MOUNT)/bin
mcookie-install:
- $(INSTALL_DIR) $(IDIR_MCOOKIE)/bin
- $(INSTALL_BIN) $(WRKINST)/usr/bin/mcookie $(IDIR_MCOOKIE)/bin
+ $(INSTALL_DIR) $(IDIR_MCOOKIE)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/mcookie $(IDIR_MCOOKIE)/usr/bin
libuuid-install:
$(INSTALL_DIR) $(IDIR_LIBUUID)/usr/lib
diff --git a/package/weston/Makefile b/package/weston/Makefile
index 205104b99..3355dd394 100644
--- a/package/weston/Makefile
+++ b/package/weston/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= wayland compositor
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= wayland libxkbcommon libinput libpng libjpeg-turbo libseat mesa libexpat
PKG_DEPENDS+= libwebp pam libxcursor libudev xkeyboard-config cairo libffi libdrm seatd
+PKG_DEPENDS+= libdisplay-info
PKG_BUILDDEP:= wayland wayland-protocols libxkbcommon libinput libpng libjpeg-turbo expat
PKG_BUILDDEP+= libwebp pam libXcursor eudev cairo libseat libffi libdrm libdisplay-info mesa
PKG_SITES:= https://gitlab.freedesktop.org/wayland/weston/-/releases/$(PKG_VERSION)/downloads/
diff --git a/target/x86/Makefile b/target/x86/Makefile
index d2283400c..9298c3cbb 100644
--- a/target/x86/Makefile
+++ b/target/x86/Makefile
@@ -13,7 +13,9 @@ QEMU_ARGS+=${ADK_QEMU_ARGS}
ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
QEMU_ARGS+=-net nic,model=virtio -net user
+ifeq ($(ADK_TARGET_FS),archive)
QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio
+endif
else
QEMU_ARGS+=-net user -net nic,model=e1000
endif
diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile
index 221311091..d9cb4ca62 100644
--- a/target/x86_64/Makefile
+++ b/target/x86_64/Makefile
@@ -18,7 +18,9 @@ endif
ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
QEMU_ARGS+=-net nic,model=virtio -net user
+ifeq ($(ADK_TARGET_FS),archive)
QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio
+endif
else
QEMU_ARGS+=-net user -net nic,model=e1000
endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-13 11:45:46 +0000