stepchenkoas/mkimage-profiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into sisyphus

Browse Source
This commit is contained in:
Anton Midyukov 2023-12-09 22:28:30 +07:00
commit 416a6354fe
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
features.in/vmguest/config.mk
View File

@ -23,7 +23,7 @@ use/vmguest/kvm/dri: use/vmguest
use/vmguest/kvm/x11: use/vmguest/kvm use/vmguest/kvm/dri use/vmguest/kvm/x11: use/vmguest/kvm use/vmguest/kvm/dri
@$(call add,THE_PACKAGES,spice-vdagent xorg-drv-qxl xorg-drv-spiceqxl) @$(call add,THE_PACKAGES,spice-vdagent xorg-drv-qxl xorg-drv-spiceqxl)
else else
use/vmguest/kvm use/vmguest/kvm/x11: ; @: use/vmguest/kvm%: ; @:
endif endif
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@ -47,8 +47,5 @@ use/vmguest/vmware/x11: use/vmguest/vmware use/vmguest/vmware/dri
@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse) @$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
@$(call add,THE_PACKAGES,open-vm-tools-desktop) @$(call add,THE_PACKAGES,open-vm-tools-desktop)
else else
use/vmguest/vbox use/vmguest/vbox/x11 \ use/vmguest/vbox% use/vmguest/vmware%: ; @:
use/vmguest/vbox/dri \
use/vmguest/vmware/dri \
use/vmguest/vmware use/vmguest/vmware/x11: ; @:
endif endif

4
pkg.in/lists/tagged/base+regular
View File

@ -24,9 +24,7 @@ powertop@X86
pciutils pciutils
usbutils usbutils
acpi acpi
dmidecode@X86 dmidecode@X86,aarch64,loongarch64
dmidecode@aarch64
dmidecode@loongarch64
apt-repo apt-repo
apt-rsync apt-rsync