Opened 11 years ago

Closed 11 years ago

#6104 closed patch (fixed)

osx-packager.pl extracts subversion-deps to wrong directory

Reported by: miketoohey47@… Owned by: Isaac Richards
Priority: minor Milestone: unknown
Component: mythtv Version: 0.21-fixes
Severity: medium Keywords:
Cc: Ticket locked: no

Description

If Subversion and its dependencies are not already installed on the build machine, the osx-packager.pl script will download and extract subversion-1.4.3.tar.bz2 and then subversion-deps-1.4.3.tar.bz2 inside the build image.

When the "deps" package is extracted, it has the unintended side effect of creating an identically-named subversion-1.4.3 directory inside of the existing directory. The dependencies in the nested folder are not usable for the rest of the build process.

This patch changes the current working directory to the parent so that both packages are extracted into the same directory.

Attachments (1)

osx-packager-fixsvndeps.txt (510 bytes) - added by miketoohey47@… 11 years ago.

Download all attachments as: .zip

Change History (3)

Changed 11 years ago by miketoohey47@…

Attachment: osx-packager-fixsvndeps.txt added

comment:1 Changed 11 years ago by Nigel

Hmmm. Trunk (/packaging/OSX/build/osx-packager.pl) does:

MacBook% ~/Programming/MythTV/packaging/OSX/build/osx-packager.pl --pluginskip --themeskip --verbose
[osx-pkg] /usr/bin/hostinfo | grep 'processors$'
[osx-pkg] Using 3 jobs on 2 parallel CPUs
[osx-pkg] Including components: mythtv packaging
[osx-pkg] Using previously downloaded svndeps
[osx-pkg] Using previously downloaded svn
[osx-pkg] Unpacking svn
[osx-pkg] /usr/bin/tar -xjf subversion-1.4.3.tar.bz2
[osx-pkg] Configuring svn
[osx-pkg] cd .. ; tar -xjf subversion-deps-1.4.3.tar.bz2
[osx-pkg] ./configure --prefix=/Volumes/Backups/.osx-packager/build --disable-static --enable-shared --disable-keychain MAKEFLAGS=-j3

so I guess I just forgot to apply a similar fix to fixes. Will apply tonight.

comment:2 Changed 11 years ago by Nigel

Resolution: fixed
Status: newclosed

(In [19653]) Correctly extract subversion deps. Closes #6104. Thanks Mike.

Note: See TracTickets for help on using tickets.