Skip to content

Commit

Permalink
Unbundle dpkg-shlibdeps
Browse files Browse the repository at this point in the history
Now that all official builders have been upgraded to trusty, we can
remove dpkg-dev from third-party.

BUG=655755
R=jochen@chromium.org,phajdan.jr@chromium.org
CC=dpranke@chromium.org,sbc@chromium.org,thestig@chromium.org

Review-Url: https://codereview.chromium.org/2662493002
Cr-Commit-Position: refs/heads/master@{#446746}
  • Loading branch information
tanderson-google authored and Commit bot committed Jan 27, 2017
1 parent 0b00ee4 commit 6e6c4d2
Show file tree
Hide file tree
Showing 70 changed files with 3 additions and 18,162 deletions.
2 changes: 0 additions & 2 deletions chrome/installer/linux/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,6 @@ template("linux_package") {
branding_path_component,
"-s",
rebase_path(sysroot),
"-e",
rebase_path("//third_party/dpkg-dev"),
]
deps = [
":installer_deps",
Expand Down
13 changes: 3 additions & 10 deletions chrome/installer/linux/debian/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ usage() {
echo "-b dir build input directory [${BUILDDIR}]"
echo "-d brand either chromium or google_chrome"
echo "-s dir /path/to/sysroot"
echo "-e dir /path/to/dpkg-dev"
echo "-h this help message"
}

Expand Down Expand Up @@ -164,7 +163,7 @@ verify_channel() {
}

process_opts() {
while getopts ":e:s:o:b:c:a:d:h" OPTNAME
while getopts ":s:o:b:c:a:d:h" OPTNAME
do
case $OPTNAME in
o )
Expand All @@ -186,9 +185,6 @@ process_opts() {
s )
SYSROOT="$OPTARG"
;;
e )
DPKG_DEV_DIR="$OPTARG"
;;
h )
usage
exit 0
Expand Down Expand Up @@ -282,11 +278,8 @@ else
SHLIB_ARGS="${SHLIB_ARGS} -l${SYSROOT}/lib/i386-linux-gnu"
fi
SHLIB_ARGS="${SHLIB_ARGS} -l${SYSROOT}/usr/lib"
# TODO(thomasanderson): Unbundle dpkg-shlibdeps once the Precise->Trusty
# transition is complete by reverting CL 2411423002 and applying ps40001.
DPKG_SHLIB_DEPS=$(cd ${SYSROOT} && DPKG_DATADIR=${DPKG_DEV_DIR} \
perl -I ${DPKG_DEV_DIR}/scripts ${DPKG_DEV_DIR}/scripts/dpkg-shlibdeps.pl \
${SHLIB_ARGS:-} -O -e"$BUILDDIR/chrome" | sed 's/^shlibs:Depends=//')
DPKG_SHLIB_DEPS=$(cd ${SYSROOT} && dpkg-shlibdeps ${SHLIB_ARGS:-} -O \
-e"$BUILDDIR/chrome" | sed 's/^shlibs:Depends=//')
if [ -n "$SAVE_LDLP" ]; then
LD_LIBRARY_PATH=$SAVE_LDLP
fi
Expand Down
339 changes: 0 additions & 339 deletions third_party/dpkg-dev/LICENSE

This file was deleted.

3 changes: 0 additions & 3 deletions third_party/dpkg-dev/OWNERS

This file was deleted.

23 changes: 0 additions & 23 deletions third_party/dpkg-dev/README.chromium

This file was deleted.

11 changes: 0 additions & 11 deletions third_party/dpkg-dev/abitable

This file was deleted.

42 changes: 0 additions & 42 deletions third_party/dpkg-dev/cputable

This file was deleted.

38 changes: 0 additions & 38 deletions third_party/dpkg-dev/ostable

This file was deleted.

43 changes: 0 additions & 43 deletions third_party/dpkg-dev/scripts/Dpkg.pm

This file was deleted.

Loading

0 comments on commit 6e6c4d2

Please sign in to comment.