Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mkimage-profiles
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Anton Palgunov
mkimage-profiles
Commits
7fe69b72
Commit
7fe69b72
authored
Dec 27, 2021
by
Mikhail Efremov
Committed by
Anton Midyukov
Dec 28, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slinux: Use celluloid on aarch64 again
In preparation to change celluloid -> vlc for all aarch64, so we are not need to do this for tegra only. This reverts commit
b7354112
.
parent
9513eced
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
23 deletions
+8
-23
slinux.mk
conf.d/slinux.mk
+6
-18
config.mk
features.in/slinux/config.mk
+2
-5
No files found.
conf.d/slinux.mk
View file @
7fe69b72
...
@@ -21,17 +21,11 @@ endif
...
@@ -21,17 +21,11 @@ endif
endif
endif
ifeq (vm,$(IMAGE_CLASS))
ifeq (vm,$(IMAGE_CLASS))
vm/slinux:: use/slinux/vm-base use/auto-resize
vm/slinux:: use/slinux/vm-base use/auto-resize; @:
ifeq (,$(filter-out armh aarch64 mipsel e2k%,$(ARCH)))
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
else
@$(call add,THE_LISTS,slinux/multimedia-player-vlc)
endif
ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH)))
ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH)))
vm/slinux:: use/uboot
vm/slinux:: use/uboot
@$(call add,BASE_LISTS,uboot)
@$(call add,BASE_LISTS,uboot)
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
endif
endif
ifeq (,$(filter-out aarch64 armh,$(ARCH)))
ifeq (,$(filter-out aarch64 armh,$(ARCH)))
...
@@ -39,30 +33,24 @@ vm/slinux:: use/no-sleep use/arm-rpi4; @:
...
@@ -39,30 +33,24 @@ vm/slinux:: use/no-sleep use/arm-rpi4; @:
endif
endif
ifeq (,$(filter-out aarch64 armh,$(ARCH)))
ifeq (,$(filter-out aarch64 armh,$(ARCH)))
vm/slinux-rpi: use/slinux/vm-base use/arm-rpi4/full
vm/slinux-rpi: use/slinux/vm-base use/arm-rpi4/full; @:
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
endif
endif
ifeq (,$(filter-out aarch64,$(ARCH)))
ifeq (,$(filter-out aarch64,$(ARCH)))
vm/slinux-tegra: use/slinux/vm-base use/aarch64-tegra
vm/slinux-tegra: use/slinux/vm-base use/aarch64-tegra; @:
@$(call add,THE_LISTS,slinux/multimedia-player-vlc)
endif
endif
ifeq (,$(filter-out armh,$(ARCH)))
ifeq (,$(filter-out armh,$(ARCH)))
vm/slinux-mcom02: use/slinux/vm-base use/armh-mcom02/x11
vm/slinux-mcom02: use/slinux/vm-base use/armh-mcom02/x11; @:
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
endif
endif
ifeq (,$(filter-out mipsel,$(ARCH)))
ifeq (,$(filter-out mipsel,$(ARCH)))
vm/slinux::
vm/slinux::
@$(call add,THE_PACKAGES,installer-feature-bell-off-stage3)
@$(call add,THE_PACKAGES,installer-feature-bell-off-stage3)
@$(call add,THE_PACKAGES,xfce-reduced-resource)
@$(call add,THE_PACKAGES,xfce-reduced-resource)
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
vm/slinux-tavolga: vm/slinux use/mipsel-mitx/x11
vm/slinux-tavolga: vm/slinux use/mipsel-mitx/x11; @:
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
vm/slinux-bfk3: vm/slinux use/mipsel-bfk3/x11; @:
vm/slinux-bfk3: vm/slinux use/mipsel-bfk3/x11
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
endif
endif
endif
endif
features.in/slinux/config.mk
View file @
7fe69b72
...
@@ -78,8 +78,10 @@ use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \
...
@@ -78,8 +78,10 @@ use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \
@$(call add,THE_KMODULES,staging)
@$(call add,THE_KMODULES,staging)
ifeq (,$(filter-out armh aarch64 mipsel e2k%,$(ARCH)))
ifeq (,$(filter-out armh aarch64 mipsel e2k%,$(ARCH)))
@$(call add,THE_LISTS,slinux/browser-firefox)
@$(call add,THE_LISTS,slinux/browser-firefox)
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
else
else
@$(call add,THE_LISTS,slinux/browser-chromium)
@$(call add,THE_LISTS,slinux/browser-chromium)
@$(call add,THE_LISTS,slinux/multimedia-player-vlc)
endif
endif
ifeq (,$(filter-out riscv64,$(ARCH)))
ifeq (,$(filter-out riscv64,$(ARCH)))
@$(call add,THE_PACKAGES,abiword gnumeric)
@$(call add,THE_PACKAGES,abiword gnumeric)
...
@@ -107,11 +109,6 @@ use/slinux/base: use/isohybrid use/luks \
...
@@ -107,11 +109,6 @@ use/slinux/base: use/isohybrid use/luks \
@$(call add,LIVE_LISTS,slinux/live)
@$(call add,LIVE_LISTS,slinux/live)
@$(call add,BASE_PACKAGES,installer-distro-simply-linux-stage3)
@$(call add,BASE_PACKAGES,installer-distro-simply-linux-stage3)
@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
ifeq (,$(filter-out armh aarch64 mipsel e2k%,$(ARCH)))
@$(call add,THE_LISTS,slinux/multimedia-player-celluloid)
else
@$(call add,THE_LISTS,slinux/multimedia-player-vlc)
endif
use/slinux/full: use/slinux/base
use/slinux/full: use/slinux/base
@$(call add,MAIN_LISTS,slinux/not-install-full)
@$(call add,MAIN_LISTS,slinux/not-install-full)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment