From 8ca448ad1f1c4660751e1a9f6d183d9385c822ad Mon Sep 17 00:00:00 2001 From: KOSHIKAWA Kenichi Date: Thu, 26 Aug 2021 21:57:59 +0900 Subject: [PATCH 1/6] Upgrade from buster to bullseye --- Makefile | 4 ++-- README.md | 2 +- os-brainux/override/usr/lib/os-release | 8 ++++---- os-brainux/setup_brainux.sh | 24 ++++++++++++------------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index b7895f0..dc97476 100644 --- a/Makefile +++ b/Makefile @@ -112,9 +112,9 @@ brainux: mkdir -p brainux @if [ "$(CI)" = "true" ]; then \ echo "I'm in CI and debootstrap without cache."; \ - sudo debootstrap --arch=armel --foreign buster brainux/; \ + sudo debootstrap --arch=armel --foreign bullseye brainux/; \ else \ - sudo debootstrap --arch=armel --foreign buster brainux/ http://localhost:65432/debian/; \ + sudo debootstrap --arch=armel --foreign bullseye brainux/ http://localhost:65432/debian/; \ fi sudo cp /usr/bin/qemu-arm-static brainux/usr/bin/ sudo cp ./os-brainux/setup_brainux.sh brainux/ diff --git a/README.md b/README.md index 994ec9e..15f7266 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ Build Linux 1. Confirm that `linux-brain/arch/arm/boot/zImage` exists. -Bootstrap Debian 10 (buster) +Bootstrap Debian 11 (bullseye) ---------------------------- 1. Run `make ldefconfig lbuild`. diff --git a/os-brainux/override/usr/lib/os-release b/os-brainux/override/usr/lib/os-release index e60947d..ec1f499 100644 --- a/os-brainux/override/usr/lib/os-release +++ b/os-brainux/override/usr/lib/os-release @@ -1,8 +1,8 @@ -PRETTY_NAME="Brainux GNU/Linux 10 (buster)" +PRETTY_NAME="Brainux GNU/Linux 11 (bullseye)" NAME="Brainux GNU/Linux" -VERSION_ID="10" -VERSION="10 (buster)" -VERSION_CODENAME=buster +VERSION_ID="11" +VERSION="11 (bullseye)" +VERSION_CODENAME=bullseye ID=debian HOME_URL="https://github.com/brain-hackers/README" SUPPORT_URL="https://github.com/brain-hackers/buildbrain" diff --git a/os-brainux/setup_brainux.sh b/os-brainux/setup_brainux.sh index bdbaa10..5780d77 100755 --- a/os-brainux/setup_brainux.sh +++ b/os-brainux/setup_brainux.sh @@ -20,12 +20,12 @@ else fi cat < /etc/apt/sources.list -deb http://${REPO}/debian buster main contrib non-free -deb-src http://${REPO}/debian buster main contrib non-free -deb http://${REPO}/debian buster-updates main contrib non-free -deb-src http://${REPO}/debian buster-updates main contrib non-free -deb http://${REPO_SECURITY}/debian-security buster/updates main contrib non-free -deb-src http://${REPO_SECURITY}/debian-security buster/updates main contrib non-free +deb http://${REPO}/debian bullseye main contrib non-free +deb-src http://${REPO}/debian bullseye main contrib non-free +deb http://${REPO}/debian bullseye-updates main contrib non-free +deb-src http://${REPO}/debian bullseye-updates main contrib non-free +deb http://${REPO_SECURITY}/debian-security bullseye/updates main contrib non-free +deb-src http://${REPO_SECURITY}/debian-security bullseye/updates main contrib non-free EOF cat < /etc/apt/apt.conf.d/90-norecommend @@ -104,11 +104,11 @@ EOF # Get wild cat < /etc/apt/sources.list -deb http://deb.debian.org/debian buster main contrib non-free -deb-src http://deb.debian.org/debian buster main contrib non-free -deb http://deb.debian.org/debian buster-updates main contrib non-free -deb-src http://deb.debian.org/debian buster-updates main contrib non-free -deb http://deb.debian.org/debian-security buster/updates main contrib non-free -deb-src http://deb.debian.org/debian-security buster/updates main contrib non-free +deb http://deb.debian.org/debian bullseye main contrib non-free +deb-src http://deb.debian.org/debian bullseye main contrib non-free +deb http://deb.debian.org/debian bullseye-updates main contrib non-free +deb-src http://deb.debian.org/debian bullseye-updates main contrib non-free +deb http://deb.debian.org/debian-security bullseye/updates main contrib non-free +deb-src http://deb.debian.org/debian-security bullseye/updates main contrib non-free EOF From c59b6d7738fc3ea5f34e4b62aaffd6106b0e77d6 Mon Sep 17 00:00:00 2001 From: KOSHIKAWA Kenichi Date: Thu, 26 Aug 2021 22:05:29 +0900 Subject: [PATCH 2/6] fixup! Upgrade from buster to bullseye --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 15f7266..d2990a9 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ Build Linux Bootstrap Debian 11 (bullseye) ----------------------------- +------------------------------ 1. Run `make ldefconfig lbuild`. From 23790bcf20f68d320861c0f02c94d006ed883dbf Mon Sep 17 00:00:00 2001 From: Takumi Sueda Date: Tue, 7 Dec 2021 20:35:10 +0900 Subject: [PATCH 3/6] Fix setup of systemd in chroot-ed environment --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dc97476..3cfb9e5 100644 --- a/Makefile +++ b/Makefile @@ -109,7 +109,7 @@ brainux: echo "Debootstrap is only available in Linux!"; \ exit 1; \ fi - mkdir -p brainux + sudo mkdir -p brainux @if [ "$(CI)" = "true" ]; then \ echo "I'm in CI and debootstrap without cache."; \ sudo debootstrap --arch=armel --foreign bullseye brainux/; \ From 9c56c4175ae45c68a0125065857290b94598a39e Mon Sep 17 00:00:00 2001 From: Takumi Sueda Date: Tue, 7 Dec 2021 20:35:28 +0900 Subject: [PATCH 4/6] Correct repository path --- os-brainux/setup_brainux.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/os-brainux/setup_brainux.sh b/os-brainux/setup_brainux.sh index 5780d77..2591d11 100755 --- a/os-brainux/setup_brainux.sh +++ b/os-brainux/setup_brainux.sh @@ -24,8 +24,8 @@ deb http://${REPO}/debian bullseye main contrib non-free deb-src http://${REPO}/debian bullseye main contrib non-free deb http://${REPO}/debian bullseye-updates main contrib non-free deb-src http://${REPO}/debian bullseye-updates main contrib non-free -deb http://${REPO_SECURITY}/debian-security bullseye/updates main contrib non-free -deb-src http://${REPO_SECURITY}/debian-security bullseye/updates main contrib non-free +deb http://${REPO_SECURITY}/debian-security bullseye-security/updates main contrib non-free +deb-src http://${REPO_SECURITY}/debian-security bullseye-security/updates main contrib non-free EOF cat < /etc/apt/apt.conf.d/90-norecommend @@ -108,7 +108,7 @@ deb http://deb.debian.org/debian bullseye main contrib non-free deb-src http://deb.debian.org/debian bullseye main contrib non-free deb http://deb.debian.org/debian bullseye-updates main contrib non-free deb-src http://deb.debian.org/debian bullseye-updates main contrib non-free -deb http://deb.debian.org/debian-security bullseye/updates main contrib non-free -deb-src http://deb.debian.org/debian-security bullseye/updates main contrib non-free +deb http://deb.debian.org/debian-security bullseye-security/updates main contrib non-free +deb-src http://deb.debian.org/debian-security bullseye-security/updates main contrib non-free EOF From 04987d37921d952deda9636c0f6bd05081295e66 Mon Sep 17 00:00:00 2001 From: Takumi Sueda Date: Tue, 7 Dec 2021 21:07:56 +0900 Subject: [PATCH 5/6] Specify LANG env to prevent warnings --- os-brainux/setup_brainux.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/os-brainux/setup_brainux.sh b/os-brainux/setup_brainux.sh index 2591d11..a6d9817 100755 --- a/os-brainux/setup_brainux.sh +++ b/os-brainux/setup_brainux.sh @@ -43,6 +43,8 @@ echo "$TIMEZONE" > /etc/timezone && \ dpkg-reconfigure -f noninteractive locales && \ update-locale LANG=en_US.UTF-8 +LANG=en_US.UTF-8 + rm /etc/localtime ln -s /usr/share/zoneinfo/Asia/Tokyo /etc/localtime From 12a69402c6893b446cb0cbf05820fc0c3fd01e8a Mon Sep 17 00:00:00 2001 From: Takumi Sueda Date: Tue, 7 Dec 2021 21:08:10 +0900 Subject: [PATCH 6/6] Remove openbox and friends --- os-brainux/setup_brainux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os-brainux/setup_brainux.sh b/os-brainux/setup_brainux.sh index a6d9817..3f919e4 100755 --- a/os-brainux/setup_brainux.sh +++ b/os-brainux/setup_brainux.sh @@ -53,7 +53,7 @@ DEBIAN_FRONTEND=noninteractive \ apt install -y dialog sudo \ libjpeg-dev libfreetype6 libfreetype6-dev zlib1g-dev \ xserver-xorg xserver-xorg-video-fbdev xserver-xorg-dev xserver-xorg-input-evdev xinput-calibrator xorg-dev x11-apps xinit \ - openbox obconf obmenu jwm \ + jwm \ weston xwayland \ bash tmux vim htop \ midori pcmanfm lxterminal xterm gnome-terminal fbterm uim-fep uim-anthy fonts-noto-cjk \