diff --git a/QUICKSTART b/QUICKSTART index 12c11fd2..931b10b1 100644 --- a/QUICKSTART +++ b/QUICKSTART @@ -3,7 +3,7 @@ http://en.altlinux.org/Hasher; large tmpfs helps a lot). требуется ~~~~~~~~~ -- ALT Linux 7.0 или выше (возможна адаптация "вниз") +- ALT 8.0 или выше (возможна адаптация "вниз", см. ветки) - установленный mkimage (свежий, как и hasher) - пользователь с правом запуска hasher и подключения /proc к нему @@ -51,3 +51,4 @@ $ make ARCH=i586 APTCONF=~/apt/apt.conf.i586 REPORT=1 ve/generic.tar - http://www.altlinux.org/mkimage - http://www.altlinux.org/m-p - http://www.altlinux.org/m-p-howto ("как поправить под себя") +- http://www.altlinux.org/starterkits/builder (сборочный LiveCD) diff --git a/doc/assumptions.txt b/doc/assumptions.txt index 0cb97823..96b168eb 100644 --- a/doc/assumptions.txt +++ b/doc/assumptions.txt @@ -4,7 +4,7 @@ других частей mkimage-profiles либо содержание переменных. NB: пути приводятся от верхнего уровня; проект в целом предполагает -ALT Linux 7.0+ и GNU make 3.82+ (на которых и разрабатывается), +наличие ALT 8.0+ и GNU make 3.82+ (на которых и разрабатывается), но может быть портирован вместе с mkimage. Если что-либо не работает или не собирается, стоит проверить на Sisyphus (mkimage, make, hasher, собственно пакетная база), поскольку именно на нём происходит основная diff --git a/doc/mkimage-profiles.7.in b/doc/mkimage-profiles.7.in index 5a2154fc..96e1e902 100644 --- a/doc/mkimage-profiles.7.in +++ b/doc/mkimage-profiles.7.in @@ -16,16 +16,16 @@ .\" along with this program; if not, write to the Free Software .\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. .\" -.TH "MKIMAGE-PROFILES" "7" "February 2016" "mkimage-profiles @VERSION@" "ALT Linux" +.TH "MKIMAGE-PROFILES" "9" "June 2017" "mkimage-profiles @VERSION@" "ALT" .SH "NAME" -mkimage-profiles \- ALT Linux distribution family metaprofile +mkimage-profiles \- ALT distribution family metaprofile .SH "SYNOPSIS" .B make .IR "" [ options ] .I "" [ ... ] .SH "DESCRIPTION" .BR mkimage-profiles -builds operating environment images based on ALT Linux package repositories. +builds operating environment images based on ALT package repositories. Run .BR make\ help @@ -50,7 +50,7 @@ can be used to obtain build dependency graphs. Long time ago when Linux distribution images were worked upon by hand there was little need for generalization and sharing the common base. -Building several "generic" ALT Linux distros in a team and maintaining +Building several "generic" ALT{, Linux} distros in a team and maintaining their educational flavours at the same time proved the need to be able to describe what's common and what's different in a way that doesn't resemble more or less complete forks. @@ -59,7 +59,7 @@ Enter mkimage-profiles: choose what's closest to your dream image and add what's missing, or roll on your own using the rich library of existing parts and bits. .SH "REQUIREMENTS" -The next-generation image build system for ALT Linux must: +The next-generation image build system for ALT must: .TP 1. provide reasonable means to describe common/differing aspects within @@ -108,7 +108,7 @@ Report bugs to http://bugzilla.altlinux.org .br (Sisyphus project, mkimage-profiles component). .SH "COPYRIGHT" -Copyright \(co) 2010-2016 Michael Shigorin +Copyright \(co) 2010-2017 Michael Shigorin .br This is free software; see the source for copying conditions. There is NO WARRANTY; not even for MERCHANTABILITY or diff --git a/doc/params.txt b/doc/params.txt index aeb7662d..62a14a70 100644 --- a/doc/params.txt +++ b/doc/params.txt @@ -10,7 +10,7 @@ * ARCH ** задаёт целевую архитектуру образов -** значение: пусто (по умолчанию авто), i586, x86_64, arm, ppc +** значение: пусто (по умолчанию авто), i586, x86_64, arm, ppc, e2k ** см. lib/build.mk * ARCHES diff --git a/features.in/dev/live/image-scripts.d/51-hasher b/features.in/dev/live/image-scripts.d/51-hasher index 8f3ef49d..39021894 100755 --- a/features.in/dev/live/image-scripts.d/51-hasher +++ b/features.in/dev/live/image-scripts.d/51-hasher @@ -73,7 +73,7 @@ alias m='cd /usr/share/mkimage-profiles' clear cat << EOH Welcome to live builder environment! -Here are some ALT Linux package/image build tools prepared for you: +Here are some ALT package/image build tools prepared for you: * ${white}gear${gray}(1) -- see ${cyan}http://en.altlinux.org/gear${gray}; * ${white}hsh${gray}(1) -- see ${cyan}http://en.altlinux.org/hasher${gray}; * ${white}mkimage${gray} -- see ${cyan}http://en.altlinux.org/mkimage${gray}; diff --git a/features.in/install2/install2/image-scripts.d/10-bootloader b/features.in/install2/install2/image-scripts.d/10-bootloader index 533771bf..c69a0d59 100755 --- a/features.in/install2/install2/image-scripts.d/10-bootloader +++ b/features.in/install2/install2/image-scripts.d/10-bootloader @@ -1,5 +1,5 @@ #!/bin/sh -# NB: grub is currently the default in ALT Linux +# NB: grub is currently the default in ALT sed -ri "s/^(grub|lilo)$/$GLOBAL_BASE_BOOTLOADER/" \ /usr/share/install2/installer-steps diff --git a/features.in/live/generate.mk b/features.in/live/generate.mk index 53c7701f..f59a201c 100644 --- a/features.in/live/generate.mk +++ b/features.in/live/generate.mk @@ -5,11 +5,11 @@ ifdef BUILDDIR include $(BUILDDIR)/distcfg.mk ifndef HOMEPAGE -HOMEPAGE = http://wiki.altlinux.org/ +HOMEPAGE = http://altlinux.org/ endif ifndef HOMENAME -HOMENAME = ALT Linux +HOMENAME = ALT endif ifndef HOMEWAIT diff --git a/sub.in/stage1/Makefile b/sub.in/stage1/Makefile index 0ac5d316..112c9533 100644 --- a/sub.in/stage1/Makefile +++ b/sub.in/stage1/Makefile @@ -30,7 +30,7 @@ GLOBAL_STAGE1_KFLAVOUR := $(STAGE1_KFLAVOUR) CHROOT_PACKAGES_REGEXP := $(call kpackages, \ $(STAGE1_KFLAVOUR),$(STAGE1_KMODULES_REGEXP)) ifneq "$(findstring stage2,$(SUBPROFILES))" "" ### assumes stage2 ~ propagator -PROPAGATOR_VERSION = ALT Linux +PROPAGATOR_VERSION = ALT PROPAGATOR_MAR_MODULES = ./modules PROPAGATOR_INITFS = ./initfs BUILD_PROPAGATOR = prepare-modules build-propagator