Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make prepare-chroot-dom0 depend on builder.conf #210

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

Rudd-O
Copy link
Contributor

@Rudd-O Rudd-O commented Dec 27, 2023

What is not done is actually blow away the existing chroot. This is likely to require some rework, but at least the target is phony now.

What is not done is actually blow away the existing chroot.  This is likely to require some rework, but at least the target is phony now.
@@ -241,14 +241,17 @@ check-depend.dpkg:
{ echo "ERROR: call 'make install-deps' to install missing dependencies"; exit 1; }
check-depend: check-depend.$(PKG_MANAGER)

prepare-chroot-dom0:
chroot-dom0-$(DIST_DOM0): builder.conf
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be $(BUILDERCONF)

ifneq ($(DIST_DOM0),)
${Q}if [ "$(VERBOSE)" -eq 0 ]; then \
$(MAKE) --no-print-directory DIST=$(DIST_DOM0) PACKAGE_SET=dom0 -f Makefile.generic prepare-chroot > build-logs/chroot-dom0-$$DIST.log 2>&1 || exit 1;
else \
$(MAKE) --no-print-directory DIST=$(DIST_DOM0) PACKAGE_SET=dom0 -f Makefile.generic prepare-chroot || exit 1;
fi
fi ; \
touch chroot-dom0-$(DIST_DOM0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make will be unhappy about indentation with spaces

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants