Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(rootfs): replace with BR2_ROOTFS_OVERLAY #24

Closed
wants to merge 2 commits into from
Closed

refactor(rootfs): replace with BR2_ROOTFS_OVERLAY #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24f85ae
refactor(rootfs): replace with BR2_ROOTFS_OVERLAY
Moskize91 Nov 2, 2023
2d51ec6
refactor(rootfs): add enter line
Moskize91 Nov 3, 2023
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
18 changes: 9 additions & 9 deletions arch/rootfs/amd64/.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ BR2_TARGET_TZ_INFO=y
BR2_TARGET_TZ_ZONELIST="default"
BR2_TARGET_LOCALTIME="PRC"
BR2_ROOTFS_USERS_TABLES=""
BR2_ROOTFS_OVERLAY=""
BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_OVERLAY)"
BR2_ROOTFS_PRE_BUILD_SCRIPT=""
BR2_ROOTFS_POST_BUILD_SCRIPT=""
BR2_ROOTFS_POST_FAKEROOT_SCRIPT=""
Expand Down Expand Up @@ -2502,35 +2502,35 @@ BR2_PACKAGE_SPICE_PROTOCOL=y
#

#
# Please note:
# Please note:
#

#
# - Buildroot does *not* generate binary packages,
# - Buildroot does *not* generate binary packages,
#

#
# - Buildroot does *not* install any package database.
# - Buildroot does *not* install any package database.
#

#
# *
# *
#

#
# It is up to you to provide those by yourself if you
# It is up to you to provide those by yourself if you
#

#
# want to use any of those package managers.
# want to use any of those package managers.
#

#
# *
# *
#

#
# See the manual:
# See the manual:
#

#
Expand Down
18 changes: 9 additions & 9 deletions arch/rootfs/arm64/.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ BR2_TARGET_TZ_INFO=y
BR2_TARGET_TZ_ZONELIST="default"
BR2_TARGET_LOCALTIME="PRC"
BR2_ROOTFS_USERS_TABLES=""
BR2_ROOTFS_OVERLAY=""
BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_OVERLAY)"
Moskize91 marked this conversation as resolved.
Show resolved Hide resolved
BR2_ROOTFS_PRE_BUILD_SCRIPT=""
BR2_ROOTFS_POST_BUILD_SCRIPT=""
BR2_ROOTFS_POST_FAKEROOT_SCRIPT=""
Expand Down Expand Up @@ -2512,35 +2512,35 @@ BR2_PACKAGE_SPICE_PROTOCOL=y
#

#
# Please note:
# Please note:
#

#
# - Buildroot does *not* generate binary packages,
# - Buildroot does *not* generate binary packages,
#

#
# - Buildroot does *not* install any package database.
# - Buildroot does *not* install any package database.
#

#
# *
# *
#

#
# It is up to you to provide those by yourself if you
# It is up to you to provide those by yourself if you
#

#
# want to use any of those package managers.
# want to use any of those package managers.
#

#
# *
# *
#

#
# See the manual:
# See the manual:
#

#
Expand Down
2 changes: 2 additions & 0 deletions board/overlay/etc/wsl.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[boot]
systemd=true
1 change: 1 addition & 0 deletions board/overlay/external.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
name: OVM_EXTERNAL_OVERLAY
12 changes: 0 additions & 12 deletions patches/rootfs/feat_package_add_gvforwader.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,6 @@ index 0000000000000000000000000000000000000000..e15daddd7b7572d6713534412d4ec0e3
+ $(INSTALL) -D -m 755 $(@D)/bin/vm $(TARGET_DIR)/usr/bin/gvforwarder
+ $(INSTALL) -D -m 644 $(GVFORWARDER_PKGDIR)/systemd/gvforwader.service \
+ $(TARGET_DIR)/etc/systemd/system/
+
+ $(INSTALL) -D -m 644 $(GVFORWARDER_PKGDIR)/wsl.conf \
+ $(TARGET_DIR)/etc/wsl.conf
+endef
+
+$(eval $(golang-package))
Expand All @@ -105,12 +102,3 @@ index 0000000000000000000000000000000000000000..9ce72adac13560b2bdc4d9562a2532cb
+[Install]
+WantedBy=default.target
\ No newline at end of file
diff --git a/package/gvforwarder/wsl.conf b/package/gvforwarder/wsl.conf
new file mode 100644
index 0000000000000000000000000000000000000000..c55b3816c41dcc897aac69dad9893030db26d7e0
--- /dev/null
+++ b/package/gvforwarder/wsl.conf
@@ -0,0 +1,2 @@
+[boot]
+systemd=true
\ No newline at end of file