Skip to content

M
mkimage-profiles
Commit fdcbb380 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

regular.mk: do not add glibc-locales to jeos for branch newer than p10

glibc-core contains C.UTF-8 locale in new branches.
parent 733507dc
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
conf.d/regular.mk
View file @ fdcbb380
...@@ -83,13 +83,16 @@ distro/.regular-jeos-base: distro/.regular-bare +efi \ ...@@ -83,13 +83,16 @@ distro/.regular-jeos-base: distro/.regular-bare +efi \
@$(call add,BASE_PACKAGES,installer-common-stage3) @$(call add,BASE_PACKAGES,installer-common-stage3)
@$(call add,LIVE_PACKAGES,alterator-net-functions) # for run scripts from installer-common-stage3 @$(call add,LIVE_PACKAGES,alterator-net-functions) # for run scripts from installer-common-stage3
@$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console su agetty) @$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console su agetty)
@$(call add,THE_PACKAGES,glibc-locales tzdata) @$(call add,THE_PACKAGES,tzdata)
@$(call add,BASE_PACKAGES,make-initrd-lvm make-initrd-mdadm cpio) @$(call add,BASE_PACKAGES,make-initrd-lvm make-initrd-mdadm cpio)
@$(call add,BASE_LISTS,openssh) @$(call add,BASE_LISTS,openssh)
@$(call add,THE_PACKAGES,fdisk) @$(call add,THE_PACKAGES,fdisk)
@$(call add,THE_PACKAGES,btrfs-progs) @$(call add,THE_PACKAGES,btrfs-progs)
@$(call set,LOCALES,en_US ru_RU) @$(call set,LOCALES,en_US ru_RU)
@$(call set,DISABLE_LANG_MENU,1) @$(call set,DISABLE_LANG_MENU,1)
ifeq (,$(filter-out p10,$(BRANCH)))
@$(call add,THE_PACKAGES,glibc-locales)
endif
distro/.regular-jeos: distro/.regular-jeos-base use/cleanup \ distro/.regular-jeos: distro/.regular-jeos-base use/cleanup \
use/volumes/regular use/ntp/chrony use/net/etcnet \ use/volumes/regular use/ntp/chrony use/net/etcnet \
......
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