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.

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

Fix/64bit build #2

Merged
merged 64 commits into from
Jul 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
4118f8d
stage5: Add Mathematica
XECDesign Jul 8, 2019
3748227
stage2: Add vl805fw
XECDesign Jul 8, 2019
175dfb0
Update release notes
XECDesign Jul 8, 2019
4c575d7
Add missing release notes
XECDesign Jul 10, 2019
210b51c
stage3: remove Epiphany
XECDesign Jul 10, 2019
9c0a25d
stage2: add ntfs-3g
XECDesign Jul 18, 2019
c0714e3
Update Stretch to Buster in README (#310)
132ikl Jul 23, 2019
5436273
Make build_docker.sh portable again (#308)
hilli Jul 23, 2019
920e22b
Ensure that the configuration file is an absolute path in Docker buil…
hhromic Jul 30, 2019
18b945f
Moved git-hash determination to passed in build variable (#273)
kevinastone Aug 11, 2019
8110eb4
Remove unused interfaces file (#322)
christophehurpeau Aug 11, 2019
d1f7a38
Support regional config settings (#323)
jbussdieker Aug 14, 2019
28f3441
stage5: add scratch3
XECDesign Aug 12, 2019
c1ff2b1
stage4: rename thonny package
XECDesign Aug 12, 2019
a016561
export-image: Remove interfaces.dpkg-old
XECDesign May 7, 2019
c49261d
stage2: install pciutils
XECDesign Jun 3, 2019
77833ba
cmdline.txt: remove dwc_otg.lpm_enable=0
XECDesign Jun 3, 2019
e8460be
Revert "export-image: Remove interfaces.dpkg-old"
XECDesign Aug 14, 2019
00c22ab
Updated export-image to not depend on fake-hwclock and hardlink. (#326)
rkubes Aug 27, 2019
d1ed4a2
Include rpi-eeprom
XECDesign Sep 18, 2019
6527807
Update config.txt to replace lirc-rpi with gpio-ir (#328)
fpicalausa Sep 23, 2019
6538d5b
Update release notes
XECDesign Sep 23, 2019
946f164
stage3: Mousepad used as simple text editor instead of leafpad
XECDesign Sep 24, 2019
99f702f
Use parted for partitioning (#285)
matthijskooijman Sep 25, 2019
5780006
Update release notes
XECDesign Sep 25, 2019
80d4866
Update release notes
XECDesign Sep 25, 2019
8026d9d
Update changelog
XECDesign Oct 14, 2019
336ff21
Document how to get values for the localization values
matthijskooijman Oct 13, 2019
19c0188
Ensure debootstrap runs through 'sh' rather than 'bash'
XECDesign Oct 30, 2019
d30343f
Added hostname parameter
reneklootwijk Oct 26, 2019
95ba042
Add hostname to /etc/hosts
XECDesign Nov 6, 2019
a449c75
OS X does not have realpath (#342)
snoe925 Nov 11, 2019
7f143a1
Export base directory before loading config file (#347)
LCvanDinteren Nov 18, 2019
5e19033
Remove accidental trailing brace (#348)
LCvanDinteren Nov 18, 2019
5456c38
Explicitly check if postrun script exists in BASE_DIR (#351)
LCvanDinteren Nov 26, 2019
d7c1ae2
New types of images. (#352)
Nov 26, 2019
8bdbbfb
Added stage 5 to the text (#353)
Nov 27, 2019
18c3ceb
configure unprotected wifi when WPA_PASSWORD is unset (#357)
chrisdecker1201 Dec 5, 2019
32353a1
Updated info about stage4 and stage5 (#359)
Dec 9, 2019
9d15c0f
move picraft to stage where minecraft is installed (#362)
chrisdecker1201 Dec 12, 2019
271177a
Use tee with wpa_passphrase so errors are visable
samtygier Dec 23, 2019
0248400
Check WPA_PASSWORD length early
samtygier Dec 23, 2019
9d334be
WPA_PASSWORD length check should only occur if set
samtygier Jan 7, 2020
f9375cd
README.md - mention WPA_PASSWORD length requirement
Jan 8, 2020
f8f3d6f
capitalise Raspberry Pi
Jan 8, 2020
24bb01d
Rename HOSTNAME variable to TARGET_HOSTNAME
XECDesign Dec 5, 2019
0a6624b
Update ROOT_MARGIN
XECDesign Jan 24, 2020
ca31aef
stage5: install code-the-classics
XECDesign Jan 24, 2020
bdbd858
Update MagPi URL scheme
XECDesign Jan 27, 2020
b4ea63c
Update persistent rkfill files
XECDesign Jan 28, 2020
306c7eb
Update release notes
XECDesign Jan 27, 2020
87f7a59
Update release notes
XECDesign Feb 3, 2020
e577677
Update release notes
XECDesign Feb 5, 2020
6b72a64
Update release notes
XECDesign Feb 7, 2020
6d71ac0
Update release notes
XECDesign Feb 10, 2020
5f88437
Update release notes
XECDesign Feb 13, 2020
38d22e9
Retry apt downloads 3 times
luigifcruz Feb 20, 2020
65f91b8
BusyBox realpath does not support -s flag, fallback to use no flags (…
timvisee Feb 20, 2020
8ef3f47
Dockerfile: use --no-install-recommends in apt-get install (#383)
lpenz Feb 20, 2020
08fc0b9
Exposed RELEASE as a configurable variable (#391)
DragonForgedTheArtist Feb 26, 2020
6ef7fa5
Autmagically use 1386/debian:buster when running on 64-bit host to pr…
aniongithub Jun 2, 2020
c1d1015
Add comment
aniongithub Jun 2, 2020
4f5dfc4
Fix conditional to read better using a case statement
aniongithub Jun 2, 2020
fbd9d3e
Fix builds on 64-bit platforms
b- Jul 7, 2020
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
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM debian:buster
ARG BASE_IMAGE=debian:buster
FROM ${BASE_IMAGE}

ENV DEBIAN_FRONTEND noninteractive

Expand Down
13 changes: 11 additions & 2 deletions build-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

##################################################################################################
# hoobs-build #
# Copyright (C) 2019 HOOBS #
# Copyright (C) 2020 HOOBS #
# Copyright (C) 2015 Raspberry Pi (Trading) Ltd. #
# #
# This program is free software: you can redistribute it and/or modify #
Expand Down Expand Up @@ -93,7 +93,16 @@ fi
# Modify original build-options to allow config file to be mounted in the docker container
BUILD_OPTS="$(echo "${BUILD_OPTS:-}" | sed -E 's@\-c\s?([^ ]+)@-c /config@')"

${DOCKER} build -t pi-gen "${DIR}"
# Check the arch of the machine we're running on. If it's 64-bit, use a 32-bit base image instead
case "$(uname -m)" in
x86_64|aarch64)
BASE_IMAGE=i386/debian:buster
;;
*)
BASE_IMAGE=debian:buster
;;
esac
${DOCKER} build --build-arg BASE_IMAGE=${BASE_IMAGE} -t pi-gen "${DIR}"

if [ "${CONTAINER_EXISTS}" != "" ]; then
trap 'echo "got CTRL+C... please wait 5s" && ${DOCKER} stop -t 5 ${CONTAINER_NAME}_cont' SIGINT SIGTERM
Expand Down