diff --git a/config/noobs/OpenELEC.png b/config/noobs/OpenELEC.png new file mode 100644 index 0000000000..6a448a0a20 Binary files /dev/null and b/config/noobs/OpenELEC.png differ diff --git a/config/noobs/partitions.json b/config/noobs/partitions.json index e91964f1fb..02c2956273 100644 --- a/config/noobs/partitions.json +++ b/config/noobs/partitions.json @@ -1,20 +1,20 @@ { "partitions": [ { - "label": "System", - "filesystem_type": "FAT", - "partition_size_nominal: "128", - "want_maximised": "false", - "uncompressed_tarball_size": 128, - "mkfs_options": "" + "label": "System", + "filesystem_type": "FAT", + "partition_size_nominal": 128, + "want_maximised": false, + "uncompressed_tarball_size": 110, + "mkfs_options": "" }, { - "label": "Storage", - "filesystem_type": "ext4", - "partition_size_nominal: "864", - "want_maximised": "true", - "uncompressed_tarball_size": 512, - "mkfs_options": "" + "label": "Storage", + "filesystem_type": "ext4", + "partition_size_nominal": 864, + "want_maximised": true, + "uncompressed_tarball_size": 10, + "mkfs_options": "" } - ], + ] } diff --git a/config/noobs/slides/A.png b/config/noobs/slides/A.png new file mode 100644 index 0000000000..5a6cd34be6 Binary files /dev/null and b/config/noobs/slides/A.png differ diff --git a/config/noobs/slides/B.png b/config/noobs/slides/B.png new file mode 100644 index 0000000000..8a04088f13 Binary files /dev/null and b/config/noobs/slides/B.png differ diff --git a/config/noobs/slides/C.png b/config/noobs/slides/C.png new file mode 100644 index 0000000000..1732f5128b Binary files /dev/null and b/config/noobs/slides/C.png differ diff --git a/config/noobs/slides/D.png b/config/noobs/slides/D.png new file mode 100644 index 0000000000..ee2ae20854 Binary files /dev/null and b/config/noobs/slides/D.png differ diff --git a/config/noobs/slides/E.png b/config/noobs/slides/E.png new file mode 100644 index 0000000000..3c4779e017 Binary files /dev/null and b/config/noobs/slides/E.png differ diff --git a/config/noobs/slides_vga/A.png b/config/noobs/slides_vga/A.png new file mode 100644 index 0000000000..3433f7c2a4 Binary files /dev/null and b/config/noobs/slides_vga/A.png differ diff --git a/config/noobs/slides_vga/B.png b/config/noobs/slides_vga/B.png new file mode 100644 index 0000000000..2179b9ff5c Binary files /dev/null and b/config/noobs/slides_vga/B.png differ diff --git a/config/noobs/slides_vga/C.png b/config/noobs/slides_vga/C.png new file mode 100644 index 0000000000..e9dbcb1f0e Binary files /dev/null and b/config/noobs/slides_vga/C.png differ diff --git a/config/noobs/slides_vga/D.png b/config/noobs/slides_vga/D.png new file mode 100644 index 0000000000..1306648ba5 Binary files /dev/null and b/config/noobs/slides_vga/D.png differ diff --git a/config/noobs/slides_vga/E.png b/config/noobs/slides_vga/E.png new file mode 100644 index 0000000000..e948f543b0 Binary files /dev/null and b/config/noobs/slides_vga/E.png differ diff --git a/packages/lang/Python/build b/packages/lang/Python/build index 44e1ee00e5..6ccdedaad0 100755 --- a/packages/lang/Python/build +++ b/packages/lang/Python/build @@ -89,9 +89,8 @@ INCLUDE_DIRS="$INCLUDE_DIRS xml/parsers xml/sax wsgiref" mkdir -p ./Lib cp ../Lib/*.py ./Lib -for dirs in $INCLUDE_DIRS; do - mkdir -p ./Lib/$dirs - cp ../Lib/$dirs/*.py ./Lib/$dirs +for dir in $INCLUDE_DIRS; do + cp -a ../Lib/$dir ./Lib/ done python -Wi -t -B ../Lib/compileall.py ./Lib -f diff --git a/packages/mediacenter/xbmc/patches/xbmc-AML-XB9295c3f-03-show-all-removable-disks-mounted-under-media.patch b/packages/mediacenter/xbmc/patches/xbmc-AML-XB9295c3f-03-show-all-removable-disks-mounted-under-media.patch new file mode 100644 index 0000000000..7dd4bb8b2c --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-AML-XB9295c3f-03-show-all-removable-disks-mounted-under-media.patch @@ -0,0 +1,25 @@ +From 6d64d70a46b8f238d2706017a084f30bd681f291 Mon Sep 17 00:00:00 2001 +From: Stefan Saraev +Date: Sat, 31 Aug 2013 13:44:53 +0300 +Subject: [PATCH] show all removable disks mounted under /media + +--- + xbmc/storage/linux/UDevProvider.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/xbmc/storage/linux/UDevProvider.cpp b/xbmc/storage/linux/UDevProvider.cpp +index c20facc..c1044c8 100644 +--- a/xbmc/storage/linux/UDevProvider.cpp ++++ b/xbmc/storage/linux/UDevProvider.cpp +@@ -151,7 +151,7 @@ void CUDevProvider::GetDisks(VECSOURCES& disks, bool removable) + if (removable && + ((bus && strstr(bus, "usb")) || + (cdrom && strstr(cdrom,"1")) || +- (mountpoint && strstr(mountpoint, "usb")))) ++ (mountpoint))) + { + const char *label = udev_device_get_property_value(device, "ID_FS_LABEL"); + if (!label) +-- +1.7.2.5 + diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options index 476be7a4b8..77d3fc8e57 100755 --- a/projects/ARCTIC_MC/options +++ b/projects/ARCTIC_MC/options @@ -5,7 +5,7 @@ fi # short project description - DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org" + DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution." # Welcome Message for e.g. SSH Server (up to 5 Lines) GREETING0="##############################################" diff --git a/projects/ATV/options b/projects/ATV/options index d5c51fc917..b6c31a3367 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -5,7 +5,7 @@ fi # short project description - DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org" + DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution." # Welcome Message for e.g. SSH Server (up to 5 Lines) GREETING0="##############################################" diff --git a/projects/Fusion/options b/projects/Fusion/options index 694bf58c25..daa9d52ee2 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -5,7 +5,7 @@ fi # short project description - DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org" + DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution." # Welcome Message for e.g. SSH Server (up to 5 Lines) GREETING0="##############################################" diff --git a/projects/Generic/options b/projects/Generic/options index dd29e2d4f6..98f303baaa 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -5,7 +5,7 @@ fi # short project description - DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org" + DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution." # Welcome Message for e.g. SSH Server (up to 5 Lines) GREETING0="##############################################" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 78975f9a9e..b00f7a434e 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -5,7 +5,7 @@ fi # short project description - DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org" + DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution." # Welcome Message for e.g. SSH Server (up to 5 Lines) GREETING0="##############################################" diff --git a/projects/ION/options b/projects/ION/options index c113aafa1a..cbe829460f 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -5,7 +5,7 @@ fi # short project description - DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org" + DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution." # Welcome Message for e.g. SSH Server (up to 5 Lines) GREETING0="##############################################" diff --git a/projects/Intel/options b/projects/Intel/options index 7c9695a4d7..77a131c6e1 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -5,7 +5,7 @@ fi # short project description - DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org" + DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution." # Welcome Message for e.g. SSH Server (up to 5 Lines) GREETING0="##############################################" diff --git a/projects/RPi/options b/projects/RPi/options index 61f0701462..e73e7678c0 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -5,7 +5,7 @@ fi # short project description - DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org" + DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution." # Welcome Message for e.g. SSH Server (up to 5 Lines) GREETING0="##############################################" diff --git a/projects/Virtual/options b/projects/Virtual/options index 7acb1c37cc..9efbd9d3bd 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -5,7 +5,7 @@ fi # short project description - DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org" + DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution." # Welcome Message for e.g. SSH Server (up to 5 Lines) GREETING0="##############################################" diff --git a/scripts/image b/scripts/image index 145f5bd308..5fab510bb2 100755 --- a/scripts/image +++ b/scripts/image @@ -285,7 +285,6 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" cp $ROOT/README* $RELEASE_DIR cp $ROOT/CHANGELOG $RELEASE_DIR/release_notes.txt - cp -R $CONFIG/release/openelec.ico $RELEASE_DIR sed -e "s%@DISTRONAME@%$DISTRONAME%g" \ @@ -328,12 +327,12 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" mkdir -p $RELEASE_DIR/Storage # remove an previous created release tarball - rm -rf $RELEASE_DIR/System.tar.gz - rm -rf $RELEASE_DIR/Storage.tar.gz + rm -rf $RELEASE_DIR/System.tar.xz + rm -rf $RELEASE_DIR/Storage.tar.xz # create filesystem tarballs - tar czf $RELEASE_DIR/System.tar.gz -C $RELEASE_DIR/System/ . - tar czf $RELEASE_DIR/Storage.tar.gz -C $RELEASE_DIR/Storage/ . + tar cJf $RELEASE_DIR/System.tar.xz -C $RELEASE_DIR/System/ . + tar cJf $RELEASE_DIR/Storage.tar.xz -C $RELEASE_DIR/Storage/ . # remove an filesystem dirs rm -rf $RELEASE_DIR/System @@ -348,4 +347,3 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" # cleanup release dir rm -rf $RELEASE_DIR fi -