Skip to content

Commit

Permalink
Upgrade Raspbian to Buster
Browse files Browse the repository at this point in the history
  • Loading branch information
eugulixes committed Aug 31, 2019
1 parent 6a43bd1 commit 2515652
Show file tree
Hide file tree
Showing 17 changed files with 41 additions and 41 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Pieman is a core component of [CusDeb](https://cusdeb.com).

## Supported Devices and OSes

| | <sub>Alpine 3.9</sub> | <sub>Debian 10 «Buster»</sub> | <sub>Devuan 1 «Jessie»</sub> | <sub>Kali Linux Rolling</sub> |<sub>Raspbian 9 «Stretch»</sub> | <sub>Ubuntu 16.04 «Xenial Xerus»</sub> | <sub>Ubuntu 18.04 «Bionic Beaver»</sub> |
| | <sub>Alpine 3.9</sub> | <sub>Debian 10 «Buster»</sub> | <sub>Devuan 1 «Jessie»</sub> | <sub>Kali Linux Rolling</sub> |<sub>Raspbian 10 «Buster»</sub> | <sub>Ubuntu 16.04 «Xenial Xerus»</sub> | <sub>Ubuntu 18.04 «Bionic Beaver»</sub> |
|---------------------------------------------------------------------------------------------------------------------|:---------------------:|:-----------------------------:|:----------------------------:|:-------------------------------:|:-------------------------------:|:--------------------------------------:|:---------------------------------------:|
| <sub>Orange Pi <a href="http://orangepi.org/orangepipcplus/">PC Plus</a></sub> | | <sub>32bit</sub> | | <sub>32bit</sub> | | | |
| <sub>Orange Pi <a href="http://www.orangepi.org/orangepizero/">Zero</a></sub> | | <sub>32bit</sub> | | <sub>32bit</sub> | | | |
Expand Down Expand Up @@ -160,7 +160,7 @@ Finally, go to the next section to know how to use the script.

##### Usage

Simply run `docker-pieman.sh` to create an image based on Raspbian Stretch for Raspberry Pi 3.
Simply run `docker-pieman.sh` to create an image based on Raspbian Buster for Raspberry Pi 3.

```
$ chmod +x docker-pieman.sh
Expand Down Expand Up @@ -201,7 +201,7 @@ $ sudo pip3 install pieman

##### Usage

Go to the project directory and execute the following command to create an image based on Raspbian Stretch for Raspberry Pi 3:
Go to the project directory and execute the following command to create an image based on Raspbian Buster for Raspberry Pi 3:

```
$ sudo ./pieman.sh
Expand Down Expand Up @@ -254,7 +254,7 @@ The operating system of the target image is specified via the `OS` environment v
| Debian 10 «[Buster](https://debian.org/releases/buster/)» (32-bit) | debian-buster-armhf |
| Devuan 1 «[Jessie](https://lists.dyne.org/lurker/message/20170525.180739.f86cd310.en.html#devuan-announce)» (32-bit) | devuan-jessie-armhf |
| Kali Linux Rolling (32-bit) | kali-rolling-armhf |
| Raspbian 9 «[Stretch](https://raspberrypi.org/blog/raspbian-stretch/)» (32-bit) | raspbian-stretch-armhf |
| Raspbian 10 «[Buster](https://raspberrypi.org/blog/buster-the-new-version-of-raspbian/)» (32-bit) | raspbian-buster-armhf |
| Ubuntu 16.04 «[Xenial Xerus](https://wiki.ubuntu.com/XenialXerus/ReleaseNotes)» (32-bit) | ubuntu-xenial-armhf |
| Ubuntu 18.04 «[Bionic Beaver](https://wiki.ubuntu.com/BionicBeaver/ReleaseNotes)» (32-bit) | ubuntu-bionic-armhf |
| Ubuntu 18.04 «[Bionic Beaver](https://wiki.ubuntu.com/BionicBeaver/ReleaseNotes)» (64-bit) | ubuntu-bionic-arm64 |
Expand All @@ -274,7 +274,7 @@ The device the target image is created for is specified via the `DEVICE` environ

#### General

##### OS="raspbian-stretch-armhf"
##### OS="raspbian-buster-armhf"

Specifies the operating system to be used as a base for the target image. You can find all the possible values for the parameter in the table above (see the "Short name" column).

Expand Down
4 changes: 2 additions & 2 deletions ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ node {
params = "-e OS=devuan-jessie-armhf"
project_name = "devuan-jessie-armhf_for_rpi1-2"
break
case "Raspbian Stretch (32bit)":
case "Raspbian Buster (32bit)":
params = ""
project_name = "raspbian_stretch_armhf_for_rpi1-2-3-zero"
project_name = "raspbian_buster_armhf_for_rpi1-2-3-zero"
break
case "Ubuntu Xenial (32bit)":
params = "-e OS=ubuntu-xenial-armhf -e DEVICE=rpi-2-b"
Expand Down
2 changes: 1 addition & 1 deletion ci/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Here is the Jenkins Pipeline script for building on a daily basis the images of
First, the job is run with one of the following parameters:

* `Devuan Jessie (32bit)`
* `Raspbian Stretch (32bit)`
* `Raspbian Buster (32bit)`
* `Ubuntu Xenial (32bit)`
* `Ubuntu Artful (32bit)`
* `Ubuntu Artful (64bit)`
Expand Down
1 change: 1 addition & 0 deletions devices/rpi-2-b/raspbian-buster-armhf
1 change: 0 additions & 1 deletion devices/rpi-2-b/raspbian-stretch-armhf

This file was deleted.

1 change: 1 addition & 0 deletions devices/rpi-3-b/raspbian-buster-armhf
1 change: 0 additions & 1 deletion devices/rpi-3-b/raspbian-stretch-armhf

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Raspbian is an official operating system for Raspberry Pi. It's based on Debian GNU/Linux and supports all models of the single-board computer. `rpi-b/raspbian-stretch-armhf` allows building custom 32-bit Raspbian [Stretch](https://www.raspberrypi.org/blog/raspbian-stretch/) images for
Raspbian is an official operating system for Raspberry Pi. It's based on Debian GNU/Linux and supports all models of the single-board computer. `rpi-b/raspbian-buster-armhf` allows building custom 32-bit Raspbian [Buster](https://raspberrypi.org/blog/buster-the-new-version-of-raspbian/) images for

* [Raspberry Pi B and B+](https://raspberrypi.org/products/raspberry-pi-1-model-b/)
* [Raspberry Pi 2 B](https://raspberrypi.org/products/raspberry-pi-2-model-b/)
Expand All @@ -17,56 +17,56 @@ Raspbian is an official operating system for Raspberry Pi. It's based on Debian
</tr>
<tr>
<td>Linux kernel</td>
<td>4.9</td>
<td>4.19</td>
</tr>
<tr>
<td>glibc</td>
<td>2.24</td>
<td>2.28</td>
</tr>
<tr>
<td>GCC</td>
<td>6.3</td>
<td>8.3.0</td>
</tr>
<tr>
<td>systemd</td>
<td>232</td>
<td>241</td>
</tr>
<tr>
<td colspan="2"><b>Development tools</b></td>
</tr>
<tr>
<td>Go</td>
<td>1.7</td>
<td>1.11</td>
</tr>
<tr>
<td>PHP</td>
<td>7.0</td>
<td>7.3</td>
</tr>
<tr>
<td>Python</td>
<td>3.5.3</td>
<td>3.7.3</td>
</tr>
<tr>
<td>Ruby</td>
<td>2.3</td>
<td>2.5.1</td>
</tr>
<tr>
<td colspan="2"><b>Server software</b></td>
</tr>
<tr>
<td>Apache HTTP Server</td>
<td>2.4.25</td>
<td>2.4.38</td>
</tr>
<tr>
<td>Nginx</td>
<td>1.10</td>
<td>1.14</td>
</tr>
<tr>
<td>PostgreSQL</td>
<td>9.6</td>
<td>11</td>
</tr>
<tr>
<td>MariaDB</td>
<td>10.1</td>
<td>10.3</td>
</tr>
</table>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Maintainer: Evgeny Golyshev <[email protected]>

raspbian-stretch-armhf:
raspbian-buster-armhf:
repos:
- http://archive.raspbian.org/raspbian
- http://archive.raspberrypi.org/debian
Expand Down
1 change: 1 addition & 0 deletions devices/rpi-zero/raspbian-buster-armhf
1 change: 0 additions & 1 deletion devices/rpi-zero/raspbian-stretch-armhf

This file was deleted.

6 changes: 3 additions & 3 deletions pieman.sh
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def_var MENDER_TENANT_TOKEN ""

def_int_var MENDER_UPDATE_POLL_INTERVAL 1800

def_var OS "raspbian-stretch-armhf"
def_var OS "raspbian-buster-armhf"

def_protected_var PASSWORD "secret"

Expand Down Expand Up @@ -238,9 +238,9 @@ if ${ENABLE_MENDER}; then
exit 1
fi

if [ "${DEVICE}" != "rpi-3-b" ] || [ "${OS}" != "raspbian-stretch-armhf" ]; then
if [ "${DEVICE}" != "rpi-3-b" ] || [ "${OS}" != "raspbian-buster-armhf" ]; then
fatal "cannot create Mender compatible image for the specified" \
"device and operating system. OS=raspbian-stretch-armhf and" \
"device and operating system. OS=raspbian-buster-armhf and" \
"DEVICE=rpi-3-b is supported only."
exit 1
fi
Expand Down
2 changes: 1 addition & 1 deletion pieman/test/pieman.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Maintainer: Evgeny Golyshev <[email protected]>

raspbian-stretch-armhf:
raspbian-buster-armhf:
repos:
- http://archive.raspbian.org/raspbian
- http://archive.raspberrypi.org/debian
Expand Down
12 changes: 6 additions & 6 deletions pieman/test/runtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def test_empty_attributes_chain(self):
def test_existent_root(self):
"""Tests if it's possible to find the root in an attributes chain. """

raspbian = self._attrs_list.get_attribute(('raspbian-stretch-armhf', ))
raspbian = self._attrs_list.get_attribute(('raspbian-buster-armhf', ))
self.assertIsInstance(raspbian, attrs.Attribute)

def test_nonexistent_root(self):
Expand All @@ -66,7 +66,7 @@ def test_existent_attribute(self):
"""Tests if it's possible to fetch the value of the specified attribute. """

includes = self._attrs_list.get_attribute(
('raspbian-stretch-armhf', 'includes')
('raspbian-buster-armhf', 'includes')
)
self.assertEqual(includes.attribute, 'systemd-sysv')

Expand All @@ -77,7 +77,7 @@ def test_nonexistent_attribute(self):

with self.assertRaises(attrs.AttributeDoesNotExist):
self._attrs_list.get_attribute(
('raspbian-stretch-armhf', 'nonexistent_attribute')
('raspbian-buster-armhf', 'nonexistent_attribute')
)

def test_unknown_attribute(self):
Expand All @@ -87,14 +87,14 @@ def test_unknown_attribute(self):

with self.assertRaises(attrs.UnknownAttribute):
self._attrs_list.get_attribute(
('raspbian-stretch-armhf', 'unknown')
('raspbian-buster-armhf', 'unknown')
)

def test_printing_printable_attribute(self):
"""Tests if it's possible to print the value of the specified printable attribute. """

includes = self._attrs_list.get_attribute(
('raspbian-stretch-armhf', 'includes')
('raspbian-buster-armhf', 'includes')
)
# The includes type is list or str which are printable.
includes.echo()
Expand All @@ -105,7 +105,7 @@ def test_printing_unprintable_attribute(self):
"""Tests if it's possible to print the value of the specified unprintable attribute. """

kernel = self._attrs_list.get_attribute(
('raspbian-stretch-armhf', 'kernel')
('raspbian-buster-armhf', 'kernel')
)
with self.assertRaises(attrs.UnprintableType):
# The kernel type is dict, so that's why UnprintableType must be
Expand Down
12 changes: 6 additions & 6 deletions test/test_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ setUp() {

MOUNT_POINT=${BUILD_DIR}/mount_point

OS="raspbian-stretch-armhf"
OS="raspbian-buster-armhf"

PIECES=(raspbian stretch armhf)
PIECES=(raspbian buster armhf)

PIEMAN_DIR="."

Expand Down Expand Up @@ -182,19 +182,19 @@ test_checking_if_debootstrap_is_uptodate() {
}
test_choosing_user_mode_emulation_binary() {
PIECES=(raspbian stretch armhf)
PIECES=(raspbian buster armhf)
choose_user_mode_emulation_binary
assertEquals "${TOOLSET_FULL_PATH}"/qemu-user-static/qemu-arm-static ${EMULATOR}
PIECES=(raspbian stretch arm64)
PIECES=(raspbian buster arm64)
choose_user_mode_emulation_binary
assertEquals "${TOOLSET_FULL_PATH}"/qemu-user-static/qemu-aarch64-static ${EMULATOR}
PIECES=(raspbian stretch mock)
PIECES=(raspbian buster mock)
local result=$((choose_user_mode_emulation_binary) 2>&1)
Expand Down Expand Up @@ -222,7 +222,7 @@ test_splitting_os_name_into_pieces() {
split_os_name_into_pieces
YML_FILE="${ROOT_DIR}/devices/rpi-3-b/${OS}/pieman.yml"
assertEquals "raspbian stretch armhf" "${PIECES[*]}"
assertEquals "raspbian buster armhf" "${PIECES[*]}"
OS="ubuntu-bionic-arm64"
YML_FILE="${ROOT_DIR}/devices/rpi-3-b/${OS}/pieman.yml"
Expand Down

0 comments on commit 2515652

Please sign in to comment.