keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

docs update

Browse Source 
Another minor facelift:
- s/ALT Linux/ALT/gc (where applicable);
- s/7.0/8.0/g;
- 2017;
- e2k;
- links.
This commit is contained in:
Michael Shigorin 2017-06-09 19:31:42 +03:00
parent 0b2da1ab8f
commit 31ecda7272
8 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
QUICKSTART
View File

@ -3,7 +3,7 @@ http://en.altlinux.org/Hasher; large tmpfs helps a lot).
требуется требуется
~~~~~~~~~ ~~~~~~~~~
- ALT Linux 7.0 или выше (возможна адаптация "вниз") - ALT 8.0 или выше (возможна адаптация "вниз", см. ветки)
- установленный mkimage (свежий, как и hasher) - установленный mkimage (свежий, как и hasher)
- пользователь с правом запуска hasher и подключения /proc к нему - пользователь с правом запуска 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/mkimage
- http://www.altlinux.org/m-p - http://www.altlinux.org/m-p
- http://www.altlinux.org/m-p-howto ("как поправить под себя") - http://www.altlinux.org/m-p-howto ("как поправить под себя")
- http://www.altlinux.org/starterkits/builder (сборочный LiveCD)

2
doc/assumptions.txt
View File

@ -4,7 +4,7 @@
других частей mkimage-profiles либо содержание переменных. других частей mkimage-profiles либо содержание переменных.
NB: пути приводятся от верхнего уровня; проект в целом предполагает NB: пути приводятся от верхнего уровня; проект в целом предполагает
ALT Linux 7.0+ и GNU make 3.82+ (на которых и разрабатывается), наличие ALT 8.0+ и GNU make 3.82+ (на которых и разрабатывается),
но может быть портирован вместе с mkimage. Если что-либо не работает но может быть портирован вместе с mkimage. Если что-либо не работает
или не собирается, стоит проверить на Sisyphus (mkimage, make, hasher, или не собирается, стоит проверить на Sisyphus (mkimage, make, hasher,
собственно пакетная база), поскольку именно на нём происходит основная собственно пакетная база), поскольку именно на нём происходит основная

12
doc/mkimage-profiles.7.in
View File

@ -16,16 +16,16 @@
.\" along with this program; if not, write to the Free Software .\" along with this program; if not, write to the Free Software
.\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. .\" 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" .SH "NAME"
mkimage-profiles \- ALT Linux distribution family metaprofile mkimage-profiles \- ALT distribution family metaprofile
.SH "SYNOPSIS" .SH "SYNOPSIS"
.B make .B make
.IR "" [ options ] .IR "" [ options ]
.I "" [ <goal> ... ] .I "" [ <goal> ... ]
.SH "DESCRIPTION" .SH "DESCRIPTION"
.BR mkimage-profiles .BR mkimage-profiles
builds operating environment images based on ALT Linux package repositories. builds operating environment images based on ALT package repositories.
Run Run
.BR make\ help .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 Long time ago when Linux distribution images were worked upon by hand
there was little need for generalization and sharing the common base. 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 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 to describe what's common and what's different in a way that doesn't
resemble more or less complete forks. 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 and add what's missing, or roll on your own using the rich library
of existing parts and bits. of existing parts and bits.
.SH "REQUIREMENTS" .SH "REQUIREMENTS"
The next-generation image build system for ALT Linux must: The next-generation image build system for ALT must:
.TP .TP
1. 1.
provide reasonable means to describe common/differing aspects within provide reasonable means to describe common/differing aspects within
@ -108,7 +108,7 @@ Report bugs to http://bugzilla.altlinux.org
.br .br
(Sisyphus project, mkimage-profiles component). (Sisyphus project, mkimage-profiles component).
.SH "COPYRIGHT" .SH "COPYRIGHT"
Copyright \(co) 2010-2016 Michael Shigorin <mike@altlinux.org> Copyright \(co) 2010-2017 Michael Shigorin <mike@altlinux.org>
.br .br
This is free software; see the source for copying conditions. This is free software; see the source for copying conditions.
There is NO WARRANTY; not even for MERCHANTABILITY or There is NO WARRANTY; not even for MERCHANTABILITY or

2
doc/params.txt
View File

@ -10,7 +10,7 @@
* ARCH * ARCH
** задаёт целевую архитектуру образов ** задаёт целевую архитектуру образов
** значение: пусто (по умолчанию авто), i586, x86_64, arm, ppc ** значение: пусто (по умолчанию авто), i586, x86_64, arm, ppc, e2k
** см. lib/build.mk ** см. lib/build.mk
* ARCHES * ARCHES

2
features.in/dev/live/image-scripts.d/51-hasher
View File

@ -73,7 +73,7 @@ alias m='cd /usr/share/mkimage-profiles'
clear clear
cat << EOH cat << EOH
Welcome to live builder environment! 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}gear${gray}(1) -- see ${cyan}http://en.altlinux.org/gear${gray};
* ${white}hsh${gray}(1) -- see ${cyan}http://en.altlinux.org/hasher${gray}; * ${white}hsh${gray}(1) -- see ${cyan}http://en.altlinux.org/hasher${gray};
* ${white}mkimage${gray} -- see ${cyan}http://en.altlinux.org/mkimage${gray}; * ${white}mkimage${gray} -- see ${cyan}http://en.altlinux.org/mkimage${gray};

2
features.in/install2/install2/image-scripts.d/10-bootloader
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/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/" \ sed -ri "s/^(grub|lilo)$/$GLOBAL_BASE_BOOTLOADER/" \
/usr/share/install2/installer-steps /usr/share/install2/installer-steps

4
features.in/live/generate.mk
View File

@ -5,11 +5,11 @@ ifdef BUILDDIR
include $(BUILDDIR)/distcfg.mk include $(BUILDDIR)/distcfg.mk
ifndef HOMEPAGE ifndef HOMEPAGE
HOMEPAGE = http://wiki.altlinux.org/ HOMEPAGE = http://altlinux.org/
endif endif
ifndef HOMENAME ifndef HOMENAME
HOMENAME = ALT Linux HOMENAME = ALT
endif endif
ifndef HOMEWAIT ifndef HOMEWAIT

2
sub.in/stage1/Makefile
View File

@ -30,7 +30,7 @@ GLOBAL_STAGE1_KFLAVOUR := $(STAGE1_KFLAVOUR)
CHROOT_PACKAGES_REGEXP := $(call kpackages, \ CHROOT_PACKAGES_REGEXP := $(call kpackages, \
$(STAGE1_KFLAVOUR),$(STAGE1_KMODULES_REGEXP)) $(STAGE1_KFLAVOUR),$(STAGE1_KMODULES_REGEXP))
ifneq "$(findstring stage2,$(SUBPROFILES))" "" ### assumes stage2 ~ propagator ifneq "$(findstring stage2,$(SUBPROFILES))" "" ### assumes stage2 ~ propagator
PROPAGATOR_VERSION = ALT Linux PROPAGATOR_VERSION = ALT
PROPAGATOR_MAR_MODULES = ./modules PROPAGATOR_MAR_MODULES = ./modules
PROPAGATOR_INITFS = ./initfs PROPAGATOR_INITFS = ./initfs
BUILD_PROPAGATOR = prepare-modules build-propagator BUILD_PROPAGATOR = prepare-modules build-propagator