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
Ximper Linux
mkimage-profiles
Commits
d5f71b37
You need to sign in or sign up before continuing.
Commit
d5f71b37
authored
Feb 15, 2018
by
Michael Shigorin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
image.in, build-*: generalize SUBDIRS
This is a fix to previous failures of ve/vm + use/repo/main build attempts (in fact, any non-distro/ targets). SUBDIRS were just optimized away...
parent
9441c1ce
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
6 deletions
+8
-6
90-build-distro.mk
features.in/build-distro/lib/90-build-distro.mk
+0
-4
90-build-ve.mk
features.in/build-ve/lib/90-build-ve.mk
+2
-1
90-build-vm.mk
features.in/build-vm/lib/90-build-vm.mk
+2
-1
Makefile
image.in/Makefile
+4
-0
No files found.
features.in/build-distro/lib/90-build-distro.mk
View file @
d5f71b37
# step 4: build the distribution image
# step 4: build the distribution image
# take the latter part for complex-specified subprofiles like stage2@live;
# care to exclude non-directories holding no makefiles like rootfs
SUBDIRS = $(sort $(dir $(wildcard $(addsuffix /Makefile,$(SUBPROFILE_DIRS)))))
# proxy over the ISO metadata collected; see also genisoimagerc(5)
# proxy over the ISO metadata collected; see also genisoimagerc(5)
BOOT_SYSI := $(META_SYSTEM_ID)
BOOT_SYSI := $(META_SYSTEM_ID)
BOOT_PUBL := $(META_PUBLISHER)
BOOT_PUBL := $(META_PUBLISHER)
...
...
features.in/build-ve/lib/90-build-ve.mk
View file @
d5f71b37
...
@@ -20,5 +20,6 @@ IMAGE_PACKAGES = $(DOT_BASE) \
...
@@ -20,5 +20,6 @@ IMAGE_PACKAGES = $(DOT_BASE) \
IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
$(BASE_PACKAGES_REGEXP)
$(BASE_PACKAGES_REGEXP)
all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
all: $(GLOBAL_DEBUG) \
build-image copy-subdirs copy-tree run-image-scripts pack-image \
postprocess $(GLOBAL_CLEAN_WORKDIR)
postprocess $(GLOBAL_CLEAN_WORKDIR)
features.in/build-vm/lib/90-build-vm.mk
View file @
d5f71b37
...
@@ -55,5 +55,6 @@ run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
...
@@ -55,5 +55,6 @@ run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
# override
# override
pack-image: MKI_PACK_RESULTS := tar:$(VM_TARBALL)
pack-image: MKI_PACK_RESULTS := tar:$(VM_TARBALL)
all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
all: $(GLOBAL_DEBUG) \
build-image copy-subdirs copy-tree run-image-scripts pack-image \
convert-image postprocess $(GLOBAL_CLEAN_WORKDIR)
convert-image postprocess $(GLOBAL_CLEAN_WORKDIR)
image.in/Makefile
View file @
d5f71b37
...
@@ -56,6 +56,10 @@ CLEANUP_OUTDIR ?=
...
@@ -56,6 +56,10 @@ CLEANUP_OUTDIR ?=
GLOBAL_TARGET
:=
$(ARCH)
GLOBAL_TARGET
:=
$(ARCH)
GLOBAL_HSH_APT_CONFIG
:=
$
(
wildcard
$(APTCONF)
)
GLOBAL_HSH_APT_CONFIG
:=
$
(
wildcard
$(APTCONF)
)
# take the latter part for complex-specified subprofiles like stage2@live;
# care to exclude non-directories holding no makefiles like rootfs
SUBDIRS
=
$
(
sort
$
(
dir
$
(
wildcard
$
(
addsuffix /Makefile,
$(SUBPROFILE_DIRS)
))))
# the lib/build-*.mk comes from features.in/build-*/lib
# the lib/build-*.mk comes from features.in/build-*/lib
include
$(sort
$(wildcard
lib/*.mk))
include
$(sort
$(wildcard
lib/*.mk))
include
$(MKIMAGE_PREFIX)/targets.mk
include
$(MKIMAGE_PREFIX)/targets.mk
...
...
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