Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DietPi-Software | Java: Reapply workaround to fix ARM install issue #2539

Merged
merged 3 commits into from
Feb 12, 2019
Merged

DietPi-Software | Java: Reapply workaround to fix ARM install issue #2539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f967a54
v6.22
MichaIng Feb 12, 2019
92d9dca
v6.22
MichaIng Feb 12, 2019
f39c641
v6.22
MichaIng Feb 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Changes / Improvements / Optimisations:
Bug Fixes:
- General | Resolved an issue where /etc/bashrc.d entries could be run multiple times. Many thanks to @jonare77 for reporting this: https://github.com/Fourdee/DietPi/issues/2529
- DietPi-Software | Mopidy: Resolved issue with failed audio playback. Many thanks to @arkhub for reporting this issue! https://github.com/Fourdee/DietPi/issues/2536
- DietPi-Software | Java: Resolved an issue where install failed on ARM. Thanks to @WTFMaster for reporting this issue: https://github.com/Fourdee/DietPi/issues/2524

As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/Fourdee/DietPi/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aclosed+base%3Amaster

Expand Down
12 changes: 7 additions & 5 deletions dietpi/dietpi-software
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6726,6 +6726,8 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix

Banner_Installing

local packages='ca-certificates-java openjdk-8-jre-headless openjdk-8-jdk-headless'

# On Jessie use backports repo:
if (( $G_DISTRO == 3 )); then

Expand All @@ -6735,14 +6737,14 @@ Pin: release a=jessie-backports
Pin-Priority: 990
_EOF_

G_AGI openjdk-8-jre-headless openjdk-8-jdk-headless -t jessie-backports

else

G_AGI openjdk-8-jre-headless openjdk-8-jdk-headless
packages+=' -t jessie-backports'

fi

# Workaround for ARM install issue: https://github.com/Fourdee/DietPi/issues/2524
apt-get install -y -qq $packages
G_AGI $packages

fi

software_id=9
Expand Down