keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

slinux.mk: Fix aarch64 build

Browse Source 
Mark some packages as x86 only.
This commit is contained in:
Mikhail Efremov 2019-09-20 15:24:20 +03:00 committed by Anton Midyukov
parent 1fbba5a47d
commit f3c0dc35b5
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf.d/slinux.mk
View File

@ -9,7 +9,10 @@ distro/slinux-live: distro/.livecd-install use/slinux/base
distro/slinux: distro/.installer use/slinux/full use/rescue/base
@$(call set,INSTALLER,simply-linux)
@$(call add,MAIN_GROUPS,slinux/dropbox slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/graphics-base slinux/graphics-full-blender slinux/graphics slinux/graphics-full-inkscape slinux/graphics-full-shotwell slinux/graphics-full-synfigstudio slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-pitivi slinux/multimedia-full-sound-juicer slinux/comm-base)
@$(call add,MAIN_GROUPS,slinux/dropbox slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/graphics-base slinux/graphics-full-blender slinux/graphics slinux/graphics-full-inkscape slinux/graphics-full-shotwell slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-pitivi slinux/multimedia-full-sound-juicer slinux/comm-base)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,MAIN_GROUPS, slinux/graphics-full-synfigstudio)
endif
@$(call set,META_VOL_ID,Simply Linux $(DISTRO_VERSION) $(ARCH))
@$(call set,META_APP_ID,Simply Linux $(DISTRO_VERSION) $(ARCH) $(shell date +%F))
endif

6
pkg.in/lists/slinux/emulators-full
View File

@ -4,9 +4,9 @@ libwine-vanilla-twain@i586
i586-wine-vanilla@x86_64
i586-libwine-vanilla-gl@x86_64
i586-libwine-vanilla-twain@x86_64
wine-mono
wine-mono@X86
i586-xorg-dri-.*@x86_64
cabextract
cabextract@X86
dosbox
#kernel-modules-virtualbox-@KERNEL@
virtualbox
virtualbox@X86

4
pkg.in/lists/slinux/not-install-full
View File

@ -7,8 +7,8 @@ i586-nvidia_glx_.*@x86_64
#i586-fglrx_glx@x86_64
# Bumblebee
bumblebee
#kernel-modules-bbswitch-@KERNEL_MOD@
bumblebee@X86
#kernel-modules-bbswitch-@KERNEL_MOD@@X86
# Proprietary blob
#citrix-client