From 32517423426899788845b1c7809287e708f46165 Mon Sep 17 00:00:00 2001
From: Daniel Gachet <daniel.gachet@hefr.ch>
Date: Tue, 1 Sep 2020 14:24:41 +0200
Subject: [PATCH] wip
---
config/buildroot_nano.patch | 48 ++++++-----------------------------
install-fedora-environment.sh | 5 ++++
2 files changed, 13 insertions(+), 40 deletions(-)
diff --git a/config/buildroot_nano.patch b/config/buildroot_nano.patch
index 6b567b5..a48b854 100644
--- a/config/buildroot_nano.patch
+++ b/config/buildroot_nano.patch
@@ -2,12 +2,10 @@
board/friendlyarm/nanopi-neo-plus2/genimage.cfg | 4 +-
.../nanopi-neo-plus2/linux-extras.config | 11 +++
.../nanopi-neo-plus2/nanopi-neo-plus2.dts | 7 ++
- .../nanopi-neo-plus2/rootfs_overlay/etc/fstab | 10 +++
- .../rootfs_overlay/etc/network/interfaces | 10 +++
- configs/friendlyarm_nanopi_neo_plus2_defconfig | 94 +++++++++++++---------
+ configs/friendlyarm_nanopi_neo_plus2_defconfig | 97 +++++++++++++---------
package/dropbear/S50dropbear | 2 +-
package/openssh/S50sshd | 3 +
- 9 files changed, 104 insertions(+), 43 deletions(-)
+ 7 files changed, 87 insertions(+), 43 deletions(-)
diff --git a/board/friendlyarm/nanopi-neo-plus2/boot.cmd b/board/friendlyarm/nanopi-neo-plus2/boot.cmd
new file mode 100644
@@ -68,44 +66,11 @@ index 0000000000..f80383b0ff
+/ {
+ /delete-node/ leds;
+};
-diff --git a/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/etc/fstab b/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/etc/fstab
-new file mode 100644
-index 0000000000..970cea4fcc
---- /dev/null
-+++ b/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/etc/fstab
-@@ -0,0 +1,10 @@
-+# <file system> <mount pt> <type> <options> <dump> <pass>
-+/dev/root / ext2 rw,noauto 0 1
-+proc /proc proc defaults 0 0
-+devpts /dev/pts devpts defaults,gid=5,mode=620,ptmxmode=0666 0 0
-+tmpfs /dev/shm tmpfs mode=0777 0 0
-+tmpfs /tmp tmpfs mode=1777 0 0
-+tmpfs /run tmpfs mode=0755,nosuid,nodev 0 0
-+sysfs /sys sysfs defaults 0 0
-+192.168.0.4:/home/lmi/workspace /usr/workspace nfs hard,nolock 0 0
-+/dev/mmcblk0p1 /usr/vfat vfat defaults 0 0
-diff --git a/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/etc/network/interfaces b/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/etc/network/interfaces
-new file mode 100644
-index 0000000000..1c9a9e2625
---- /dev/null
-+++ b/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/etc/network/interfaces
-@@ -0,0 +1,10 @@
-+# interface file auto-generated by buildroot
-+
-+auto lo
-+iface lo inet loopback
-+
-+auto eth0
-+iface eth0 inet static
-+ address 192.168.0.14
-+ netmask 255.255.255.0
-+ gateway 192.168.0.4
-\ No newline at end of file
diff --git a/configs/friendlyarm_nanopi_neo_plus2_defconfig b/configs/friendlyarm_nanopi_neo_plus2_defconfig
-index 461e468cb6..28f8db92b2 100644
+index 461e468cb6..23ed244b7e 100644
--- a/configs/friendlyarm_nanopi_neo_plus2_defconfig
+++ b/configs/friendlyarm_nanopi_neo_plus2_defconfig
-@@ -1,24 +1,66 @@
+@@ -1,24 +1,69 @@
BR2_aarch64=y
-BR2_cortex_a53=y
BR2_ARM_FPU_VFPV4=y
@@ -130,6 +95,9 @@ index 461e468cb6..28f8db92b2 100644
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_PACKAGE_LINUX_TOOLS_PERF=y
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
++BR2_PACKAGE_GDB=y
++BR2_PACKAGE_GDB_SERVER=y
++BR2_PACKAGE_GDB_DEBUGGER=y
+BR2_PACKAGE_LTRACE=y
+BR2_PACKAGE_STRACE=y
+BR2_PACKAGE_VALGRIND=y
@@ -182,7 +150,7 @@ index 461e468cb6..28f8db92b2 100644
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo_plus2"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
-@@ -27,36 +69,8 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+@@ -27,36 +72,8 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
diff --git a/install-fedora-environment.sh b/install-fedora-environment.sh
index c295377..0dda7dc 100755
--- a/install-fedora-environment.sh
+++ b/install-fedora-environment.sh
@@ -23,6 +23,11 @@ sudo dnf install -y gnome-tweak-tool firewall-config kernel-devel libyaml-devel
sudo dnf install -y gcc-c++ autoconf libtool dtc make patch ctags openssl-devel uboot-tools ncurses-devel mercurial
sudo dnf install -y flex bison swig python-devel python3-devel policycoreutils-python-utils perl-ExtUtils-MakeMaker
+## make additional symbolic links for former libraries used by aarch64 gdb
+## probably to be removed with newest buildroot version
+sudo ln -s /usr/lib64/libtinfo.so.6.1 /usr/lib64/libtinfo.so.5
+sudo ln -s /usr/lib64/libncursesw.so.6.1 /usr/lib64/libncursesw.so.5
+
#install git tools and configure keyring
sudo dnf install -y git-gui meld
sudo dnf install -y git-credential-libsecret
--
GitLab