move makeself (#4688)
Paweł Krupa committed
Jan 2, 2019 at 10:12 UTC
4d77f2b32518601d54528bf98e311685cf8478d0
24 files changed
+34
-67
.gitignore
+1
-1
@@ -56,7 +56,7 @@ packaging/installer/.environment.sh
56
*.run
57
58
# netdata makeself downloads
59
-makeself/tmp/
59
+packaging/makeself/tmp/
60
61
# coverity
62
cov-int/
.travis/create_artifacts.sh
+1
-1
@@ -14,7 +14,7 @@ autoreconf -ivf
14
./configure
15
make dist
16
echo "--- Create self-extractor ---"
17
-./makeself/build-x86_64-static.sh
17
+./packaging/makeself/build-x86_64-static.sh
18
19
# Needed fo GCS
20
echo "--- Copy artifacts to bin ---"
Makefile.am
-1
@@ -47,7 +47,6 @@ EXTRA_DIST = \
47
48
SUBDIRS = \
49
diagrams \
50
- makeself \
50
system \
51
tests \
52
$(NULL)
configure.ac
-1
@@ -589,7 +589,6 @@ AC_CONFIG_FILES([
589
libnetdata/storage_number/Makefile
590
libnetdata/threads/Makefile
591
libnetdata/url/Makefile
592
- makeself/Makefile
592
registry/Makefile
593
streaming/Makefile
594
system/Makefile
makeself/Makefile.am
deleted
-26
@@ -1,26 +0,0 @@
1
-# SPDX-License-Identifier: GPL-3.0-or-later
2
-MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
3
-
4
-dist_noinst_DATA = \
5
- $(NULL)
6
-
7
-dist_noinst_SCRIPTS = \
8
- build.sh \
9
- makeself.sh \
10
- makeself-license.txt \
11
- install-alpine-packages.sh \
12
- post-installer.sh \
13
- jobs/10-prepare-destination.install.sh \
14
- jobs/50-curl-7.60.0.install.sh \
15
- jobs/50-bash-4.4.18.install.sh \
16
- jobs/50-fping-4.0.install.sh \
17
- jobs/70-netdata-git.install.sh \
18
- jobs/99-makeself.install.sh \
19
- run-all-jobs.sh \
20
- install-or-update.sh \
21
- build-x86_64-static.sh \
22
- makeself-header.sh \
23
- makeself-help-header.txt \
24
- makeself.lsm \
25
- functions.sh \
26
- $(NULL)
packaging/makeself/README.md
renamed
+2
-2
@@ -4,7 +4,7 @@ To build the static binary 64-bit distribution package, run:
4
5
```bash
6
$ cd /path/to/netdata.git
7
-$ ./makeself/build-x86_64-static.sh
7
+$ ./packaging/makeself/build-x86_64-static.sh
8
```
9
10
The program will:
@@ -24,7 +24,7 @@ To build netdata binaries with debugging / tracing information in them, use:
24
25
```bash
26
$ cd /path/to/netdata.git
27
-$ ./makeself/build-x86_64-static.sh debug
27
+$ ./packaging/makeself/build-x86_64-static.sh debug
28
```
29
30
These binaries are not optimized (they are a bit slower), they have certain features disables (like log flood protection), other features enables (like `debug flags`) and are not stripped (the binary files are bigger, since they now include source code tracing information).
packaging/makeself/build-x86_64-static.sh
renamed
+3
-3
@@ -1,7 +1,7 @@
1
#!/usr/bin/env bash
2
# SPDX-License-Identifier: GPL-3.0-or-later
3
4
-. $(dirname "$0")/../packaging/installer/functions.sh || exit 1
4
+. $(dirname "$0")/../installer/functions.sh || exit 1
5
6
set -e
7
@@ -23,7 +23,7 @@ then
23
# (also inside the container)
24
#
25
run sudo docker run -v $(pwd):/usr/src/netdata.git:rw alpine:3.7 \
26
- /bin/sh /usr/src/netdata.git/makeself/install-alpine-packages.sh
26
+ /bin/sh /usr/src/netdata.git/packaging/makeself/install-alpine-packages.sh
27
28
# save the changes made permanently
29
id=$(sudo docker ps -l -q)
@@ -34,7 +34,7 @@ fi
34
run sudo docker run -a stdin -a stdout -a stderr -i -t -v \
35
$(pwd):/usr/src/netdata.git:rw \
36
"${DOCKER_CONTAINER_NAME}" \
37
- /bin/sh /usr/src/netdata.git/makeself/build.sh "${@}"
37
+ /bin/sh /usr/src/netdata.git/packaging/makeself/build.sh "${@}"
38
39
if [ "${USER}" ]
40
then
packaging/makeself/build.sh
renamed
+1
-1
@@ -31,7 +31,7 @@ cd $(dirname "$0") || exit 1
31
32
# if we don't run inside the netdata repo
33
# download it and run from it
34
-if [ ! -f ../netdata-installer.sh ]
34
+if [ ! -f ../../netdata-installer.sh ]
35
then
36
git clone https://github.com/netdata/netdata.git netdata.git || exit 1
37
cd netdata.git/makeself || exit 1
packaging/makeself/functions.sh
renamed
+3
-3
@@ -6,9 +6,9 @@
6
# allow running the jobs by hand
7
[ -z "${NETDATA_BUILD_WITH_DEBUG}" ] && export NETDATA_BUILD_WITH_DEBUG=0
8
[ -z "${NETDATA_INSTALL_PATH}" ] && export NETDATA_INSTALL_PATH="${1-/opt/netdata}"
9
-[ -z "${NETDATA_MAKESELF_PATH}" ] && export NETDATA_MAKESELF_PATH="$(dirname "${0}")/.."
9
+[ -z "${NETDATA_MAKESELF_PATH}" ] && export NETDATA_MAKESELF_PATH="$(dirname "${0}")/../.."
10
[ "${NETDATA_MAKESELF_PATH:0:1}" != "/" ] && export NETDATA_MAKESELF_PATH="$(pwd)/${NETDATA_MAKESELF_PATH}"
11
-[ -z "${NETDATA_SOURCE_PATH}" ] && export NETDATA_SOURCE_PATH="${NETDATA_MAKESELF_PATH}/.."
11
+[ -z "${NETDATA_SOURCE_PATH}" ] && export NETDATA_SOURCE_PATH="${NETDATA_MAKESELF_PATH}/../.."
12
export NULL=
13
14
# make sure the path does not end with /
@@ -35,7 +35,7 @@ fetch() {
35
then
36
run wget -O "${NETDATA_MAKESELF_PATH}/tmp/${tar}" "${url}"
37
fi
38
-
38
+
39
if [ ! -d "${NETDATA_MAKESELF_PATH}/tmp/${dir}" ]
40
then
41
cd "${NETDATA_MAKESELF_PATH}/tmp"
packaging/makeself/install-alpine-packages.sh
renamed
packaging/makeself/install-or-update.sh
renamed
packaging/makeself/jobs/10-prepare-destination.install.sh
renamed
-1
@@ -14,4 +14,3 @@ run cd "${NETDATA_INSTALL_PATH}/usr"
14
run ln -s ../bin bin
15
run ln -s ../sbin sbin
16
run ln -s . local
17
-
packaging/makeself/jobs/50-bash-4.4.18.install.sh
renamed
+1
-1
@@ -35,7 +35,7 @@ run ./configure \
35
# --enable-prompt-string-decoding \
36
# --enable-readline \
37
# --enable-select \
38
-
38
+
39
40
run make clean
41
run make -j${SYSTEM_CPUS}
packaging/makeself/jobs/50-curl-7.60.0.install.sh
renamed
packaging/makeself/jobs/50-fping-4.0.install.sh
renamed
packaging/makeself/jobs/70-netdata-git.install.sh
renamed
packaging/makeself/jobs/99-makeself.install.sh
renamed
+2
-2
@@ -43,8 +43,8 @@ FILE_VERSION="${VERSION}-$(uname -m)-$(date +"%Y%m%d-%H%M%S")${NOWNER}"
43
run mkdir -p "${NETDATA_INSTALL_PATH}/system"
44
45
run cp \
46
- makeself/post-installer.sh \
47
- makeself/install-or-update.sh \
46
+ packaging/makeself/post-installer.sh \
47
+ packaging/makeself/install-or-update.sh \
48
packaging/installer/functions.sh \
49
configs.signatures \
50
system/netdata-init-d \
packaging/makeself/makeself-header.sh
renamed
+2
-2
@@ -35,7 +35,7 @@ elif test -x /usr/ucb/echo; then
35
else
36
print_cmd="echo"
37
fi
38
-
38
+
39
if test -d /usr/xpg4/bin; then
40
PATH=/usr/xpg4/bin:\$PATH
41
export PATH
@@ -388,7 +388,7 @@ fi
388
389
if test x"$NEED_ROOT" = xy -a \`id -u\` -ne 0; then
390
echo "Administrative privileges required for this archive (use su or sudo)" >&2
391
- exit 1
391
+ exit 1
392
fi
393
394
if test x"\$copy" \!= xphase2; then
packaging/makeself/makeself-help-header.txt
renamed
+3
-5
@@ -1,7 +1,7 @@
1
2
^
3
- |.-. .-. .-. .-. . netdata
4
- | '-' '-' '-' '-' real-time performance monitoring, done right!
3
+ |.-. .-. .-. .-. . netdata
4
+ | '-' '-' '-' '-' real-time performance monitoring, done right!
5
+----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+--->
6
7
(C) Copyright 2017, Costa Tsaousis
@@ -32,7 +32,7 @@
32
33
- /etc/init.d/netdata will be created
34
35
-
35
+
36
This package can also update a netdata installation that has been
37
created with another version of it.
38
@@ -42,5 +42,3 @@
42
netdata re-distributes a lot of open source software components.
43
Check its full license at:
44
https://github.com/netdata/netdata/blob/master/LICENSE.md
45
-
46
-
packaging/makeself/makeself-license.txt
renamed
+3
-5
@@ -1,7 +1,7 @@
1
2
^
3
- |.-. .-. .-. .-. . netdata
4
- | '-' '-' '-' '-' real-time performance monitoring, done right!
3
+ |.-. .-. .-. .-. . netdata
4
+ | '-' '-' '-' '-' real-time performance monitoring, done right!
5
+----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+--->
6
7
(C) Copyright 2017, Costa Tsaousis
@@ -32,7 +32,7 @@
32
33
- /etc/init.d/netdata will be created
34
35
-
35
+
36
This package can also update a netdata installation that has been
37
created with another version of it.
38
@@ -42,5 +42,3 @@
42
netdata re-distributes a lot of open source software components.
43
Check its full license at:
44
https://github.com/netdata/netdata/blob/master/LICENSE.md
45
-
46
-
packaging/makeself/makeself.lsm
renamed
packaging/makeself/makeself.sh
renamed
+11
-11
@@ -21,13 +21,13 @@
21
# support for non-temporary archives. Ideas thanks to Francois Petitjean
22
# - 1.3 : More patches from Bjarni R. Einarsson and Francois Petitjean:
23
# Support for no compression (--nocomp), script is no longer mandatory,
24
-# automatic launch in an xterm, optional verbose output, and -target
24
+# automatic launch in an xterm, optional verbose output, and -target
25
# archive option to indicate where to extract the files.
26
# - 1.4 : Improved UNIX compatibility (Francois Petitjean)
27
# Automatic integrity checking, support of LSM files (Francois Petitjean)
28
# - 1.5 : Many bugfixes. Optionally disable xterm spawning.
29
# - 1.5.1 : More bugfixes, added archive options -list and -check.
30
-# - 1.5.2 : Cosmetic changes to inform the user of what's going on with big
30
+# - 1.5.2 : Cosmetic changes to inform the user of what's going on with big
31
# archives (Quake III demo)
32
# - 1.5.3 : Check for validity of the DISPLAY variable before launching an xterm.
33
# More verbosity in xterms and check for embedded command's return value.
@@ -204,9 +204,9 @@ do
204
shift
205
;;
206
--pigz)
207
- COMPRESS=pigz
208
- shift
209
- ;;
207
+ COMPRESS=pigz
208
+ shift
209
+ ;;
210
--xz)
211
COMPRESS=xz
212
shift
@@ -434,7 +434,7 @@ gzip)
434
GZIP_CMD="gzip -c$COMPRESS_LEVEL"
435
GUNZIP_CMD="gzip -cd"
436
;;
437
-pigz)
437
+pigz)
438
GZIP_CMD="pigz -$COMPRESS_LEVEL"
439
GUNZIP_CMD="gzip -cd"
440
;;
@@ -497,7 +497,7 @@ if test -f "$HEADER"; then
497
SKIP=`expr $SKIP`
498
rm -f "$tmpfile"
499
if test "$QUIET" = "n";then
500
- echo Header is $SKIP lines long >&2
500
+ echo Header is $SKIP lines long >&2
501
fi
502
503
archname="$oldarchname"
@@ -506,7 +506,7 @@ else
506
exit 1
507
fi
508
509
-if test "$QUIET" = "n";then
509
+if test "$QUIET" = "n";then
510
echo
511
fi
512
@@ -598,7 +598,7 @@ if test "$APPEND" = y; then
598
chmod +x "$archname"
599
rm -f "$archname".bak
600
if test "$QUIET" = "n";then
601
- echo Self-extractable archive \"$archname\" successfully updated.
601
+ echo Self-extractable archive \"$archname\" successfully updated.
602
fi
603
else
604
filesizes="$fsize"
@@ -610,12 +610,12 @@ else
610
611
# Append the compressed tar data after the stub
612
if test "$QUIET" = "n";then
613
- echo
613
+ echo
614
fi
615
cat "$tmpfile" >> "$archname"
616
chmod +x "$archname"
617
if test "$QUIET" = "n";then
618
- echo Self-extractable archive \"$archname\" successfully created.
618
+ echo Self-extractable archive \"$archname\" successfully created.
619
fi
620
fi
621
rm -f "$tmpfile"
packaging/makeself/post-installer.sh
renamed
packaging/makeself/run-all-jobs.sh
renamed
+1
-1
@@ -21,7 +21,7 @@ if [ "${NETDATA_MAKESELF_PATH:0:1}" != "/" ]
21
fi
22
23
# netdata source directory
24
-export NETDATA_SOURCE_PATH="${NETDATA_MAKESELF_PATH}/.."
24
+export NETDATA_SOURCE_PATH="${NETDATA_MAKESELF_PATH}/../.."
25
26
# make sure ${NULL} is empty
27
export NULL=