From aad1196baf300c08bae4d467324a8e857a207196 Mon Sep 17 00:00:00 2001
From: Daniel Gachet <daniel.gachet@hefr.ch>
Date: Tue, 1 Sep 2020 00:33:42 -0700
Subject: [PATCH] wip
---
config/buildroot_nano.patch | 48 ++++++++---------------------------
install-fedora-environment.sh | 36 +++++++++++++-------------
install-ubuntu-environment.sh | 22 ++++++++--------
3 files changed, 39 insertions(+), 67 deletions(-)
diff --git a/config/buildroot_nano.patch b/config/buildroot_nano.patch
index 6b567b5..4c27ce8 100644
--- a/config/buildroot_nano.patch
+++ b/config/buildroot_nano.patch
@@ -1,13 +1,11 @@
board/friendlyarm/nanopi-neo-plus2/boot.cmd | 6 ++
- board/friendlyarm/nanopi-neo-plus2/genimage.cfg | 4 +-
+ board/friendlyarm/nanopi-neo-plus2/genimage.cfg | 5 +-
.../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 +++++++++++++---------
package/dropbear/S50dropbear | 2 +-
package/openssh/S50sshd | 3 +
- 9 files changed, 104 insertions(+), 43 deletions(-)
+ 7 files changed, 85 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
@@ -22,7 +20,7 @@ index 0000000000..ec83aa9ef3
+
+booti $kernel_addr_r - $fdt_addr_r
diff --git a/board/friendlyarm/nanopi-neo-plus2/genimage.cfg b/board/friendlyarm/nanopi-neo-plus2/genimage.cfg
-index fb871abd43..bf6f68872d 100644
+index fb871abd43..1f87767431 100644
--- a/board/friendlyarm/nanopi-neo-plus2/genimage.cfg
+++ b/board/friendlyarm/nanopi-neo-plus2/genimage.cfg
@@ -2,8 +2,8 @@ image boot.vfat {
@@ -36,6 +34,13 @@ index fb871abd43..bf6f68872d 100644
}
}
size = 64M
+@@ -35,5 +35,6 @@ image sdcard.img {
+ partition rootfs {
+ partition-type = 0x83
+ image = "rootfs.ext4"
++ size = 2G
+ }
+ }
diff --git a/board/friendlyarm/nanopi-neo-plus2/linux-extras.config b/board/friendlyarm/nanopi-neo-plus2/linux-extras.config
index 52b4b4b29e..2ea8b06bc2 100644
--- a/board/friendlyarm/nanopi-neo-plus2/linux-extras.config
@@ -68,39 +73,6 @@ 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
--- a/configs/friendlyarm_nanopi_neo_plus2_defconfig
diff --git a/install-fedora-environment.sh b/install-fedora-environment.sh
index c295377..eb1775c 100755
--- a/install-fedora-environment.sh
+++ b/install-fedora-environment.sh
@@ -28,14 +28,14 @@ sudo dnf install -y git-gui meld
sudo dnf install -y git-credential-libsecret
git config --global credential.helper /usr/libexec/git-core/git-credential-libsecret
-#install eclipse IDE
-if [ ! -d "/opt/eclipse" ]; then
-wget http://mirrors.uniri.hr/eclipse//technology/epp/downloads/release/photon/R/eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz
-sudo tar xf eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz -C /opt
-sudo ln -s /opt/eclipse/eclipse /usr/bin/eclipse
-rm eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz
-fi
-cp ${SCRIPTDIR}/config/eclipse.desktop ~/.local/share/applications/
+# #install eclipse IDE
+# if [ ! -d "/opt/eclipse" ]; then
+# wget http://mirrors.uniri.hr/eclipse//technology/epp/downloads/release/photon/R/eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz
+# sudo tar xf eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz -C /opt
+# sudo ln -s /opt/eclipse/eclipse /usr/bin/eclipse
+# rm eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz
+# fi
+# cp ${SCRIPTDIR}/config/eclipse.desktop ~/.local/share/applications/
#install tftpd server
sudo dnf install -y tftp-server xinetd
@@ -57,13 +57,13 @@ sudo firewall-cmd --permanent --zone FedoraWorkstation --add-service tftp
sudo firewall-cmd --permanent --zone FedoraWorkstation --add-service rpc-bind
sudo firewall-cmd --reload
-echo ""
-echo "How to fix Flickering in Fedora on Virtualbox"
-echo "according to https://www.serverlab.ca/tutorials/linux/administration-linux/how-to-fix-flickering-in-fedora-on-virtualbox/"
-echo ""
-echo "edit file : /etc/gdm/custom.conf"
-echo "under '[DAEMON]':"
-echo " - uncomment variable 'WaylandEnable' and ensure it is set to 'false'"
-echo " - add line 'DefaultSession=gnome=xorg.desktop'"
-echo "save the file and restart"
-echo ""
+# echo ""
+# echo "How to fix Flickering in Fedora on Virtualbox"
+# echo "according to https://www.serverlab.ca/tutorials/linux/administration-linux/how-to-fix-flickering-in-fedora-on-virtualbox/"
+# echo ""
+# echo "edit file : /etc/gdm/custom.conf"
+# echo "under '[DAEMON]':"
+# echo " - uncomment variable 'WaylandEnable' and ensure it is set to 'false'"
+# echo " - add line 'DefaultSession=gnome=xorg.desktop'"
+# echo "save the file and restart"
+# echo ""
diff --git a/install-ubuntu-environment.sh b/install-ubuntu-environment.sh
index 20163a2..c64e55f 100755
--- a/install-ubuntu-environment.sh
+++ b/install-ubuntu-environment.sh
@@ -29,17 +29,17 @@ sudo apt install -y libsecret-1-0 libsecret-1-dev
sudo make -C /usr/share/doc/git/contrib/credential/libsecret
git config --global credential.helper /usr/share/doc/git/contrib/credential/libsecret/git-credential-libsecret
-#install java environment
-sudo apt install -y default-jre
-
-#install eclipse IDE
-if [ ! -d "/opt/eclipse" ]; then
-wget http://mirrors.uniri.hr/eclipse//technology/epp/downloads/release/photon/R/eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz
-sudo tar xf eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz -C /opt
-sudo ln -s /opt/eclipse/eclipse /usr/bin/eclipse
-rm eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz
-fi
-cp ${SCRIPTDIR}/config/eclipse.desktop ~/.local/share/applications/
+# #install java environment
+# sudo apt install -y default-jre
+
+# #install eclipse IDE
+# if [ ! -d "/opt/eclipse" ]; then
+# wget http://mirrors.uniri.hr/eclipse//technology/epp/downloads/release/photon/R/eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz
+# sudo tar xf eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz -C /opt
+# sudo ln -s /opt/eclipse/eclipse /usr/bin/eclipse
+# rm eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz
+# fi
+# cp ${SCRIPTDIR}/config/eclipse.desktop ~/.local/share/applications/
#install tftpd server
sudo apt install -y xinetd tftpd tftp
--
GitLab