Skip to content

M
mkimage-profiles
Commit d367f042 authored by Michael Shigorin's avatar Michael Shigorin Committed by Anton Midyukov
Browse files
Options

education.mk: soft-revert java11 commit

It was encumbered, it's only java11 part that should be archdep as e2k-alt-linux lacks that one so far. See-also: 8f0f5f7d
parent 6c0e779e
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
conf.d/education.mk
View file @ d367f042
...@@ -17,7 +17,11 @@ mixin/education: \ ...@@ -17,7 +17,11 @@ mixin/education: \
@$(call add,THE_BRANDING,menu xfce-settings system-settings) @$(call add,THE_BRANDING,menu xfce-settings system-settings)
@$(call add,THE_LISTS,slinux/xfce-base) @$(call add,THE_LISTS,slinux/xfce-base)
@$(call add,THE_LISTS,education/misc) @$(call add,THE_LISTS,education/misc)
ifeq (,$(filter-out e2k%,$(ARCH)))
@$(call add,THE_PACKAGES,jre)
else
@$(call add,THE_PACKAGES,java-11-openjdk) @$(call add,THE_PACKAGES,java-11-openjdk)
endif
@$(call add,THE_PACKAGES,thunderbird) @$(call add,THE_PACKAGES,thunderbird)
@$(call add,THE_LISTS,$(call tags,base l10n)) @$(call add,THE_LISTS,$(call tags,base l10n))
@$(call add,BASE_LISTS,workstation/3rdparty) @$(call add,BASE_LISTS,workstation/3rdparty)
...@@ -38,7 +42,11 @@ ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH))) ...@@ -38,7 +42,11 @@ ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
endif endif
@$(call add,LIVE_PACKAGES,mc-full) @$(call add,LIVE_PACKAGES,mc-full)
@$(call add,LIVE_PACKAGES,remmina remmina-plugins) @$(call add,LIVE_PACKAGES,remmina remmina-plugins)
ifeq (,$(filter-out e2k%,$(ARCH)))
@$(call add,LIVE_PACKAGES,jre)
else
@$(call add,LIVE_PACKAGES,java-11-openjdk) @$(call add,LIVE_PACKAGES,java-11-openjdk)
endif
@$(call add,LIVE_PACKAGES,xorg-conf-libinput-touchpad) @$(call add,LIVE_PACKAGES,xorg-conf-libinput-touchpad)
@$(call add,LIVE_LISTS,$(call tags,base rescue)) @$(call add,LIVE_LISTS,$(call tags,base rescue))
@$(call add,LIVE_LISTS,$(call tags,base extra)) @$(call add,LIVE_LISTS,$(call tags,base extra))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment