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
0a8490ad
Commit
0a8490ad
authored
Oct 21, 2011
by
Michael Shigorin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
logging tweaks for better readability
...and create a symlink to a just-built image from builddir too.
parent
77115ff5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
5 deletions
+17
-5
Makefile
features.in/Makefile
+1
-1
Makefile
image.in/Makefile
+3
-1
profile.mk
lib/profile.mk
+13
-3
No files found.
features.in/Makefile
View file @
0a8490ad
...
@@ -66,7 +66,7 @@ all:
...
@@ -66,7 +66,7 @@ all:
else
\
else
\
the
=
"toplevel"
;
\
the
=
"toplevel"
;
\
fi
&&
\
fi
&&
\
git commit
-qam
"
$$
feat feature
(
$$
the part)
"
;
\
git commit
-qam
"
$$
feat feature
:
$$
the part added
"
;
\
popd
;
\
popd
;
\
fi
;
\
fi
;
\
done
;
\
done
;
\
...
...
image.in/Makefile
View file @
0a8490ad
# stage 4: dive into mkimage
# stage 4: dive into mkimage
GLOBAL_BUILDDIR
?=
$(
shell
pwd
)
GLOBAL_BUILDDIR
?=
$(
shell
pwd
)
LINKPREFIX
:=
mkimage-profiles
include
distcfg.mk
include
distcfg.mk
include
functions.mk
include
functions.mk
...
@@ -39,7 +40,8 @@ postprocess:
...
@@ -39,7 +40,8 @@ postprocess:
@
OUTPATH
=
"
$(IMAGEDIR)
/
$(IMAGE_OUTFILE)
"
;
\
@
OUTPATH
=
"
$(IMAGEDIR)
/
$(IMAGE_OUTFILE)
"
;
\
echo
"** image:
$(IMAGE_OUTFILE)
"
&&
\
echo
"** image:
$(IMAGE_OUTFILE)
"
&&
\
ln
-sf
"
$(IMAGE_OUTFILE)
"
"
$(IMAGEDIR)
/
$(IMAGE_FILE)
"
&&
\
ln
-sf
"
$(IMAGE_OUTFILE)
"
"
$(IMAGEDIR)
/
$(IMAGE_FILE)
"
&&
\
ln
-sf
"
$(IMAGE_FILE)
"
"
$(IMAGEDIR)
/mkimage-profiles.
$(IMAGE_TYPE)
"
;
\
ln
-sf
"
$(IMAGE_FILE)
"
"
$(IMAGEDIR)
/
$(LINKPREFIX)
.
$(IMAGE_TYPE)
"
;
\
ln
-sf
"
$$
OUTPATH"
"
$(IMAGE_FILE)
"
;
\
if
[
-n
"
$(GLOBAL_DEBUG)
"
]
;
then
\
if
[
-n
"
$(GLOBAL_DEBUG)
"
]
;
then
\
cp
-a
build.log
"
$$
OUTPATH.log"
;
\
cp
-a
build.log
"
$$
OUTPATH.log"
;
\
cp
-a
distcfg.mk
"
$$
OUTPATH.cfg"
;
\
cp
-a
distcfg.mk
"
$$
OUTPATH.cfg"
;
\
...
...
lib/profile.mk
View file @
0a8490ad
...
@@ -41,11 +41,11 @@ profile/init: distclean
...
@@ -41,11 +41,11 @@ profile/init: distclean
echo; \
echo; \
} $(LOG)
} $(LOG)
@mkdir "$(BUILDDIR)"/.mki # mkimage toplevel marker
@mkdir "$(BUILDDIR)"/.mki # mkimage toplevel marker
@type -t git >&/dev/null && \
@if type -t git >&/dev/null && cd $(BUILDDIR); then \
cd $(BUILDDIR) && \
git init -q && \
git init -q && \
git add . && \
git add . && \
git commit -qam 'distribution profile initialized'
git commit -qam 'derivative profile initialized'; \
fi
@rm -f "$(SYMLINK)" && \
@rm -f "$(SYMLINK)" && \
if [ -w . ]; then \
if [ -w . ]; then \
ln -sf "$(BUILDDIR)" "$(SYMLINK)" && \
ln -sf "$(BUILDDIR)" "$(SYMLINK)" && \
...
@@ -61,10 +61,20 @@ profile/bare: profile/init
...
@@ -61,10 +61,20 @@ profile/bare: profile/init
@$(call try,IMAGEDIR,$(IMAGEDIR))
@$(call try,IMAGEDIR,$(IMAGEDIR))
@$(call try,BRANDING,altlinux-sisyphus)
@$(call try,BRANDING,altlinux-sisyphus)
@$(call set,IMAGE_INIT_LIST,+branding-$$(BRANDING)-release)
@$(call set,IMAGE_INIT_LIST,+branding-$$(BRANDING)-release)
@if type -t git >&/dev/null && cd $(BUILDDIR); then \
git init -q && \
git add . && \
git commit -qam 'image configuration defaults set'; \
fi
profile/finalize:
profile/finalize:
@if [ -s $(RC) ]; then $(call put,-include $(RC)); fi
@if [ -s $(RC) ]; then $(call put,-include $(RC)); fi
@$(call put,endif)
@$(call put,endif)
@if type -t git >&/dev/null && cd $(BUILDDIR); then \
git init -q && \
git add . && \
git commit -qam 'image configuration finalized'; \
fi
# requires already formed distcfg.mk for useful output
# requires already formed distcfg.mk for useful output
profile/dump-vars:
profile/dump-vars:
...
...
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