Skip to content
This repository has been archived by the owner on Aug 14, 2023. It is now read-only.

Commit

Permalink
Merge pull request #47 from hypriot/update-to-bionic
Browse files Browse the repository at this point in the history
Update to bionic-scm image
  • Loading branch information
StefanScherer authored Sep 22, 2018
2 parents 523bf20 + ce3653c commit c8a5d23
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: buildpack-deps:trusty-scm
- image: buildpack-deps:bionic-scm
steps:
- checkout

Expand Down
6 changes: 3 additions & 3 deletions scripts/compile_kernel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ IMAGE_NAME["rpi2_3"]=kernel7.img
function create_dir_for_build_user () {
local target_dir=$1

sudo mkdir -p $target_dir
sudo chown $BUILD_USER:$BUILD_GROUP $target_dir
mkdir -p $target_dir
chown $BUILD_USER:$BUILD_GROUP $target_dir
}

function setup_build_dirs () {
Expand Down Expand Up @@ -244,7 +244,7 @@ echo "*** the kernel timestamp is: $NEW_VERSION ***"
echo "#############################################"

# clear build cache to fetch the current raspberry/firmware
sudo rm -fr $RASPBERRY_FIRMWARE
rm -fr $RASPBERRY_FIRMWARE

# setup necessary build environment: dir, repos, etc.
prepare_kernel_building
Expand Down
6 changes: 4 additions & 2 deletions scripts/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
echo "Circle Tag: $CIRCLE_TAG"

if [ "$CIRCLE_TAG" != "" ]; then
gem install package_cloud
package_cloud push Hypriot/rpi/debian/stretch output/*/raspberrypi-kernel*.deb output/*/linux-libc-dev*.deb
apt-get update
apt-get install -y golang-go
go get github.com/mlafeldt/pkgcloud/...
$HOME/go/bin/pkgcloud-push Hypriot/rpi/debian/stretch output/*/raspberrypi-kernel*.deb output/*/linux-libc-dev*.deb

curl -sSL https://github.com/tcnksm/ghr/releases/download/v0.5.4/ghr_v0.5.4_linux_amd64.zip -o ghr.zip
unzip ghr.zip
Expand Down
6 changes: 4 additions & 2 deletions scripts/prepare_build_environment.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
sudo apt-get update
#!/bin/bash

apt-get update

# needed by compile-kernel
for package in git-core build-essential libncurses5-dev bc tree fakeroot devscripts binfmt-support qemu qemu-user-static debootstrap kpartx lvm2 dosfstools apt-cacher-ng debhelper quilt; do
sudo apt-get install -y $package
apt-get install -y $package
done

0 comments on commit c8a5d23

Please sign in to comment.