External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-23 11:55:04 -02:30
Code Issues Packages Projects Releases Wiki Activity

Propagate necessary build changes from devel

Browse Source
This commit is contained in:
James Laska
2015-10-01 12:06:01 -04:00
parent d7fb9b19b1
commit 949f4cb15d
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@@ -68,12 +68,14 @@ DEBUILD_BIN ?= debuild
DEBUILD_OPTS = --source-option="-I" DEBUILD_OPTS = --source-option="-I"
DPUT_BIN ?= dput DPUT_BIN ?= dput
DPUT_OPTS ?= -c .dput.cf -u DPUT_OPTS ?= -c .dput.cf -u
REPREPRO_BIN ?= reprepro
REPREPRO_OPTS ?= -b reprepro --export=force
DEB_DIST ?=
ifeq ($(OFFICIAL),yes) ifeq ($(OFFICIAL),yes)
DEB_DIST ?= stable
# Sign official builds # Sign official builds
DEBUILD_OPTS += -k$(GPG_KEY) DEBUILD_OPTS += -k$(GPG_KEY)
REPREPRO_OPTS += --ask-passphrase
else else
DEB_DIST ?= unstable
# Do not sign development builds # Do not sign development builds
DEBUILD_OPTS += -uc -us DEBUILD_OPTS += -uc -us
endif endif
@@ -194,6 +196,13 @@ clean: clean-rpm clean-deb clean-grunt clean-ui clean-tar clean-packer clean-bun
rm -rf build $(NAME)-$(VERSION) *.egg-info rm -rf build $(NAME)-$(VERSION) *.egg-info
find . -type f -regex ".*\.py[co]$$" -delete find . -type f -regex ".*\.py[co]$$" -delete
# convenience target to assert environment variables are defined
guard-%:
@if [ "${${*}}" == "" ]; then \
echo "The required environment variable '$*' is not set"; \
exit 1; \
fi
# Fetch from origin, rebase local commits on top of origin commits. # Fetch from origin, rebase local commits on top of origin commits.
rebase: rebase:
git pull --rebase origin master git pull --rebase origin master
@@ -560,7 +569,7 @@ deb-build/$(DEB_NVRA).deb: deb-build/$(DEB_NVR).dsc $(PBUILDER_CACHE_DIR)/$(DEB_
$(PBUILDER_BIN) execute $(PBUILDER_OPTS) --save-after-exec packaging/pbuilder/setup.sh $(DEB_DIST) $(PBUILDER_BIN) execute $(PBUILDER_OPTS) --save-after-exec packaging/pbuilder/setup.sh $(DEB_DIST)
$(PBUILDER_BIN) build $(PBUILDER_OPTS) deb-build/$(DEB_NVR).dsc $(PBUILDER_BIN) build $(PBUILDER_OPTS) deb-build/$(DEB_NVR).dsc
deb: deb-build/$(DEB_NVRA).deb deb: guard-DEB_DIST deb-build/$(DEB_NVRA).deb
@echo "#############################################" @echo "#############################################"
@echo "Artifacts:" @echo "Artifacts:"
@echo deb-build/$(DEB_NVRA).deb @echo deb-build/$(DEB_NVRA).deb
@@ -582,17 +591,17 @@ reprepro/conf:
mkdir -p $@ mkdir -p $@
cp -a packaging/reprepro/* $@/ cp -a packaging/reprepro/* $@/
if [ "$(OFFICIAL)" = "yes" ] ; then \ if [ "$(OFFICIAL)" = "yes" ] ; then \
echo "ask-passphrase" >> $@/options; \
sed -i -e 's|^\(Codename:\)|SignWith: $(GPG_KEY)\n\1|' $@/distributions ; \ sed -i -e 's|^\(Codename:\)|SignWith: $(GPG_KEY)\n\1|' $@/distributions ; \
fi fi
reprepro: deb-build/$(DEB_NVRA).deb reprepro/conf reprepro: deb-build/$(DEB_NVRA).deb reprepro/conf
reprepro --export=force -b $@ clearvanished $(REPREPRO_BIN) $(REPREPRO_OPTS) clearvanished
for COMPONENT in non-free ; do \ for COMPONENT in non-free $(VERSION); do \
reprepro --export=force -b $@ -C $$COMPONENT remove $(DEB_DIST) $(NAME) ; \ $(REPREPRO_BIN) $(REPREPRO_OPTS) -C $$COMPONENT remove $(DEB_DIST) $(NAME) ; \
reprepro --export=force -b $@ --keepunreferencedfiles --ignore=brokenold -C $$COMPONENT includedeb $(DEB_DIST) deb-build/$(DEB_NVRA).deb ; \ $(REPREPRO_BIN) $(REPREPRO_OPTS) -C $$COMPONENT --keepunreferencedfiles --ignore=brokenold includedeb $(DEB_DIST) deb-build/$(DEB_NVRA).deb ; \
done done
# #
# Packer build targets # Packer build targets
# #