Skip to content

Commit

Permalink
Add WSL2 support
Browse files Browse the repository at this point in the history
  • Loading branch information
olljanat committed Mar 2, 2023
1 parent 52bf2eb commit 2594ca4
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.dapper
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ENV SHELL /bin/bash
ENV ARTIFACTS /usr/src
WORKDIR ${DAPPER_SOURCE}

ENV BUILDROOT_VERSION 2022.02.8
ENV BUILDROOT_VERSION 2022.02.10
ENV TARBALL ${BUILDROOT_VERSION}.tar.gz
RUN cd ${ARTIFACTS} && \
wget https://github.com/buildroot/buildroot/archive/$TARBALL
Expand Down
14 changes: 8 additions & 6 deletions config/amd64/buildroot-config-static
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Buildroot 2022.02.8 Configuration
# Buildroot 2022.02.10 Configuration
#
BR2_HAVE_DOT_CONFIG=y
BR2_HOST_GCC_AT_LEAST_4_9=y
Expand Down Expand Up @@ -209,7 +209,7 @@ BR2_KERNEL_HEADERS_5_10=y
# BR2_KERNEL_HEADERS_VERSION is not set
# BR2_KERNEL_HEADERS_CUSTOM_TARBALL is not set
# BR2_KERNEL_HEADERS_CUSTOM_GIT is not set
BR2_DEFAULT_KERNEL_HEADERS="5.10.155"
BR2_DEFAULT_KERNEL_HEADERS="5.10.166"
BR2_PACKAGE_LINUX_HEADERS=y
BR2_PACKAGE_UCLIBC_ARCH_SUPPORTS=y
BR2_PACKAGE_UCLIBC_SUPPORTS=y
Expand Down Expand Up @@ -3567,10 +3567,7 @@ BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET=y
#
# qpdf needs a toolchain w/ C++, gcc >= 5
#

#
# rtl_433 needs a toolchain w/ dynamic library, threads
#
# BR2_PACKAGE_RTL_433 is not set

#
# shared-mime-info needs a toolchain w/ wchar, threads
Expand Down Expand Up @@ -4940,6 +4937,10 @@ BR2_PACKAGE_REFPOLICY_POLICY_VERSION=""
# BR2_PACKAGE_PYTHON_SCAPY3K is not set
# BR2_BINUTILS_VERSION_2_30_X is not set
# BR2_PACKAGE_RPI_USERLAND_START_VCFILED is not set
# BR2_PACKAGE_TI_SGX_KM_AM335X is not set
# BR2_PACKAGE_TI_SGX_KM_AM437X is not set
# BR2_PACKAGE_TI_SGX_KM_AM4430 is not set
# BR2_PACKAGE_TI_SGX_KM_AM5430 is not set

#
# Legacy options removed in 2019.11
Expand Down Expand Up @@ -5096,6 +5097,7 @@ BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS=""
#
# BR2_PACKAGE_MEDIAART_BACKEND_NONE is not set
# BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF is not set
# BR2_PACKAGE_MEDIAART_BACKEND_QT is not set
# BR2_PACKAGE_TI_SGX_AM335X is not set
# BR2_PACKAGE_TI_SGX_AM437X is not set
# BR2_PACKAGE_TI_SGX_AM4430 is not set
Expand Down
22 changes: 11 additions & 11 deletions config/busybox-dynamic.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.35.0
# Thu Jan 5 08:14:04 2023
# Thu Mar 2 19:38:06 2023
#
CONFIG_HAVE_DOT_CONFIG=y

Expand All @@ -12,7 +12,7 @@ CONFIG_HAVE_DOT_CONFIG=y
# CONFIG_EXTRA_COMPAT is not set
# CONFIG_FEDORA_COMPAT is not set
# CONFIG_INCLUDE_SUSv2 is not set
# CONFIG_LONG_OPTS is not set
CONFIG_LONG_OPTS=y
# CONFIG_SHOW_USAGE is not set
# CONFIG_FEATURE_VERBOSE_USAGE is not set
# CONFIG_FEATURE_COMPRESS_USAGE is not set
Expand Down Expand Up @@ -238,7 +238,7 @@ CONFIG_CRC32=y
# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set
CONFIG_ECHO=y
# CONFIG_FEATURE_FANCY_ECHO is not set
# CONFIG_ENV is not set
CONFIG_ENV=y
# CONFIG_EXPAND is not set
# CONFIG_UNEXPAND is not set
# CONFIG_EXPR is not set
Expand Down Expand Up @@ -294,7 +294,7 @@ CONFIG_MKDIR=y
# CONFIG_SEQ is not set
# CONFIG_SHRED is not set
# CONFIG_SHUF is not set
# CONFIG_SLEEP is not set
CONFIG_SLEEP=y
# CONFIG_FEATURE_FANCY_SLEEP is not set
# CONFIG_SORT is not set
# CONFIG_FEATURE_SORT_BIG is not set
Expand Down Expand Up @@ -460,7 +460,7 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0
# CONFIG_FEATURE_FIND_REGEX is not set
# CONFIG_FEATURE_FIND_CONTEXT is not set
# CONFIG_FEATURE_FIND_LINKS is not set
# CONFIG_GREP is not set
CONFIG_GREP=y
# CONFIG_EGREP is not set
# CONFIG_FGREP is not set
# CONFIG_FEATURE_GREP_CONTEXT is not set
Expand Down Expand Up @@ -689,7 +689,7 @@ CONFIG_MOUNT=y
# CONFIG_UEVENT is not set
# CONFIG_UMOUNT is not set
# CONFIG_FEATURE_UMOUNT_ALL is not set
# CONFIG_UNSHARE is not set
CONFIG_UNSHARE=y
# CONFIG_WALL is not set

#
Expand Down Expand Up @@ -1095,16 +1095,16 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
#
# Shells
#
# CONFIG_SH_IS_ASH is not set
CONFIG_SH_IS_ASH=y
# CONFIG_SH_IS_HUSH is not set
CONFIG_SH_IS_NONE=y
# CONFIG_SH_IS_NONE is not set
# CONFIG_BASH_IS_ASH is not set
# CONFIG_BASH_IS_HUSH is not set
CONFIG_BASH_IS_NONE=y
# CONFIG_SHELL_ASH is not set
CONFIG_SHELL_ASH=y
# CONFIG_ASH is not set
# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
# CONFIG_ASH_INTERNAL_GLOB is not set
CONFIG_ASH_INTERNAL_GLOB=y
# CONFIG_ASH_BASH_COMPAT is not set
# CONFIG_ASH_BASH_SOURCE_CURDIR is not set
# CONFIG_ASH_BASH_NOT_FOUND_HOOK is not set
Expand Down Expand Up @@ -1165,7 +1165,7 @@ CONFIG_BASH_IS_NONE=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 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 is not set
Expand Down
33 changes: 33 additions & 0 deletions scripts/package
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,37 @@ ln -s busybox usr/bin/mount
ln -s busybox usr/bin/echo
ln -s busybox usr/bin/mkdir

# for WSL2 support
mkdir etc
touch etc/fstab
echo "root:x:0:0:root:/:/bin/sh" > etc/passwd
cat << EOF > etc/profile
echo "Waiting that console container is ready"
until system-docker ps --filter name=console --format "{{.Names}}" 2> /dev/null | grep "console" > /dev/null
do
sleep 5
done
system-docker exec -it -u rancher console bash
exit 0
EOF
touch etc/resolv.conf
cat << EOF > etc/wsl.conf
[automount]
enabled = true
mountFsTab = false
[interop]
enabled = false
appendWindowsPath = false
[boot]
command = "/usr/bin/env -i /usr/bin/unshare --pid --mount-proc --fork --propagation private -- sh -c 'exec /usr/bin/init 2> /dev/console 1> /dev/console'"
EOF
mkdir bin
ln -s ../usr/bin/busybox bin/sh
ln -s busybox usr/bin/env
ln -s busybox usr/bin/grep
ln -s busybox usr/bin/sleep
ln -s busybox usr/bin/unshare

tar cvzf ../../dist/artifacts/os-initrd-base-${1}.tar.gz .

0 comments on commit 2594ca4

Please sign in to comment.