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
c20e820a
Commit
c20e820a
authored
Apr 25, 2012
by
Michael Shigorin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
features.in: generalize lib/ handling
From now on, subprofiles can include the lib/*.mk brought in by features just like image.in/ long did.
parent
57d31b9c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
3 deletions
+7
-3
Makefile
features.in/Makefile
+1
-3
Makefile
sub.in/main/Makefile
+2
-0
Makefile
sub.in/stage1/Makefile
+2
-0
Makefile
sub.in/stage2/Makefile
+2
-0
No files found.
features.in/Makefile
View file @
c20e820a
...
@@ -65,11 +65,9 @@ $(FEATURES):
...
@@ -65,11 +65,9 @@ $(FEATURES):
for
sub
in
/
$(SUBPROFILES)
;
do
\
for
sub
in
/
$(SUBPROFILES)
;
do
\
dirtags
=
;
\
dirtags
=
;
\
if
[
"
$$
sub"
=
/
]
;
then
\
if
[
"
$$
sub"
=
/
]
;
then
\
parts
=
lib
;
\
srcdirs
=
"."
;
\
srcdirs
=
"."
;
\
dst
=
"."
;
\
dst
=
"."
;
\
else
\
else
\
parts
=
;
\
src
=
"
$$
{sub%/*}"
;
\
src
=
"
$$
{sub%/*}"
;
\
dst
=
"
$$
{sub#*/}"
;
\
dst
=
"
$$
{sub#*/}"
;
\
srcdirs
=
;
\
srcdirs
=
;
\
...
@@ -92,7 +90,7 @@ $(FEATURES):
...
@@ -92,7 +90,7 @@ $(FEATURES):
for
srcdir
in
$$
srcdirs
;
do
\
for
srcdir
in
$$
srcdirs
;
do
\
[
-d
"
$$
srcdir"
]
||
continue
;
\
[
-d
"
$$
srcdir"
]
||
continue
;
\
pushd
"
$$
srcdir"
>
&/dev/null
;
\
pushd
"
$$
srcdir"
>
&/dev/null
;
\
for
part
in
$$
parts
{
image-,
}
scripts.d
;
do
\
for
part
in
lib
{
image-,
}
scripts.d
;
do
\
destdir
=
"
$(BUILDDIR)
/
$$
dst/
$$
part"
;
\
destdir
=
"
$(BUILDDIR)
/
$$
dst/
$$
part"
;
\
[
-d
"
$$
destdir"
]
||
continue
;
\
[
-d
"
$$
destdir"
]
||
continue
;
\
if
[
"
$$
sub"
=
/
-a
-d
"
$$
part"
]
;
then
\
if
[
"
$$
sub"
=
/
-a
-d
"
$$
part"
]
;
then
\
...
...
sub.in/main/Makefile
View file @
c20e820a
...
@@ -28,6 +28,8 @@ IMAGE_PACKAGES = $(call map,list, \
...
@@ -28,6 +28,8 @@ IMAGE_PACKAGES = $(call map,list, \
$(SYSTEM_PACKAGES)
$(COMMON_PACKAGES)
\
$(SYSTEM_PACKAGES)
$(COMMON_PACKAGES)
\
$(THE_PACKAGES)
$(BASE_PACKAGES)
$(MAIN_PACKAGES)
$(THE_PACKAGES)
$(BASE_PACKAGES)
$(MAIN_PACKAGES)
-include
lib/*.mk
MKI_DESTDIR
=
ALTLinux/RPMS.main
MKI_DESTDIR
=
ALTLinux/RPMS.main
MKI_PACK_RESULTS
=
data
MKI_PACK_RESULTS
=
data
...
...
sub.in/stage1/Makefile
View file @
c20e820a
...
@@ -41,6 +41,8 @@ CHROOT_PACKAGES = $(STAGE1_PACKAGES) $(SYSTEM_PACKAGES)
...
@@ -41,6 +41,8 @@ CHROOT_PACKAGES = $(STAGE1_PACKAGES) $(SYSTEM_PACKAGES)
# pass for use/stage2
# pass for use/stage2
GLOBAL_SQUASHFS
:=
$(SQUASHFS)
GLOBAL_SQUASHFS
:=
$(SQUASHFS)
-include
lib/*.mk
# scripts prepare bootloader configuration, too
# scripts prepare bootloader configuration, too
# NB: we pass tested squashfs options for ../stage2/Makefile to include
# NB: we pass tested squashfs options for ../stage2/Makefile to include
all
:
| debug prepare-workdir copy-tree run-scripts $(BUILD_PROPAGATOR)
\
all
:
| debug prepare-workdir copy-tree run-scripts $(BUILD_PROPAGATOR)
\
...
...
sub.in/stage2/Makefile
View file @
c20e820a
...
@@ -36,6 +36,8 @@ IMAGE_PACKAGES_REGEXP += $(call kpackages, \
...
@@ -36,6 +36,8 @@ IMAGE_PACKAGES_REGEXP += $(call kpackages, \
$(STAGE1_KMODULES)
$(STAGE2_KMODULES)
,
\
$(STAGE1_KMODULES)
$(STAGE2_KMODULES)
,
\
$(STAGE1_KFLAVOUR)
)
$(STAGE1_KFLAVOUR)
)
-include
lib/*.mk
# see also scripts.d/99-elf-stats
# see also scripts.d/99-elf-stats
ifdef
GLOBAL_SQUASHFS_SORT
ifdef
GLOBAL_SQUASHFS_SORT
ifeq
(tight,$(SQUASHFS))
ifeq
(tight,$(SQUASHFS))
...
...
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