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
2
Issues
2
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
Ximper Linux
mkimage-profiles
Commits
6318d8f0
Commit
6318d8f0
authored
Dec 13, 2021
by
Anton Midyukov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mixin.mk, regular.mk: do not +power for regulars with systemd
parent
a028ee77
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
mixin.mk
conf.d/mixin.mk
+1
-1
regular.mk
conf.d/regular.mk
+4
-4
No files found.
conf.d/mixin.mk
View file @
6318d8f0
...
...
@@ -51,7 +51,7 @@ ifneq (,$(BRANCH))
endif
# common WM live/installer bits
mixin/regular-desktop: +alsa +
power +
nm-native \
mixin/regular-desktop: +alsa +nm-native \
use/x11/xorg use/xdg-user-dirs use/l10n \
use/fonts/otf/adobe use/fonts/otf/mozilla use/branding/notes
@$(call add,THE_PACKAGES,pam-limits-desktop beesu polkit dvd+rw-tools)
...
...
conf.d/regular.mk
View file @
6318d8f0
...
...
@@ -56,7 +56,7 @@ distro/.regular-desktop: distro/.regular-wm use/branding/full \
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
distro/.regular-desktop-sysv: distro/.regular-wm use/init/sysv/polkit; @:
distro/.regular-desktop-sysv: distro/.regular-wm use/init/sysv/polkit
+power
; @:
distro/.regular-gtk-sysv: distro/.regular-desktop-sysv \
use/syslinux/ui/gfxboot use/x11/gdm2.20; @:
...
...
@@ -74,7 +74,7 @@ distro/.regular-install: distro/.regular-base +installer \
distro/.regular-jeos-base: distro/.regular-bare \
use/isohybrid use/branding \
use/install2/repo use/install2/packages \
use/net/etcnet
use/power/acpi/button
use/net/etcnet
@$(call set,BOOTVGA,)
@$(call set,INSTALLER,altlinux-generic)
@$(call add,INSTALL2_BRANDING,alterator notes)
...
...
@@ -106,7 +106,7 @@ endif
# NB:
# - stock cleanup is not enough (or installer-common-stage3 deps soaring)
distro/regular-jeos-sysv: distro/.regular-jeos-full use/cleanup/jeos/full \
+sysvinit
+sysvinit
+power
@$(call add,BASE_PACKAGES,apt-conf-ignore-systemd)
distro/regular-jeos-systemd: distro/.regular-jeos-full \
...
...
@@ -167,7 +167,7 @@ distro/regular-lxde: distro/.regular-gtk mixin/regular-lxde; @:
distro/regular-mate: distro/.regular-gtk mixin/regular-mate; @:
distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment
+power
; @:
distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment; @:
distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @:
...
...
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