You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2017/07/20 19:43:51 UTC
[couchdb-pkg] branch master updated (163565b -> 94f3c58)
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git.
discard 163565b Do not create build directory in ~
new 94f3c58 Do not create build directory in ~
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (163565b)
\
N -- N -- N refs/heads/master (94f3c58)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].
[couchdb-pkg] 01/01: Do not create build directory in ~
Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
commit 94f3c58a64bbab34cea9f480a42f628f123de87c
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Thu Jul 20 03:08:16 2017 -0400
Do not create build directory in ~
---
Makefile | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 6c3d21f..c5e4c81 100644
--- a/Makefile
+++ b/Makefile
@@ -33,11 +33,14 @@ precise-prep:
# Ubuntu 14.04
# Need to work around missing esl erlang-* pkgs for 1:18.3-1 :/
-trusty: find-couch-dist copy-debian trusty-prep update-changelog dpkg lintian
+# No lintian run because of bogus failure on
+# postrm-does-not-call-updaterc.d-for-init.d-script
+# See Ubuntu ufw changelog for why they disabled this check
+trusty: find-couch-dist copy-debian trusty-prep update-changelog dpkg
# see changelog for ubuntu ufw package, this is safe
trusty-prep:
- sudo sed -i 's/conffile/conffile, postrm-does-not-call-updaterc.d-for-init.d-script/' /usr/share/lintian/profiles/couchdb/main.profile
+ #sudo sed -i 's/conffile/conffile, postrm-does-not-call-updaterc.d-for-init.d-script/' /usr/share/lintian/profiles/couchdb/main.profile
sed -i '/erlang-*/d' $(DISTDIR)/debian/control
# Ubuntu 16.04
@@ -79,26 +82,26 @@ lintian:
# ######################################
link-couch-dist:
- rm -rf ~/rpmbuild/BUILD
- ln -s $(DISTDIR) ~/rpmbuild/BUILD
+ rm -rf ../rpmbuild/BUILD
+ ln -s $(DISTDIR) ../rpmbuild/BUILD
$(eval VERSION := $(shell echo $(VERSION) | sed 's/-/\./'))
make-rpmbuild:
- rm -rf ~/rpmbuild
- mkdir -p ~/rpmbuild
- cp -R rpm/* ~/rpmbuild
+ rm -rf ../rpmbuild
+ mkdir -p ../rpmbuild
+ cp -R rpm/* ../rpmbuild
build-rpm:
- cd ~/rpmbuild && rpmbuild --verbose -bb SPECS/couchdb.spec --define "erlang_version $(ERLANG_VERSION)" --define '_version $(VERSION)'
+ cd ../rpmbuild && rpmbuild --verbose -bb SPECS/couchdb.spec --define "erlang_version $(ERLANG_VERSION)" --define '_version $(VERSION)' --buildroot=../rpmbuild
# ######################################
make-js185:
spectool -g -R rpm/SPECS/js-1.8.5.spec
- cd ~/rpmbuild && rpmbuild --verbose -bb SPECS/js-1.8.5.spec
+ cd ../rpmbuild && rpmbuild --verbose -bb SPECS/js-1.8.5.spec
install-js185:
- sudo rpm -i ~/rpmbuild/RPMS/x86_64/js-1*
- sudo rpm -i ~/rpmbuild/RPMS/x86_64/js-devel*
+ sudo rpm -i ../rpmbuild/RPMS/x86_64/js-1*
+ sudo rpm -i ../rpmbuild/RPMS/x86_64/js-devel*
rm-js185-rpms:
- rm -f ~/rpmbuild/RPMS/x86_64/js*
+ rm -f ../rpmbuild/RPMS/x86_64/js*
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.