RHEL-5 patches: cf868ddc, a294b89
Bugzilla, upstream status, Brew build: N/A
The current RHEL6 tree lacks makefile magic to automatically do
brew/koji builds.
Also rh-* targets are not automatically forwarded to the Makefile
in the redhat directories. This patch fixes this two nits.
Please review and ack!
---
makefile | 6 ++++++
redhat/Makefile | 5 +++++
2 files changed, 11 insertions(+), 0 deletions(-)
create mode 100644 makefile
diff --git a/makefile b/makefile
new file mode 100644
index 0000000..d4f4474
--- /dev/null
+++ b/makefile
@@ -0,0 +1,6 @@
+ifeq ($(filter rh-%,$(MAKECMDGOALS)),)
+ include Makefile
+else
+%::
+ $(MAKE) -C redhat $(@)
+endif
diff --git a/redhat/Makefile b/redhat/Makefile
index 9bfa3c3..91d838f 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -104,3 +104,8 @@ rh-rpms: rh-sources
rh-prep: rh-sources
$(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --nodeps --target noarch -bp $(RPM)/SOURCES/kernel.spec
+.PHONY: rh-brew rh-koji
+rh-brew : BUILD_FLAGS ?= $(BREW_FLAGS)
+rh-koji : BUILD_FLAGS ?= $(KOJI_FLAGS)
+rh-brew rh-koji: rh-%: rh-srpm
+ $* build $(BUILD_FLAGS) $(BUILD_TARGET) $(SRPMS)/kernel-$(KVERSION)-$(RELEASE)$(DIST)$(BUILDID).src.rpm
--
1.6.2.5