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
1
Issues
1
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
2af6d0be
Commit
2af6d0be
authored
Mar 27, 2017
by
Mikhail Efremov
Committed by
Michael Shigorin
Jul 16, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
image: Add DISTRO_VERSION variable support
Use it in the image filename, so we'll know what version of a distro it is.
parent
20dfef80
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
2 deletions
+16
-2
params.txt
doc/params.txt
+5
-0
Makefile
image.in/Makefile
+11
-2
No files found.
doc/params.txt
View file @
2af6d0be
...
...
@@ -60,6 +60,11 @@
** значение: пусто (по умолчанию), 1 или 2
** см. lib/log.mk, lib/clean.mk
* DISTRO_VERSION
** задаёт версию дистрибутива, если применимо
** значение: пусто (по умолчанию) либо любая строка
** см. image.in/Makefile
* HOMEPAGE, HOMENAME, HOMEWAIT
** указывают адрес, название и таймаут перехода для домашней страницы
** значение: корректный URL, строка, целое неотрицательное число
...
...
image.in/Makefile
View file @
2af6d0be
...
...
@@ -35,9 +35,15 @@ IMAGEDIR := $(wildcard $(IMAGEDIR))
# additional means to reduce havoc in IMAGEDIR
IMAGE_SORTDIR
:=
$
(
wildcard
$(SORTDIR)
)
# reconstruct instead of passing yet another variable
# use distro version in image name if defined
ifdef
DISTRO_VERSION
IMAGE_VERSION
:=
-
$(DISTRO_VERSION)
IMAGE_VER_LINK
:=
$(IMAGE_NAME)$(IMAGE_VERSION)
-latest-
$(ARCH)
.
$(IMAGE_TYPE)
endif
IMAGE_OUTFILE
:=
\
$(IMAGE_NAME)$(IMAGE_VERSION)
-
$(STATUS)$(DATE)
-
$(ARCH)
.
$(IMAGE_TYPE)
IMAGE_OUTDIR
:=
$(IMAGEDIR)
$
(
IMAGE_SORTDIR:%
=
/%
)
IMAGE_OUTFILE
:=
$(IMAGE_NAME)
-
$(STATUS)$(DATE)
-
$(ARCH)
.
$(IMAGE_TYPE)
IMAGE_OUTPATH
:=
$(IMAGE_OUTDIR)
/
$(IMAGE_OUTFILE)
IMAGE_RELPATH
:=
$
(
IMAGE_SORTDIR:%
=
%/
)
$(IMAGE_OUTFILE)
IMAGE_RELDIR
:=
$
(
IMAGE_OUTDIR:
$(GLOBAL_BUILDDIR)
/%
=
%
)
...
...
@@ -94,6 +100,9 @@ postprocess: | $(addprefix postprocess-,$(sort $(POSTPROCESS_TARGETS)))
ln
-sf
"
$(IMAGE_RELPATH)
"
"
$(IMAGE_LINKPATH)
"
&&
\
ln
-sf
"
$(IMAGE_RELDIR)
"
"
$(OUT_LINK)
"
&&
\
ln
-sf
"
$(IMAGE_LINK)
"
"
$(IMAGEDIR)
/
$(CURRENT_LINK)
.
$(IMAGE_TYPE)
"
;
\
if
[
-n
"
$(IMAGE_VER_LINK)
"
]
;
then
\
ln
-sf
"
$(IMAGE_RELPATH)
"
"
$(IMAGEDIR)
/
$(IMAGE_VER_LINK)
"
;
\
fi
;
\
if
[
-n
"
$(GLOBAL_DEBUG)
"
]
;
then
\
mkdir
-p
"
$(LOGDIR)
"
;
\
cp
-a
build.log
"
$(LOGDIR)
/
$(IMAGE_OUTFILE)
.log"
;
\
...
...
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