You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by al...@apache.org on 2019/11/14 20:02:57 UTC
[kudu] branch branch-1.10.x updated (e437f5a -> b7e2fae)
This is an automated email from the ASF dual-hosted git repository.
alexey pushed a change to branch branch-1.10.x
in repository https://gitbox.apache.org/repos/asf/kudu.git.
from e437f5a [build-support] fix on enable_devtoolset_inner.sh
new b3d5575 [mini-cluster] fix on building mini-cluster JAR
new b7e2fae thirdparty: remove memkind from LICENSE.txt
The 2 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:
.../mini-cluster/build_mini_cluster_binaries.sh | 19 ++++++-
thirdparty/LICENSE.txt | 62 +---------------------
2 files changed, 19 insertions(+), 62 deletions(-)
[kudu] 02/02: thirdparty: remove memkind from LICENSE.txt
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alexey pushed a commit to branch branch-1.10.x
in repository https://gitbox.apache.org/repos/asf/kudu.git
commit b7e2fae1ec0c677ac93c77927109211b9e58d02f
Author: Adar Dembo <ad...@cloudera.com>
AuthorDate: Tue Nov 12 23:26:18 2019 -0800
thirdparty: remove memkind from LICENSE.txt
I'm getting kinda overwhelmed by the sheer number of license files we seem
to be juggling. I guess that's how we missed this one.
Change-Id: I7989fca644f573e90304af4cbf5dc2440fe37d3e
Reviewed-on: http://gerrit.cloudera.org:8080/14703
Tested-by: Kudu Jenkins
Reviewed-by: Alexey Serbin <as...@cloudera.com>
(cherry picked from commit 7e1bcb63958ad3e672322a005f441e5dd3a9d087)
Conflicts:
thirdparty/LICENSE.txt
Reviewed-on: http://gerrit.cloudera.org:8080/14708
Tested-by: Alexey Serbin <as...@cloudera.com>
---
thirdparty/LICENSE.txt | 62 +-------------------------------------------------
1 file changed, 1 insertion(+), 61 deletions(-)
diff --git a/thirdparty/LICENSE.txt b/thirdparty/LICENSE.txt
index 9f0afe4..6986c8b 100644
--- a/thirdparty/LICENSE.txt
+++ b/thirdparty/LICENSE.txt
@@ -539,67 +539,7 @@ Source: http://savannah.nongnu.org/projects/libunwind/
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--------------------------------------------------------------------------------
-thirdparty/memkind-*/
-libraries: libmemkind
-Source: https://github.com/memkind/memkind
-
- Unless otherwise specified, files in the memkind source distribution are
- subject to the following license:
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of Intel Corporation nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-memkind bundles jemalloc which is licensed under the BSD 2-clause license:
-
- Unless otherwise specified, files in the jemalloc source distribution are
- subject to the following license:
-
- Copyright (C) 2002-2017 Jason Evans <ja...@canonware.com>.
- All rights reserved.
- Copyright (C) 2007-2012 Mozilla Foundation. All rights reserved.
- Copyright (C) 2009-2017 Facebook, Inc. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 1. Redistributions of source code must retain the above copyright notice(s),
- this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright notice(s),
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY EXPRESS
- OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------------------------------------
-thirdparty/boost_*/: Boost Software License
+thirdparty/src/boost_*/: Boost Software License
Source: http://www.boost.org/
Boost Software License - Version 1.0 - August 17th, 2003
[kudu] 01/02: [mini-cluster] fix on building mini-cluster JAR
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alexey pushed a commit to branch branch-1.10.x
in repository https://gitbox.apache.org/repos/asf/kudu.git
commit b3d557518bbefb1e25fca23f9280611247e5af73
Author: Alexey Serbin <al...@apache.org>
AuthorDate: Tue Nov 12 17:49:55 2019 -0800
[mini-cluster] fix on building mini-cluster JAR
Prior to this patch, build_mini_cluster_binaries.sh script didn't
properly handle the case of running in the same workspace that
was used to build the mini-cluster JAR for prior releases. That
might result in not building the required JAR, so no binary
content would be uploaded by running publish_mini_cluster_binaries.sh
script later on.
This patch fixes the issue: by default, the build directory
is re-created upon every run of the build_mini_cluster_binaries.sh
script unless MINI_CLUSTER_NO_FRESH_BUILD environment variable is set.
Also, even if MINI_CLUSTER_NO_FRESH_BUILD is set and the build directory
is not re-created, the script now warns on ambiguity when multiple
artifact directories are present.
Change-Id: Ic2d5c2a83e2a0ab959e2eb7898d47ab736cd1e1f
Reviewed-on: http://gerrit.cloudera.org:8080/14702
Tested-by: Kudu Jenkins
Reviewed-by: Adar Dembo <ad...@cloudera.com>
(cherry picked from commit 6406123924c3900e8edd65eebbb3d93963fd2a7b)
Reviewed-on: http://gerrit.cloudera.org:8080/14709
Reviewed-by: Alexey Serbin <as...@cloudera.com>
Tested-by: Alexey Serbin <as...@cloudera.com>
---
.../mini-cluster/build_mini_cluster_binaries.sh | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/build-support/mini-cluster/build_mini_cluster_binaries.sh b/build-support/mini-cluster/build_mini_cluster_binaries.sh
index 61efe34..a133ccd 100755
--- a/build-support/mini-cluster/build_mini_cluster_binaries.sh
+++ b/build-support/mini-cluster/build_mini_cluster_binaries.sh
@@ -72,6 +72,16 @@ BUILD_ROOT=$SOURCE_ROOT/build/mini-cluster
MINI_CLUSTER_SRCDIR=$SOURCE_ROOT/build-support/mini-cluster
TARGETS="kudu kudu-tserver kudu-master"
+# Remove leftovers from previous releases/builds: rename the existing directory.
+# To skip this step, set the MINI_CLUSTER_NO_FRESH_BUILD environment variable.
+if [ -n "$MINI_CLUSTER_NO_FRESH_BUILD" ]; then
+ echo "WARNING: using existing build directory"
+else
+ suffix=$(date "+%Y%m%d.%H%M%S")
+ echo "Moving existing $BUILD_ROOT into $BUILD_ROOT.$suffix"
+ mv $BUILD_ROOT $BUILD_ROOT.$suffix
+fi
+
cd $SOURCE_ROOT
if [ -n "$NO_REBUILD_THIRDPARTY" ]; then
echo Skipping thirdparty because NO_REBUILD_THIRDPARTY is not empty
@@ -116,7 +126,14 @@ make -j$NUM_PROCS $TARGETS
# Relocate the binaries.
$MINI_CLUSTER_SRCDIR/relocate_binaries_for_mini_cluster.py $BUILD_ROOT $TARGETS
-ARTIFACT_NAME=$(ls -d kudu-binary* | sed 's#/##' | head -1)
+ARTIFACT_NAME="$(ls -dF kudu-binary-* | egrep '.*/$' | sed 's#/##')"
+if [ $(echo $ARTIFACT_NAME | wc -w) -ne 1 ]; then
+ echo "ERROR: this script can handle only single kudu-binary artifact, but"
+ echo " multiple kudu-binary-* directories found under $BUILD_ROOT:"
+ echo " $ARTIFACT_NAME"
+ echo " Remove extra kudu-binary-* directories"
+ exit 1
+fi
# Strip everything to minimize the size of the tarball we generate.
echo Stripping symbols...