Merge pull request #54 from DieterReuter/update-rootfs-1.2.5

Update rootfs to v1.2.5
DieterReuter · Jan 7, 2018 · 6d0ef74 · 6d0ef74
2 parents ce40778 + b83f929
commit 6d0ef74
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
@@ -265,13 +265,6 @@ fi
 apt-get clean
 rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-#TODO:+++ fix version info for Debian Stretch
-# should be fixed in os-rootfs
-sed -i 's/Linux 8/Linux 9/g' /etc/issue
-sed -i 's/Linux 8/Linux 9/g' /etc/issue.net
-sed -i 's/Linux 8/Linux 9/g' /etc/motd
-#TODO:---
-
 # set device label and version number
 cat <<EOF >> /etc/os-release
 HYPRIOT_BOOTLOADER_BUILD="${BOOTLOADER_BUILD}"

diff --git a/builder/test-integration/spec/hypriotos-image/base/release_spec.rb b/builder/test-integration/spec/hypriotos-image/base/release_spec.rb
@@ -7,7 +7,7 @@
   it { should be_owned_by 'root' }
   its(:content) { should contain /ID=debian/ }
   its(:content) { should match /HYPRIOT_OS="HypriotOS\/arm64"/ }
-  its(:content) { should match /HYPRIOT_OS_VERSION="v1.2.4"/ }
+  its(:content) { should match /HYPRIOT_OS_VERSION="v1.2.5"/ }
   its(:content) { should match /HYPRIOT_DEVICE="Raspberry Pi 3 64bit"/ }
   its(:content) { should match /HYPRIOT_IMAGE_VERSION=/ }
 end
@@ -17,7 +17,7 @@
   it { should be_owned_by 'root' }
   its(:content) { should contain /ID=debian/ }
   its(:content) { should match /HYPRIOT_OS="HypriotOS\/arm64"/ }
-  its(:content) { should match /HYPRIOT_OS_VERSION="v1.2.4"/ }
+  its(:content) { should match /HYPRIOT_OS_VERSION="v1.2.5"/ }
   its(:content) { should match /HYPRIOT_DEVICE="Raspberry Pi 3 64bit"/ }
   its(:content) { should match /HYPRIOT_IMAGE_VERSION=/ }
 end

diff --git a/builder/test/os-release_spec.rb b/builder/test/os-release_spec.rb
@@ -36,8 +36,8 @@
     expect(stdout).to contain('^HYPRIOT_DEVICE="Raspberry Pi 3 64bit"$')
   end
 
-  it "uses os-rootfs version 'HYPRIOT_OS_VERSION=\"v1.2.4\"'" do
-    expect(stdout).to contain('^HYPRIOT_OS_VERSION="v1.2.4"$')
+  it "uses os-rootfs version 'HYPRIOT_OS_VERSION=\"v1.2.5\"'" do
+    expect(stdout).to contain('^HYPRIOT_OS_VERSION="v1.2.5"$')
   end
 
   if ENV.fetch('TRAVIS_TAG','') != ''

diff --git a/versions.config b/versions.config
@@ -1,6 +1,6 @@
 # config vars for the root file system
-HYPRIOT_OS_VERSION="v1.2.4"
-ROOTFS_TAR_CHECKSUM="a8f06aa7c26af94a5cb3660ff23b6261e9544d710b3d5636a792ac8f88ca3f2f"
+HYPRIOT_OS_VERSION="v1.2.5"
+ROOTFS_TAR_CHECKSUM="8e33bfd4c3e6aa938fc5a953996c786d05a91fa84918224595d3a08aa760d3f4"
 
 # name of the ready made raw image for RPi
 RAW_IMAGE="rpi-raw.img"