Skip to content

Commit d1d5724

Browse files
ldenningtonLessley Dennington
authored andcommitted
linux: ensure symbols tarball contains symbols
A user pointed out in a recent GCM issue that our symbols tarball does not actually contain symbols (see [1] for additional details). Fix the `pack.sh` script to package the correct files into the symbols tarball. [1]: #1028 (comment)
1 parent 5593bd4 commit d1d5724

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

src/linux/Packaging.Linux/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ fi
4444

4545
OUTDIR="$INSTALLER_OUT/$CONFIGURATION"
4646
PAYLOAD="$OUTDIR/payload"
47+
SYMBOLS="$OUTDIR/payload.sym"
4748

4849
# Lay out payload
4950
"$INSTALLER_SRC/layout.sh" --configuration="$CONFIGURATION" || exit 1
@@ -78,7 +79,7 @@ if [ $INSTALL_FROM_SOURCE = true ]; then
7879
echo "Install complete."
7980
else
8081
# Pack
81-
"$INSTALLER_SRC/pack.sh" --configuration="$CONFIGURATION" --payload="$PAYLOAD" --version="$VERSION" || exit 1
82+
"$INSTALLER_SRC/pack.sh" --configuration="$CONFIGURATION" --payload="$PAYLOAD" --symbols="$SYMBOLS" --version="$VERSION" || exit 1
8283
fi
8384

8485
echo "Build of Packaging.Linux complete."

src/linux/Packaging.Linux/pack.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ case "$i" in
2424
PAYLOAD="${i#*=}"
2525
shift # past argument=value
2626
;;
27+
--symbols=*)
28+
SYMBOLS="${i#*=}"
29+
shift # past argument=value
30+
;;
2731
--configuration=*)
2832
CONFIGURATION="${i#*=}"
2933
shift # past argument=value
@@ -44,6 +48,9 @@ if [ -z "$PAYLOAD" ]; then
4448
elif [ ! -d "$PAYLOAD" ]; then
4549
die "Could not find '$PAYLOAD'. Did you run layout.sh first?"
4650
fi
51+
if [ -z "$SYMBOLS" ]; then
52+
die "--symbols was not set"
53+
fi
4754

4855
ARCH="`dpkg-architecture -q DEB_HOST_ARCH`"
4956

@@ -83,7 +90,7 @@ popd
8390

8491
# Build symbols tarball
8592
echo "Building symbols tarball..."
86-
pushd "$SYMBOLOUT"
93+
pushd "$SYMBOLS"
8794
tar -czvf "$SYMTARBALL" * || exit 1
8895
popd
8996

0 commit comments

Comments
 (0)