-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[deb] Switch from dpkg-deb to dm.pl.
Cygwin was the only platform using dm.pl; now all except iOS are using it. iOS has dpkg-deb with the “lzma obsolete” check removed, and there are some issues with Perl, so not switching over there. There is a dependency on a binary component (Compress::Raw::Lzma) so for now we’re asking users to install IO::Compress::Lzma manually. CI updated to install that, and post-update updated to try to install it at update-theos time.
- Loading branch information
Showing
9 changed files
with
35 additions
and
207 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../vendor/dm.pl/dm.pl |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,26 @@ | ||
#!/bin/bash | ||
# since `git submodule foreach` doesn’t get called for submodules that aren’t | ||
# cloned, force vendor/lib to be cloned here | ||
# since `git submodule foreach` doesn’t get called for submodules that aren’t cloned, force | ||
# vendor/lib and vendor/dm.pl to be cloned here | ||
if [[ ! -f "vendor/lib/.git" ]]; then | ||
git submodule update --init vendor/lib | ||
fi | ||
|
||
if [[ ! -f "vendor/dm.pl/.git" ]]; then | ||
git submodule update --init vendor/dm.pl | ||
fi | ||
|
||
# dm.pl requires IO::Compress::Lzma to be installed, which uses Compress::Raw::Lzma, which | ||
# tragically includes a binary component, which tragically requires root to install if using system | ||
# perl. we don’t use dm.pl on iOS so skip this check there | ||
if [[ "$(uname -o)-$(uname -p)" != "Darwin-arm" ]] && ! perl -MIO::Compress::Lzma -e '1' 2>/dev/null; then | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
kirb
Author
Member
|
||
if [[ $(which perl) == /usr/bin/perl ]]; then | ||
echo "A Perl dependency needs to be installed. This will require your password for sudo. Provide it below, or press Ctrl-C and then run this manually:" | ||
echo | ||
echo " sudo cpan IO::Compress::Lzma" | ||
echo | ||
sudo PERL_MM_USE_DEFAULT=1 cpan IO::Compress::Lzma | ||
else | ||
echo "Installing a Perl module dependency. This may take a minute." | ||
PERL_MM_USE_DEFAULT=1 cpan IO::Compress::Lzma | ||
fi | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 comments
on commit bad135c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Due to the file mode change of bin/post-update (100755 → 100644) it is not getting executed during an update.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The MacOS version of uname does not support the "-o" option. To print the operating system name e.g. Darwin, the "-s" option could be used instead.