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
c350d6b8
Commit
c350d6b8
authored
May 10, 2023
by
Anton Midyukov
Browse files
Options
Browse Files
Download
Plain Diff
Merge tag 'v1.5.5' into sisyphus
v1.5.5
parents
5ffa07d8
d8adee34
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletion
+14
-1
live.mk
conf.d/live.mk
+1
-0
config.mk
features.in/browser/config.mk
+4
-1
config.mk
features.in/install2/config.mk
+9
-0
No files found.
conf.d/live.mk
View file @
c350d6b8
...
@@ -31,6 +31,7 @@ ifeq (,$(filter-out i586 x86_64,$(ARCH)))
...
@@ -31,6 +31,7 @@ ifeq (,$(filter-out i586 x86_64,$(ARCH)))
endif
endif
@$(call set,KFLAVOURS,un-def std-def)
@$(call set,KFLAVOURS,un-def std-def)
@$(call set,GRUB_DEFAULT,network)
@$(call set,GRUB_DEFAULT,network)
@$(call set,LOCALES,en_US ru_RU pt_BR)
endif
endif
distro/rescue: distro/.base use/rescue use/syslinux/ui/menu use/stage2/cifs \
distro/rescue: distro/.base use/rescue use/syslinux/ui/menu use/stage2/cifs \
...
...
features.in/browser/config.mk
View file @
c350d6b8
...
@@ -34,10 +34,13 @@ endif
...
@@ -34,10 +34,13 @@ endif
# support both firefox and firefox-esr
# support both firefox and firefox-esr
use/browser/firefox: use/browser
use/browser/firefox: use/browser
ifeq (,$(filter-out i586,$(ARCH)))
@$(call set,FX_FLAVOUR,-esr)
endif
@$(call set,THE_BROWSER,firefox$$(FX_FLAVOUR))
@$(call set,THE_BROWSER,firefox$$(FX_FLAVOUR))
# the complete lack of dependencies is intentional
# the complete lack of dependencies is intentional
use/browser/firefox/esr:
use/browser/firefox/esr:
; @:
ifneq (,$(filter-out riscv64,$(ARCH)))
ifneq (,$(filter-out riscv64,$(ARCH)))
@$(call set,FX_FLAVOUR,-esr)
@$(call set,FX_FLAVOUR,-esr)
endif
endif
...
...
features.in/install2/config.mk
View file @
c350d6b8
...
@@ -24,11 +24,20 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
...
@@ -24,11 +24,20 @@ use/install2: use/stage2 sub/stage2@install2 use/metadata \
# doesn't use/install2/fs on purpose (at least so far)
# doesn't use/install2/fs on purpose (at least so far)
use/install2/full: \
use/install2/full: \
use/install2/packages use/install2/vmguest use/install2/tools \
use/install2/packages use/install2/vmguest use/install2/tools \
use/install2/lvm use/install2/cryptsetup \
use/syslinux/localboot.cfg use/grub/localboot_bios.cfg \
use/syslinux/localboot.cfg use/grub/localboot_bios.cfg \
use/syslinux/ui/menu use/bootloader
use/syslinux/ui/menu use/bootloader
@$(call add,INSTALL2_PACKAGES,xorg-drv-synaptics)
@$(call add,INSTALL2_PACKAGES,xorg-drv-synaptics)
@$(call add,INSTALL2_PACKAGES,xorg-drv-libinput)
@$(call add,INSTALL2_PACKAGES,xorg-drv-libinput)
use/install2/lvm: use/install2
@$(call add,INSTALL2_PACKAGES,lvm2)
@$(call add,BASE_PACKAGES,lvm2)
use/install2/cryptsetup: use/install2
@$(call add,INSTALL2_PACKAGES,cryptsetup)
@$(call add,BASE_PACKAGES,cryptsetup)
# for distributions with their own -stage3 installer part
# for distributions with their own -stage3 installer part
use/install2/stage3: use/install2
use/install2/stage3: use/install2
@$(call add,BASE_PACKAGES,installer-$$(INSTALLER)-stage3)
@$(call add,BASE_PACKAGES,installer-$$(INSTALLER)-stage3)
...
...
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