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
d367f042
Commit
d367f042
authored
Oct 29, 2021
by
Michael Shigorin
Committed by
Anton Midyukov
Nov 23, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
1 changed file
with
8 additions
and
0 deletions
+8
-0
education.mk
conf.d/education.mk
+8
-0
No files found.
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))
...
...
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