Merge pull request #4 from LaurentMarchelli/rasplex

Ready for version 1.0.0

README.md

@@ -12,7 +12,8 @@ Recalbox-rasplex is a hack of Buildroot (https://buildroot.org/) using its scrip
   - v4.0.0-beta5 (default)
   - v4.0 last unstable build
   - v4.1 last unstable build
-- Rasplex v1.6.2
+- Rasplex (one of following) 
+  - v1.6.2
 
 ## System requirements
 Because recalbox-rasplex is made on Buildroot, it is designed to run on Linux Systems.
@@ -34,41 +35,58 @@ make menuconfig
 ```
 4 - Select your hardware (Target Architecture)
 ```
-- Raspberry Pi 1 Model B+
+- Raspberry Pi 3 Model B (default)
 - Raspberry Pi 2 Model B
-- Raspberry Pi 3 Model B
+- Raspberry Pi 1 Model B+
 ```
 5 - Select your Powerswitch hardware
 ```
-- None
+- RemotePi Board for Pi3, Pi 2 and B+ (default)
 - RemotePi Board 2013
-- RemotePi Board for Pi3, Pi 2 and B+
+- None
 ```
 Further informations at http://www.msldigital.com/
 
-6 - Select your Recalbox Version
+6 - Select your Rasplex Version
 ```
-- Version 4.0 - Stable
-- Version 4.0 - Unstable
-- Version 4.1 - Unstable
-- None
+- 1.6.2 - Stable (default)
 ```
-7 - Select further available options
 
-8 - Build NOOBS needed files
+7 - Select your Rasplex skin
+```
+- Aeon Nox 5 - Custom (default)
+- OpenPHT - Standard
+```
+
+8 - Select your Recalbox-OS Version
+```
+- 4.0 - Stable (default)
+- 4.0 - Unstable
+- 4.1 - Unstable
+```
+
+9 - Build NOOBS needed files
 ```bash
 make
 ```
-9 - Format a SD-Card with a unique Fat-32 bits partition in a msdos partition table
+10 - Format a SD-Card with a unique Fat-32 bits partition in a msdos partition table
 
-10 - Copy the content of the ./output/target directory into your SD-Card
+11 - Copy the content of the ./output/target directory into your SD-Card
 
-11 - Insert the SD-Card into the Raspberry Pi
+12 - Insert the SD-Card into the Raspberry Pi
 
-11 - Boot and select NOOBS options.
+13 - Boot and select NOOBS options.
 
 https://github.com/raspberrypi/noobs
 
+## How it works
+If you selected both Rasplex and Recalbox-OS and you choose the customized skin (Aeon Nox 5) :
+- On Rasplex, you will have a new button (section) to reboot on Recalbox-OS
+- On Recalbox-OS to reboot on Rasplex, just reboot.
+(If Recalbox updates are downloaded, it will reboot on Recalbox-OS to finish the update)
+
+If you selected both Rasplex and Recalbox-OS and you choose the standard skin (OpenPHT) you will have the noobs main menu to select which partittion you want to boot.
+
 ## Licenses
 ### BuildRoot 
 GNU GENERAL PUBLIC LICENSE Version 2, June 1991

arch/Config.in

@@ -1,30 +1,30 @@
 choice
     prompt "Target Architecture"
-    default BR2_ARCH_RPI2
+    default BR2_ARCH_RPI3
     help
       Select the target architecture family to build for.
-      
-config BR2_ARCH_RPI1
-    bool "Raspberry Pi 1 Model B+"
+
+config BR2_ARCH_RPI3
+    bool "Raspberry Pi 3 Model B"
     help
-      The Model B+ is the final revision of the original Raspberry Pi.
-      It replaced the Model B in July 2014 and was superseded by the 
-      Raspberry Pi 2 Model B in February 2015.
-      Is has a 700MHz ARM 11 CPU and 512MB RAM.
+      The Raspberry Pi 3 is the third generation Raspberry Pi. 
+      It replaced the Raspberry Pi 2 Model B in February 2016. 
+      It has a 1.2GHz 64-bit quad-core ARMv8 CPU and 1GB RAM.
 
 config BR2_ARCH_RPI2
     bool "Raspberry Pi 2 Model B"
     help
       The Raspberry Pi 2 Model B is the second generation Raspberry Pi. 
       It replaced the original Raspberry Pi 1 Model B+ in February 2015. 
       Is has a 900MHz quad-core ARM Cortex-A7 CPU and 1GB RAM.
-      
-config BR2_ARCH_RPI3
-    bool "Raspberry Pi 3 Model B"
+
+config BR2_ARCH_RPI1
+    bool "Raspberry Pi 1 Model B+"
     help
-      The Raspberry Pi 3 is the third generation Raspberry Pi. 
-      It replaced the Raspberry Pi 2 Model B in February 2016. 
-      It has a 1.2GHz 64-bit quad-core ARMv8 CPU and 1GB RAM.
+      The Model B+ is the final revision of the original Raspberry Pi.
+      It replaced the Model B in July 2014 and was superseded by the 
+      Raspberry Pi 2 Model B in February 2015.
+      Is has a 700MHz ARM 11 CPU and 512MB RAM.
 
 endchoice
 
@@ -37,32 +37,31 @@ config BR2_ARCH
 choice
     prompt "Powerswitch Hardware"
     default BR2_ARCH_POWERSWITCH_REMOTEPI_2015
-
-config BR2_ARCH_POWERSWITCH_NONE
-    bool "None"
-    help
-      Select this option if your powerswitch cannot be selected in the 
-      list.
 
-config BR2_ARCH_POWERSWITCH_REMOTEPI_2013
-    bool "RemotePi Board 2013"
+config BR2_ARCH_POWERSWITCH_REMOTEPI_2015
+    bool "RemotePi Board for Pi3, Pi 2 and B+"
     help
         The RemotePi Board is an intelligent infrared remote controlled 
         power switch for the Raspberry Pi. 
         It is mainly intended to remote control and power off/on a media 
         center system (i.e LibreELEC, OpenELEC, OSMC, XBian, RasPlex, 
         Raspbian, Volumio, ...).
-        http://www.msldigital.com/pages/support-for-remotepi-board-2013
+        http://www.msldigital.com/pages/support-for-remotepi-board-plus-2015
 
-config BR2_ARCH_POWERSWITCH_REMOTEPI_2015
-    bool "RemotePi Board for Pi3, Pi 2 and B+"
+config BR2_ARCH_POWERSWITCH_REMOTEPI_2013
+    bool "RemotePi Board 2013"
     help
         The RemotePi Board is an intelligent infrared remote controlled 
         power switch for the Raspberry Pi. 
         It is mainly intended to remote control and power off/on a media 
         center system (i.e LibreELEC, OpenELEC, OSMC, XBian, RasPlex, 
         Raspbian, Volumio, ...).
-        http://www.msldigital.com/pages/support-for-remotepi-board-plus-2015
-
+        http://www.msldigital.com/pages/support-for-remotepi-board-2013
+
+config BR2_ARCH_POWERSWITCH_NONE
+    bool "None"
+    help
+      Select this option if your powerswitch cannot be selected in the 
+      list.
 
 endchoice

package/Config.in

@@ -1,3 +1,8 @@
 source "package/noobs/Config.in"
 source "package/rasplex/Config.in"
 source "package/recalboxOS/Config.in"
+
+config BR2_PACKAGE_RECALPLEX
+    bool
+    default BR2_PACKAGE_RASPLEX && BR2_PACKAGE_RASPLEX_SKIN_AEONNOX && \
+            BR2_PACKAGE_RECALBOXOS

package/rasplex/Config.in

@@ -7,3 +7,52 @@ config BR2_PACKAGE_RASPLEX
       updates pushed out as they become available.
 
       http://www.rasplex.com
+
+#####################################################################
+#                       Version Selector
+#####################################################################
+choice
+    prompt "Version"
+    default BR2_PACKAGE_RASPLEX_STABLE
+    depends on BR2_PACKAGE_RASPLEX
+
+config BR2_PACKAGE_RASPLEX_STABLE
+    bool "1.6.2 - Stable"
+    help
+      The last stable version from : 
+      https://github.com/RasPlex/RasPlex/releases
+
+endchoice
+
+#####################################################################
+#                       Skin Selector
+#####################################################################
+choice
+    prompt "Custom Skin"
+    default BR2_PACKAGE_RASPLEX_SKIN_AEONNOX
+    depends on BR2_PACKAGE_RASPLEX
+
+config BR2_PACKAGE_RASPLEX_SKIN_AEONNOX
+    bool "Aeon Nox 5 - Custom"
+    help
+      Skin customized with a Recalbox Section to automatically reboot to 
+      Recalbox partiton.
+
+      Aeon Nox for Plex Home Theater by MagnumDoomguy
+
+      Aeon Nox 5 for Plex has 28 different viewtypes, an intuitive and
+      graceful GUI and lots of configuration options.
+      Completely redesigned to create a modern look, while retaining 
+      the classic Aeon feel.  Modified to run on Plex Home Theater.
+
+      https://github.com/magnumdoomguy/skin.aeon.nox.5
+
+config BR2_PACKAGE_RASPLEX_SKIN_OPENPHT
+    bool "OpenPHT - Standard"
+    help
+      No change is made on the skin configuration.
+
+      Default OpenPHT Skin
+      http://www.rasplex.com/
+
+endchoice

package/rasplex/noobs/partition_setup.txt

@@ -0,0 +1,4 @@
+
+# create autoboot switch file for recalbox-rasplex\
+boot_num=$(echo "$part1" | sed -e "s|/dev/mmcblk0p\([0-9]*\).*$|\1|")
+echo boot_partition=$boot_num > /settings/autoboot_rasplex.txt

package/rasplex/_resources/rpi/partitions.json → package/rasplex/noobs/rpi/partitions.json

@@ -11,7 +11,7 @@
     {
       "label":                     "plexdata",
       "filesystem_type":           "ext4",
-      "partition_size_nominal":    512,
+      "partition_size_nominal":    1024,
       "want_maximised":            false,
       "uncompressed_tarball_size": 1,
       "mkfs_options":              ""