diff --git a/BUILDME.sh b/BUILDME.sh
index 244ab66f9..9184c151b 100755
--- a/BUILDME.sh
+++ b/BUILDME.sh
@@ -152,6 +152,20 @@ for i in $*; do
if [ $i = "nobuild" ]; then
exit
fi
+
+ if [ $i = "help" ]; then
+ echo "Options:"
+ echo "update-firmware"
+ echo "update-userland"
+ echo "update-kernel"
+ echo "update-ts"
+ echo "skip-kernel-rebuild"
+ echo "skip-kernel-6"
+ echo "skip-kernel-7"
+ echo "skip-recovery-rebuild"
+ echo "nobuild"
+ exit
+ fi
done
if [ $SKIP_RECOVERY_REBUILD -ne 1 ]; then
diff --git a/README.md b/README.md
index 96f0e5203..7844d6914 100644
--- a/README.md
+++ b/README.md
@@ -1,355 +1,396 @@
-# NOOBS (New Out of Box Software)
-#### An easy Operating System installer for the Raspberry Pi
-
-NOOBS is designed to make it easy to select and install operating systems for the Raspberry Pi without having to worry about manually imaging your SD card.
-
-The latest official release of NOOBS can be downloaded from http://downloads.raspberrypi.org/NOOBS_latest
-
-For information on previous releases and version changelists, visit https://github.com/raspberrypi/noobs/releases
-
-
-
-*NOTE: The list of OSes in this image is indicative only. It will vary according to your Raspberry Pi model and the availability of OSes on our remote download repository.
-
-### About
-On first boot NOOBS will format your SD card and allow you to select which OSes you want to install from a list. This OS list is automatically generated from both locally available OSes (i.e. those contained in the `/os` directory on disk) or those available from our remote repository (network connection required).
-
-Only the latest version of each OS will ever be displayed meaning that you can be sure that you have installed the most up-to-date release of your selected OS.
-
-On any subsequent boot you can then press the SHIFT key to enter the NOOBS interface and easily reinstall your choice of OSes.
-
-The NOOBS interface provides the following functionality:
-- Install : Installs the selected OSes onto your SD card. Changing this selection erases all OSes currently installed.
-- Edit Config : Opens a text editor allowing the cmdline and config for the selected installed OS to be edited.
-- Online Help : [Networking Required] Open a browser that displays the Raspberry Pi Help page ( http://www.raspberrypi.org/help/ ), allowing people to quickly access help and troubleshooting.
-- Exit : Quits NOOBS and reboots the Pi into the OS boot menu.
-- Language Selection : Allows you to select the language to be displayed.
-- Keyboard Layout Selection : Allows you to select the keyboard layout to be used.
-- Display Mode Selection : By default, NOOBS will output over HDMI at your display's preferred resolution, even if no HDMI display is connected. If you do not see any output on your HDMI display or are using the composite output, press 1, 2, 3 or 4 on your keyboard to select HDMI preferred mode, HDMI safe mode, composite PAL mode or composite NTSC mode respectively.
-
-Note that all user settings (language, keyboard layout, display mode) will persist between reboots and will also be automatically passed to the installed OSes. This means that if you can see the NOOBS interface on your display device then you should be able to see the OS CLI/GUI when it boots too!
-### Setup
-
-To set up a blank SD card with NOOBS:
-- Format an SD card that is 8GB or greater in size as FAT32 (see instructions on how to do this below)
-- Download and extract the files from the NOOBS zip file. (Windows built-in zip features may have trouble with this file. If so, use another program such as [7zip](http://www.7-zip.org/).)
-- Copy the extracted files onto the SD card that you just formatted so that this file is at the root directory of the SD card.
- Please note that in some cases it may extract the files into a folder, if this is the case then please copy across the files from inside the folder rather than the folder itself.
-
-On first boot the "RECOVERY" FAT partition will be automatically resized to a minimum and a list of OSes that are available to install will be displayed.
-
-### Operating System Choice
-
-NOOBS is available in 2 formats:
-- `NOOBS Full` includes the installation files for Raspbian only.
-- `NOOBS-Lite` does not include any Operating Systems at all.
-
-#### OS Network Download
-
-Both versions of NOOBS allow additional Operating Systems to be downloaded from our remote repository. To do this, the Raspberry Pi must be connected to a wired network, or it can connect over Wifi using the [Raspberry Pi USB wifi dongle](https://www.raspberrypi.org/products/usb-wifi-dongle/) or the Raspberry Pi 3 Model B built-in wifi.
-
-Once connected, the Pi will only show a list of Operating Systems that are appropriate to your Pi Model. If you want to see ALL available OSes, edit the `recovery.cmdline` file in the root NOOBS directory and append `showall` to the arguments list.
-
-#### Wired Networks
-
-If a wired ethernet cable is plugged into the Pi before NOOBS starts, NOOBS will connect via DHCP to our remote download repository and present a list of available Operating Systems that are available for installation.
-
-#### Wifi Networks
-
-If you have the official [Raspberry Pi USB wifi Dongle](https://www.raspberrypi.org/products/usb-wifi-dongle/), or are using the Raspberry Pi 3 Model B with built-in wifi, the wifi icon on the NOOBS toolbar will be available. Click on this to select your Wifi SSID network and enter the wifi password.
-
-
-
-### How to Format an SD card as FAT
-
-For Windows users, we recommend formatting your SD card using the SD Association's Formatting Tool, which can be downloaded from https://www.sdcard.org/downloads/formatter_4/ You will need to set "FORMAT SIZE ADJUSTMENT" option to "ON" in the "Options" menu to ensure that the entire SD card volume is formatted - not just a single partition. With the latest SD Association Formatting Tool (V5.0) that option has been removed and is now the default. For more detailed and beginner-friendly formatting instructions, please refer to http://www.raspberrypi.org/quick-start-guide
-
-The SD Association's Formatting Tool is also available for Mac users although the default OSX Disk Utility is also capable of formatting the entire disk (select the SD card volume and choose "Erase" with "MS-DOS" format).
-
-For Linux users we recommend `gparted` (or the command line version `parted`). (Update: Norman Dunbar has written up the following formatting instructions for Linux users: http://qdosmsq.dunbar-it.co.uk/blog/2013/06/noobs-for-raspberry-pi/ )
-
-===
-
-### Screenshots
-
-#### OS Installation
-
-Simply select the checkbox next to each OS you want to install using either a mouse or keyboard (arrow keys to traverse the list, enter to toggle the selected OS's checkbox), then click the "Install" icon (or press "i" on your keyboard) to install the selection. The icons shown on the right of the list indicate whether the OS is being installed from the SD card (SD card icon) or from the online OS repository (Ethernet icon).
-
-
-
-*NOTE: The list of OSes in this image is indicative only. It will vary according to your Raspberry Pi model and the availability of OSes on our remote download repository.
-
-
-#### Online Help via Web Browser
-
-The built-in Arora web browser allows you to easily get help via the Raspberry Pi Forums (wired network connection required).
-
-
-
-#### Easy Config File Editor
-
-The built-in config file editor allows you to edit the config file of the OS currently highlighted in the OS list. This allows you to easily add license keys to different OS installs through the same interface.
-
-Note that the output mode selected by the user through pressing one of number keys 1 to 4 (for HDMI preferred, HDMI VGA, Composite PAL and Composite NTSC respectively), will be automatically set in the `config.txt` files of your installed OSes. This means that you shouldn't have to worry about manually changing your display settings to get your installed OS to display correctly on your display device.
-
-
-
-#### Installer Slideshow
-
-An installer slideshow guides you through your first steps with each OS while it installs.
-
-
-
-#### OS Boot Selector
-
-After multiple OSes have been installed, you can select which OS to boot through this selection window that is automatically displayed. NOOBS will remember your choice and boot this OS by default unless a different option has been selected within 10 seconds.
-
-Note that if only one OS is installed then the boot selector will not be displayed and the OS will be automatically booted.
-
-
-
-==
-
-## Advanced Usage (for experts and teachers)
-
-### How to Automatically Install an OS
-
-Even if you are using your Pi without a display, you can still use NOOBS to easily install an OS of your choice. To set up NOOBS to automatically and silently (i.e. without requiring any user input) install a specific OS, follow these steps:
-
-1. Copy the OS folder for the OS you want to install into the `/os` dir (or alternatively delete all other OSes contained in the `/os` dir so that only your chosen OS remains.
-
-2. If the OS you want to automatically install has multiple flavours available, edit the `flavours.json` file so that it only contains the flavour entry that you want to install.
-
-3. Edit the `recovery.cmdline` file in the root NOOBS directory and append `silentinstall` to the arguments list.
-
-When you now boot your Pi using an SD card containing the modified version of NOOBS that you just created, it will automatically install the OS you chose and boot into it after the installation has finished.
-
-### Preconfiguring a WiFi network
-
-If you already know your WiFi details, you can preconfigure NOOBS to use it straight away. Put a copy of your `wpa_supplicant.conf` file on the NOOBS root partition and NOOBS will read it and store it in its settings for all future uses.
-
-### How to create a custom OS version
-
-There are two main use cases for which you may want to create a custom version of one of the standard OS releases that is suitable for installation via NOOBS:
-- If you are a teacher wanting to easily deploy a custom OS release containing pre-defined set of packages and files onto a number of SD cards (e.g. to provision a class set of Raspberry Pi's or quickly restore a Raspberry Pi back to custom "factory" settings).
-- If you want to be able to back up your existing installed packages and files so that any future OS re-install does not force you back to a clean install.
-
-The following steps allow you to create a modified copy of one of the standard OS releases that contains your custom files, packages and settings.
-
-1. Download a base version of NOOBS from http://downloads.raspberrypi.org/NOOBS_latest
-
-2. Extract the NOOBS zipfile
-
-3. Navigate to the `os` directory
-
-4. Create a copy of the folder containing the OS release that you want to modify and rename it with a custom name.
-
-5. Edit the following fields in the `os.json` file contained in the folder that you just created
- 1. "name" - replace the name of the base OS with the name of your custom OS version
- 2. "description" - replace the description of the standard OS install with one for your custom OS version
-
-6. [Optional] Rename or replace the existing `.png` icon file with one matching the name of your custom OS version
-
-7. [Optional] Replace the PNG image files in the `slides` and `slides_vga` directory with your own custom installer slides
-
-8. Edit the following fields in the `partitions.json` file contained in the folder that you just created
- 1. "partition_size_nominal" - replace the numerical value with the size of the paritions in your custom OS version
- 2. "uncompressed_tarball_size" - replace the numerical value with the size of your filesystem tarballs when uncompressed
-
-9. Replace the `.tar.xz` root and boot filesystem tarballs with copies created from your custom OS version (these instructions assume you're only using a single OS at a time with NOOBS - they won't work if you're running multiple OSes from a single SD card). The name of these tarballs needs to match the labels given in `partitions.json`.
- 1. To create the root tarball you will need to run `bsdtar --numeric-owner --format gnutar --one-file-system -cpf .tar .` from within the root filesystem of your custom OS version. You should then compress the resulting tarball with `xz -9 -e .tar`.
- 2. To create the boot tarball you will need to run `bsdtar --numeric-owner --format gnutar -cpf .tar .` at the root directory of the boot partition of your custom OS version. You should then compress the resulting tarball with `xz -9 -e .tar`.
-
-### How to change the default Language, Keyboard layout, Display mode or Boot Partition etc.
-
-Edit the `recovery.cmdline` file in the root NOOBS directory and append the following arguments where relevant:
-- `lang=` (e.g. `lang=de` or `lang=en`)
-- `keyboard=` (e.g. `keyboard=de` or `keyboard=us`)
-- `display=` (e.g. `display=1` or `display=3`)
-- `partition=` (e.g. `partition=6`)
-- `showall` (shows all available OSes regardless of your Raspberry Pi model)
-
-Note that these defaults will be overwritten by any changes made in the GUI to these settings.
-
-### How to bypass the Recovery splashscreen and boot directly into a fixed partition
-
-After you have installed your chosen OSes, add the following file to the root directory of NOOBS to force the indicated partition to be booted at power-on.
-
-1. Add a text file named `autoboot.txt` to the root directory of NOOBS.
-
-2. Add `boot_partition=` to the file and save it to disk.
-
-This will also prevent the splashscreen from being displayed at boot. The partition number can be found by running `sudo fdisk -l` the partition will be one of the FAT32 partitions `/dev/mmcblk0p6` would be partition 6. Note that once an `autoboot.txt` file is present, there's then no way to force the NOOBS GUI to display, until you delete (or rename) the `autoboot.txt` file.
-
-### How to use with the Raspberry Pi Touch Display
-
-If NOOBS detects you are using the [Raspberry Pi Touch Display](https://www.raspberrypi.org/products/raspberry-pi-touch-display/), it will enable the following functionality:
-- A tap on the raspberry logo in the centre of the touchscreen can activate NOOBS, as well as holding the shift key down.
-- A tap on the touchscreen will simulate a mouse click
-- A longpress on the touchscreen will simulate a mouse double-click.
-
-===
-
-## Troubleshooting
-
-#### What to do if your SHIFT keypress isn't detected
-
-Try pressing shift only when the grey splashscreen is displayed rather than holding it from boot up.
-
-#### How to boot into "Safe Mode"
-
-To boot into a basic busybox shell rather than launching the NOOBS GUI, you can *either*:
-
-1. Append `rescueshell` to the argument list in the `recovery.cmdline` file which is found in the root NOOBS directory.
-
-2. Insert a physical jumper between pins 5 & 6 of GPIO header P1. If you have external hardware or an addon board connected to the GPIO header, you may find that pin 5 is being pulled low and accidentally triggering "Safe Mode". To prevent this you can append `disablesafemode` to the argument list in the `recovery.cmdline` file which is found in the root NOOBS directory.
-
-#### How to enable using the GPIO to trigger entering Recovery Mode
-
-To force Recovery Mode to be entered on boot and to show the NOOBS interface, you normally press the `SHIFT` key during bootup. If you don't have a keyboard or the `SHIFT` keypress isn't being detected, you should complete the following steps to force the NOOBS interface to be displayed on boot:
-
-1. Append `gpiotriggerenable` to the argument list in the `recovery.cmdline` file which is found in the root NOOBS directory.
-2. Reboot
-
-To force Recovery Mode being entered on boot, connect GPIO pin 3 on header P1 to GND (pin 25). If GPIO pin 3 remains unconnected then it will boot through to the installed OS as normal.
-
-#### How to force Recovery Mode being entered on boot (overrides GPIO or keyboard input)
-
-Alternatively, if you are unable to use either the GPIO or keyboard to trigger entering Recovery Mode, you can:
-
-1. Append `forcetrigger` to the argument list in the `recovery.cmdline` file which is found in the root NOOBS directory.
-2. Reboot
-
-Note that with this option enabled, the Recovery Mode will be displayed every time you boot from your NOOBS card (until you edit `recovery.cmdline` again).
-
-#### How to disable using the keyboard to trigger entering Recovery Mode
-
-In some rare cases, you may find that NOOBS incorrectly detects a `SHIFT` keypress from your keyboard regardless of the presence of user input. In such cases it may be helpful to disable using the keyboard to trigger Recovery Mode being entered.
-
-To prevent a `SHIFT` keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot), you can:
-
-1. Append `keyboardtriggerdisable` to the argument list in the `recovery.cmdline` file which is found in the root NOOBS directory.
-2. Reboot
-
-#### How to change display output modes
-
-By default, NOOBS will output over HDMI at your display’s preferred resolution, even if no HDMI display is connected. If you do not see any output on your HDMI display or are using the composite output, press 1, 2, 3 or 4 on your keyboard to select HDMI preferred mode, HDMI safe mode, composite PAL mode or composite NTSC mode respectively.
-
-If you don't have a keyboard, you can still change the display mode used by NOOBS through editing the `recovery.cmdline` file in the root NOOBS directory prior to first boot and appending the following argument:
-- `display=` (e.g. `display=1` or `display=3`)
-
-===
-
-## How to Rebuild NOOBS
-
-Note that this will require a minimum of 6GB free disk space.
-
-#### Get Build Dependencies
-
-On Ubuntu:
-
-`sudo apt-get install build-essential rsync texinfo libncurses-dev whois unzip bc qt4-linguist-tools`
-
-#### Run Build Script
-
-`./BUILDME.sh`
-
-Buildroot will then build the software and all dependencies, putting the result in the `output` directory.
-
-Buildroot by default compiles multiple files in parallel, depending on the number of CPU cores you have.
-
-If your build machine does have a quad core CPU, but relatively little RAM, you may want
-to lower the number to prevent swapping:
-- `cd buildroot ; make menuconfig`
-- "Build options" -> "Number of jobs to run simultaneously"
-
-If your build machine also has some QT5 components, it is useful to `export QT_SELECT=4` before building to ensure the QT4 component versions are selected.
-
-## How to run your Build
-
-In order to setup an SD card with a newly built version of NOOBS, you will need to:
-- Format an SD card that is 8GB or greater in size as FAT32
-- Replace the `/os` directory in `/output` with the copy contained in the release version of NOOBS (see above for download links)
-- Copy the files in the `/output` directory onto the SD card
-
-## About the Buildroot infrastructure
-
-To add extra packages: `cd buildroot ; make menuconfig`
-
-Recovery software packaging is in: `buildroot/package/recovery`
-
-Kernel configuration used: `buildroot/kernelconfig-recovery.armv6` and `kernelconfig-recovery.armv7`
-
-Main differences with bcmrpi_defconfig:
-- `CONFIG_BLK_DEV_INITRD=y` - initramfs support
-- `CONFIG_INPUT_EVDEV=y` - evdev support built-in
-- `CONFIG_USB_HID=y` - usb HID driver built-in
-- All modules disabled.
-- (This has changed significantly from v1.5 to use a squashfs)
-
-## Modifying Qt source
-
-Source is in the `recovery` folder.
-Be aware that user interface screens will appear larger in Qt Creator then when deployed on the Pi, can
-raise font sizes 2 points to compensate.
-
-Several constants can be changed in `config.h`
-
-Wrap code that calls Qt Embedded specific classes (such as QWSServer) between
-```C
-#ifdef Q_WS_QWS
-```
-and
-```C
-#endif
-```
-so that the project also compiles and can be tested under standard Qt.
-
-## Adding/Updating Translations
-
-References:
-
-http://qt-project.org/doc/qt-4.8/i18n-source-translation.html
-
-http://qt-project.org/doc/qt-4.8/linguist-manual.html
-
-To set up a git pre-commit hook to automatically update the translation files, run the following commands in the project root:
-- `chmod +x pre-commit-translation-update-hook.sh`
-- `cp pre-commit-translation-update-hook.sh .git/hooks/pre-commit`
-
-To add a new translation:
-- Add to `recovery/recovery.pro` the following: `TRANSLATIONS += translation_.ts`
-- Run `lupdate recovery/recovery.pro` which extracts strings from the source code and generates/updates the *.ts* files.
-- The *.ts* can then be sent to the translator, opened in Qt Linguist and filled in.
-- Add a line for the *.ts* file in to `recovery/icons.qrc`, but substitute *.ts* extension with *.qm* . This file contains a list
- of resource files that will be embedded into the application's executable during build.
-- Add a flag icon for your language from http://www.famfamfam.com/lab/icons/flags/ flag icon collection or if it
- doesn't have the one you need, you may use some other small png icon for it. Copy the icon file to the `recovery/icons`
- folder and add a line for it into `recovery/icons.qrc` as well.
-
-
-### Legal compliance
-
-Copyright (c) 2013, Raspberry Pi
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-Neither the name of the Raspberry Pi Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#### Third party licenses:
-
-Recovery software directly links to:
-- Qt libraries, available under LGPL and commercial license.
-
-Currently used icon sets:
-- http://www.fatcow.com/free-icons - Creative commons Attribution license
-- http://www.famfamfam.com/lab/icons/flags - "These flag icons are available for free use for any purpose with no requirement for attribution."
-- http://www.oxygen-icons.org/ - Available under Creative Common Attribution-ShareAlike 3.0 and LGPL license
-
-Licenses of utility software built by buildroot:
-Type `cd buildroot ; make legal-info` to generate a list, which will be available under `output/legal-info`.
+# PINN (PINN is not NOOBS)
+#### An enhanced Operating System installer for the Raspberry Pi
+
+PINN is a version of the NOOBS Operating System Installer for the Raspberry Pi. See the change history below for the additional features.
+
+### - [If you have PINN v2.4.3 - v2.4.4b installed, please manually update to v2.4.4c or later](https://www.raspberrypi.org/forums/viewtopic.php?f=63&t=142574&start=200#p1239359)
+
+Documentation on how to use PINN can be found in **[README_PINN.md](README_PINN.md)**, which includes all of the original NOOBS documentation.
+
+If you are already familiar with NOOBS' features, you may prefer to read the reduced documenation that just contains **[PINN's new features](changes.md)** alone.
+
+The latest version of **[PINN-lite](http://sourceforge.net/projects/pinn/files/pinn-lite.zip)** can be downloaded from [sourceforge](http://www.sourceforge.net/projects/pinn).
+
+Source code is available from [github](https://github.com/procount/pinn)
+
+see [github](https://github.com/procount/pinn) for full information
+
+## Quick Start
+
+#### Format your SD card as FAT32
+
+For **Windows** users, we recommend formatting your SD card using the SD Association's Formatting Tool, which can be downloaded from https://www.sdcard.org/downloads/formatter_4/ .
+If you are still using v4 of this tool, you will need to set the "FORMAT SIZE ADJUSTMENT" option to "ON" in the "Options" menu to ensure that the entire SD card volume is formatted - not just a single partition. However, this tool has now been upgraded to v5 where this feature is now the default and is no longer selectable. For more detailed and beginner-friendly formatting instructions, please refer to http://www.raspberrypi.org/quick-start-guide .
+
+The SD Association's Formatting Tool is also available for Mac users. However, note that the default OSX Disk Utility is also capable of formatting the entire disk (select the SD card volume and choose "Erase" with "MS-DOS" format).
+
+For **Linux** users, we recommend `gparted` (or the command line version `parted`). (Update: Norman Dunbar has written up the following formatting instructions for Linux users: http://qdosmsq.dunbar-it.co.uk/blog/2013/06/NOOBS-for-raspberry-pi/)
+
+#### Copy the pinn files to your SD card.
+
+- Download **[pinn-lite.zip](http://sourceforge.net/projects/pinn/files/pinn-lite.zip)** from [sourceforge](http://www.sourceforge.net/projects/pinn)
+- Extract the files from pinn-lite.zip file onto the SD card. (Windows built-in zip features may have trouble with this file. If so, use another program such as 7zip.)
+
+Please note that in some cases it may extract the files into a folder, if this is the case then please copy across the files from inside the folder rather than the folder itself.
+
+#### Boot pinn on your PI
+- Put the PINN SD card into your Pi and boot it.
+- On first boot the "RECOVERY" FAT partition will be automatically resized to a minimum, so if you ever put your SD card back into a Windows machine it will look like a very small partition. THIS IS NORMAL.
+- PINN does not come supplied with any OSes. You must download them from the internet or provide them on a USB stick. So,....
+- Connect your Pi to the internet with an Ethernet cable (easiest)
+- Or If you prefer to use Wifi, click on the wifi button and select your SSID and password. If the wifi button is greyed out, choose another type of wifi dongle.
+- A list of OSes that are available to install will be displayed.
+- Select one or more OSes that you want and click INSTALL.
+
+
+## Change History
+
+### V3.2.1
+
+- **Bootselectiondialog** - update for CEC and keyboard
+
+### V3.2
+
+- **Added Ts & C's dialog** - for Future OSes
+- **Resumable download** - in case of downloade errors
+- **More robust file transfer** - in case of download errors
+- **Change boot selection order** - Just for aesthetics
+- **Added file checksums** - for download verification
+- **Added partition_setup.sh checksum** - for download verification
+- **Added options dialog** - To make option setting easier.
+
+### V3.1.1
+
+- **alias** - Fix underscores
+- **backup** - Much faster backups on multicore processors
+- **silentreinstallnewer** - exits to boot menu & stops remotetimeout
+- **menu** - Removed PageDown->nextmenu function because it conflicts
+- **Translations** - Updated IT & zh_TW translations
+
+
+### V3.1
+
+- **Nano** - Added nano text editor
+- **Rename** - Allows giving an OS an Alias name & change its description
+- **Hyperpixel** - Added full kernel drivers to support Pimoroni Hyperpixel 3.5" and 4" touchscreens
+- **ScreenSwitch** - Performs automatic screen switching at bootup
+- **dhcpcd** - Now configurable
+
+### V3.0.4
+
+- **forceupdatepinn** - Add forceupdatepinn option
+- **OS Replace** - Fixed problem replacing an OS when PINN is booted from USB
+
+### V3.0.3
+
+- **Backup USB** - Fix for multiple USB sticks.
+- **Translation** - Ko & zh_tw.ts updated.
+
+### V3.0.2
+
+- **Backup USB** - Improved backup size calculation for USB installed OSes.
+
+### V3.0.1
+
+- **Backup/Download** - Removed the need to reboot after a download or backup.
+- **Wallpapers** - removed wallpapers folder & Allowed JPEGs
+- **Default wallpaper - Changed default to wallpaper.jpg
+
+### V3.0
+
+- **Backup** - Backup an OS in PINN format
+- **Time** - Added button to set date & time
+- **Download** - Fix Foldername of some OSes when downloaded
+- **Iconcache** - Cache icons when connected to internet to speedup startup
+
+### V2.8.5.8
+
+- **RPi 3A+** - Supports RPi 3A+
+
+### V2.8.5.7
+
+- **Firmware** - Disabled firmware downgrade on 3B+
+- **Clear** - Added Clear button to clear all selections
+- **Kernel Bump** - Linux kernel 4.14.74, firmware and userland bumped to match NOOBS 2.9
+- **Replace** - Removed RiscOS & Windows_10 from OS replacement
+- **SilentInstall** - Fixed waiting for USB images
+- **networktimeout** - 0 means wait indefinitely for network before silentinstall
+
+### V2.8.5.5
+
+- **Boot menu** - Sticky default now uses bootmenutimeout
+- **rebootp** - Added rebootp command to recovery shell
+
+### V2.8.5.4
+
+- **Boot menu** - Fixed focus and sticky default partuuid issues.
+- **wallpaper_resize** - Customised wallpaper can now be resized to fill the screen
+
+### V2.8.5.3
+
+- **Partuuid** - Fixed an issue from v2.8 where partuuids were introduced to installed_os.json
+- **Wallpaper** - Customised wallpaper is now available by writing your own `wallpaper.png` file to PINN's recovery partition## V2.8.5.1
+
+### V2.8.5.2
+
+- **VNCnotice** - Displays a notice on the main screen when vncinstall is in use
+- **PINN update** - Prevents crash on manual update when there is no network
+- **ae-ts** - tidy up of translations
+
+### V2.8.5.1
+
+- **Reinstall** - BUGFIX for Re-install.
+- **translations** - Updated it and zh_TW translations.
+- **silentreinstallnewer** - **USE WITH CAUTION**. With `select=` it will silently re-install any selected OSes that are newer than the installed version.
+
+### V2.8.5
+
+- **Boot Cancel** - Added a new cancel button to the bootselection dialog which will reboot back into PINN
+- **Swedish keyboard** - Swedish keyboard fixed when language selected
+- **Bootable selection** - The bootselection dialog is only available if a bootable OS is installed.
+- **Select Option** - Auto select/check OSes to be installed. "allsd,allusb,allnetwork,waitsd,waitusb,waitnetwork,waitall,allinstalled,"
+- **SilentInstall** - with Select will auto-install selected OSes
+- **Added Disablesdimages** - Disablesdimages in recovery.cmdline will prevent OSes on SD card from being shown
+- **Network start** - The network is always started, even with silentinstall.
+- **Flavour download** - Flavours can now be downloaded from remote repos. Only need to download 1
+- **Added flavours.tar.xz** - Remote flavours need to include flavours.tar.xz
+- **RPi Model Name** - Added name of RPi model to MainMenu screen
+
+### V2.8.4
+
+- **Replace OSes** - Allows the replacement of one OS with another
+- **Project Spaces** - Added Project Spaces
+- **Reserve disk space** - Reserve some space on PINN's partition before formatting
+- **mkimage** - Added mkimage from uboot
+- **xz** - Allow XZ Compression
+- **Update Dialog** - This now cancels any timeout setting
+
+### V2.8.3
+
+- **Programmable CEC** - Fixed bugs
+- **networktimeout** - Added timeout to detect network presence
+
+### V2.8.2
+
+- **Reinstall** - bugfix to Reinstall option following partuuid change on USBs
+
+### V2.8.1
+
+- **Programmable CEC** - Program your TV remote for use with PINN
+
+### V2.8
+
+- **Fix menu** - Replaced Fsck with Fix menu option to include a wider range of tools
+- **Store meta** - Additional meta files stored on installation for fix up tools
+- **Partuuid** - Store partuuid references for better USB support
+- **Tab fix** - Fixed synchronisation of OS tab display
+
+### V2.6.2
+
+- **pinn_init.sh** - Improve calling of script to run before PINN
+- **config.txt** - deleted
+
+### V2.6.1
+
+- **Kernel** - Bump kernel to suppress missing mailbox commands in old firmware
+- **pinn_init.sh** - Add initialisation script to run before PINN
+
+### V2.6
+
+- **Firmware** - Update firmware
+- **Kernel** - Update kernel to 4.14
+
+### V2.5.5
+
+- **Self-Update** - A small fix to the self-update ignore feature
+
+### V2.5.4
+
+- **Countdown** - Re-enabled the boot selection dialog countdown timer.
+
+### V2.5.3
+
+- **Switch firmware** - Enable switching of firmware for 3B+ and other models.
+
+### V2.5.2a
+
+Fixes the incorrect recovery.cmdline bug in v2.5.2.
+(There's a reason why I didn't make this v2.7 just yet!)
+
+### V2.5.2
+
+- **OS Firmware** - Includes a better method of slipstreaming new Firmware
+- **BUG: Cmdline** - Note that the recovery.cmdline is incorrect in this version
+### V2.5.1
+
+- **firmware** - New firmware for Rpi 3B+
+- **Kernel** - Update to kernel 4.9.80
+- **OS firmware** - Latest firmware is slip streamed onto old OSes
+- **wifi drivers** - Some wifi drivers temporarily removed until they can be upgraded
+- **Arora** - Prevented multiple instances of Arora browser running
+
+### V2.4.5f
+
+- **rtl8812 wifi** - added wifi driver for rtl8812 5GHz dongles
+
+### V2.4.5e
+
+- **remotetimeout** - Enable network for remote boot alteration.
+
+### V2.4.5b
+
+- **background** - The background has now been fixed on the bootmenu
+- **reinstall** - Reinstall should now use data from the NEW version rather than the OLD version
+
+### V2.4.5
+
+This is a small maintenance release for some cosmetic changes and bugfixes mainly.
+
+- **background** - Specify the background colour as background=r,g,b
+- **style** - Change the style with style=motif/windows/platinum
+- **configpath** - (partially) allow remote flavours to customise an OS
+- **dsi** - Allows the HDMI/DSI switching option to work with OSes installed to USB
+
+### V2.4.4
+
+Finally, PINN can now re-install any installed OS WITHOUT affecting the other OSes, eliminating one of my NOOBS bugbears.
+
+- **Re-install** - Re-install an OS without affecting others
+- **no_update** - disable PINN self-update (manual refesh of PINN available)
+- **update PINN** - A manual PINN update check can now be done (for when no_update is used)
+- **Edit PINN** - The recovery.cmdline and config.txt fiels of PINN can now be edited.
+- **no_cursor** - The no_cursor option now only affects the bootselection dialog
+- **Wipe** - The Wipe Disk command has been temporarily removed
+- **Max OSes** - The number of OSes has been restricted so that boot partitions numbers are <63
+
+### V2.4.3
+
+A major change to the User Interface in preparation for some new features.
+
+- **3 Toolbars** - Main Menu, Archival and Maintenance.
+- **OS Groups** - OS lists are grouped into General, Minimal, Educational, Media and Gaming.
+- **Download OS** - Download an OS to USB for local installation.
+- **Fsck** - Check and fix your filesystems in case of error.
+- **Wipe Disk** - delete all OSes and restore drive to full capacity.
+- **Info button** - Go directly to the webpage of each OS.
+
+### V2.4.2h
+
+- **Translations** - udpate to Portugese + other translations
+- **Password** - A new password will not expire
+- **Slideshow** - Slides during installation are now scaled to be the same size.
+- **>1TB MSDs** - Installing OSes to a USB Mass Storage Device > 1TB would fail. 2TB is the maximum size.
+
+### V2.4.2
+
+- **repo_list** - Added repo_list cmdline argument
+
+#### Bugfixes
+
+- **Win10IoT** - Fixed annoying warning messages on installation
+- **RTAndrod** - re-included missing cpio to allow installation
+
+### V2.4.1
+
+- **btrfs** - Added support for btrfs file systems
+
+### V2.4
+
+- **Update** - Rebase onto NOOBS 2.4
+- **repo** - Support "repo=" from NOOBS
+- **USB support** - Supports USB BOOT and USB ROOTFS
+
+### V2.3
+
+- **PiZeroW** - Further update to match NOOBS 2.3. Added regDB for channel 13 & missing DTBs
+
+### V2.2
+
+- **PiZeroW** - Update firmware/kernel for PiZero Wifi version
+
+### V2.1.4
+
+- **IP address** - Shown in window title
+- **CEC key mapping** - Replaced 0 button with PLAY button for greater applicability
+- **BOOT** - Added BOOT button to boot selection dialog for use with limited TV remotes
+- **Tarball names** - Allow local tarballs to have a different name to the partition labell
+- **SD Card** - Recommend 8GB card minimum
+- **SD Card** - Update SD card requirements
+- **Network** - Do not continue polling for connectivity during installation
+- **Update** - Bump kernel and firmware versions
+
+### V2.1.3
+
+- **Translations** - Added many translations from the community
+
+### V2.1.2
+
+- **Default Boot** - A default OS can be set in a multi-boot setup for quicker boots.
+- **Bootmenutimout** - The timeout of the boot selection dialog can be changed.
+- **SHIFT key** - The PINN interface can be reached using the Left mouse button as well as shift.
+
+### V2.1.1
+
+- **CEC Support** - Added CEC support to control PINN with a TV remote
+
+### V2.1
+
+- **IoTpHAT support** - Updated to match NOOBS v2.1 for IoTpHAT wifi
+
+### V2.0
+
+- **Network Drivers** - Added the popular RTL8188eu wifi driver (for HubPiWi and others)
+- **New Firmware** - Updated Firmware and Kernel to match NOOBS 2.0
+
+### V1.9.5
+
+- **Self-Update** - Notification and download of new releases
+
+#### Bugfixes
+
+- **Network Drivers** - Fixed the popular RTL8188cus wifi driver.
+- **RPI3 ACT_LED** - Now displays correctly on SD card access
+
+
+### V1.9.4
+
+- **Network Drivers** - A number of additional wifi and ethernet drivers have been added.
+
+#### Bugfixes
+
+- **Dialog Box** - The initialisation dialog box is removed under network errors
+
+
+### V1.9.3
+
+- **Clone SD Card** - Copy the SD card to another card in a USB reader (BETA)
+- **Rescue shell** - Exiting the rescue shell now enters the PINN recovery program instead of another shell.
+- **VNCSHARE** - Sets up PINN to use VNC at the same time as an attached screen
+
+#### Bugfixes
+
+- **https** - Fixed the ability to use https protocol (which was preventing Arch from installing sometimes).
+- **wifi config** - A user supplied wpa_supplicant.conf file is now ALWAYS copied to /settings and then renamed to wpa_supplicant.conf.bak so that it does not continually overwrite any manual changes made through the GUI.
+
+
+### V1.9.2
+
+- **Password** - Change or reset your password for each OS.
+- **DSI/HDMI** - Auto-switching of DSI/HDMI screen with HDMI taking priority
+
+#### BugFixes
+
+- **NoobsConfig** - Config filenames now now have all spaces converted to underscores
+- **Multiple Os** - Multiple installed OSes can now be selected again.
+- **DHCP** - ClientID is now used instead of DUID to request an IP address
+
+
+### V1.9.1 (based on NOOBS v1.9)
+
+- **USB support** - store your OS installations on USB stick to avoid wasting SD card space and avoid downloading each time.
+- **Alternative Src** - Install OSes from an alternative website, or local webserver
+- **ARCH support** - Install the Arch Linux OS directly from the Arch website
+- **VGA666 support** - Alow PINN to be used with Gert's VGA666 adaptor
+- **NOOBSCONFIG support** - Allow customisation of an OS installation as it installs
+- **SSH support** - SSH remotely into you PINN installation.
+- **Progress** - View your installation progress via alternative means
diff --git a/README_SUM.md b/README_SUM.md
index 011b27b51..7844d6914 100644
--- a/README_SUM.md
+++ b/README_SUM.md
@@ -45,6 +45,10 @@ Please note that in some cases it may extract the files into a folder, if this i
## Change History
+### V3.2.1
+
+- **Bootselectiondialog** - update for CEC and keyboard
+
### V3.2
- **Added Ts & C's dialog** - for Future OSes
diff --git a/buildroot/package/bison/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/buildroot/package/bison/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
new file mode 100644
index 000000000..e9dee48af
--- /dev/null
+++ b/buildroot/package/bison/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
@@ -0,0 +1,50 @@
+From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001
+From: Paul Eggert
+Date: Mon, 5 Mar 2018 10:56:29 -0800
+Subject: [PATCH 1/1] fflush: adjust to glibc 2.28 libio.h removal
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Daniel P. Berrangé in:
+https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
+* lib/fbufmode.c (fbufmode):
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpending.c (__fpending):
+* lib/fpurge.c (fpurge):
+* lib/freadable.c (freadable):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/freadptr.c (freadptr):
+* lib/freadseek.c (freadptrinc):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+* lib/fwritable.c (fwritable):
+* lib/fwriting.c (fwriting):
+Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
+* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
+Define if not already defined.
+---
+ lib/fseterr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+[yann.morin.1998@free.fr: partially backport from upstream gnulib]
+Signed-off-by: "Yann E. MORIN"
+
+diff --git a/lib/fseterr.c b/lib/fseterr.c
+index 82649c3ac..adb637256 100644
+--- a/lib/fseterr.c
++++ b/lib/fseterr.c
+@@ -29,7 +29,7 @@ fseterr (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ , because they need it for implementing getc() and putc() as
+ fast macros. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags |= _IO_ERR_SEEN;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+--
+2.14.1
+
diff --git a/buildroot/package/bison/0002-fflush-be-more-paranoid-about-libio.h-change.patch b/buildroot/package/bison/0002-fflush-be-more-paranoid-about-libio.h-change.patch
new file mode 100644
index 000000000..035f8282c
--- /dev/null
+++ b/buildroot/package/bison/0002-fflush-be-more-paranoid-about-libio.h-change.patch
@@ -0,0 +1,46 @@
+From 74d9d6a293d7462dea8f83e7fc5ac792e956a0ad Mon Sep 17 00:00:00 2001
+From: Paul Eggert
+Date: Thu, 8 Mar 2018 16:42:45 -0800
+Subject: [PATCH 2/2] fflush: be more paranoid about libio.h change
+
+Suggested by Eli Zaretskii in:
+https://lists.gnu.org/r/emacs-devel/2018-03/msg00270.html
+* lib/fbufmode.c (fbufmode):
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpending.c (__fpending):
+* lib/fpurge.c (fpurge):
+* lib/freadable.c (freadable):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/freadptr.c (freadptr):
+* lib/freadseek.c (freadptrinc):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+* lib/fwritable.c (fwritable):
+* lib/fwriting.c (fwriting):
+Look at _IO_ftrylockfile as well as at _IO_EOF_SEEN.
+---
+ lib/fseterr.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+[yann.morin.1998@free.fr: partially backport from upstream gnulib]
+Signed-off-by: "Yann E. MORIN"
+
+diff --git a/lib/fseterr.c b/lib/fseterr.c
+index adb637256..fd9da6338 100644
+--- a/lib/fseterr.c
++++ b/lib/fseterr.c
+@@ -29,7 +29,8 @@ fseterr (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ , because they need it for implementing getc() and putc() as
+ fast macros. */
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags |= _IO_ERR_SEEN;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+--
+2.14.1
+
diff --git a/buildroot/package/bison/bison.hash b/buildroot/package/bison/bison.hash
index 16913f28b..2c3320852 100644
--- a/buildroot/package/bison/bison.hash
+++ b/buildroot/package/bison/bison.hash
@@ -1,2 +1,4 @@
# Locally calculated after checking pgp signature
sha256 a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1 bison-3.0.4.tar.xz
+# License files, locally calculated
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
diff --git a/buildroot/package/bison/bison.mk b/buildroot/package/bison/bison.mk
index 5779673e1..e4fc50410 100644
--- a/buildroot/package/bison/bison.mk
+++ b/buildroot/package/bison/bison.mk
@@ -7,7 +7,7 @@
BISON_VERSION = 3.0.4
BISON_SOURCE = bison-$(BISON_VERSION).tar.xz
BISON_SITE = $(BR2_GNU_MIRROR)/bison
-BISON_LICENSE = GPLv3+
+BISON_LICENSE = GPL-3.0+
BISON_LICENSE_FILES = COPYING
HOST_BISON_DEPENDENCIES = host-m4
diff --git a/buildroot/package/m4/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/buildroot/package/m4/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
new file mode 100644
index 000000000..750b75f79
--- /dev/null
+++ b/buildroot/package/m4/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
@@ -0,0 +1,165 @@
+From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001
+From: Paul Eggert
+Date: Mon, 5 Mar 2018 10:56:29 -0800
+Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Daniel P. Berrangé in:
+https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
+* lib/fbufmode.c (fbufmode):
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpending.c (__fpending):
+* lib/fpurge.c (fpurge):
+* lib/freadable.c (freadable):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/freadptr.c (freadptr):
+* lib/freadseek.c (freadptrinc):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+* lib/fwritable.c (fwritable):
+* lib/fwriting.c (fwriting):
+Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
+* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
+Define if not already defined.
+
+[yann.morin.1998@free.fr: partially backport from upstream gnulib]
+Signed-off-by: "Yann E. MORIN"
+
+---
+ lib/fflush.c | 6 +++---
+ lib/fpending.c | 2 +-
+ lib/fpurge.c | 2 +-
+ lib/freadahead.c | 2 +-
+ lib/freading.c | 2 +-
+ lib/fseeko.c | 4 ++--
+ lib/stdio-impl.h | 6 ++++++
+ 7 files changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/lib/fflush.c b/build-aux/gnulib/lib/fflush.c
+index 983ade0ff..a6edfa105 100644
+--- a/lib/fflush.c
++++ b/lib/fflush.c
+@@ -33,7 +33,7 @@
+ #undef fflush
+
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
+ static void
+@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
+
+ #endif
+
+-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
+
+ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
+ if (stream == NULL || ! freading (stream))
+ return fflush (stream);
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ clear_ungetc_buffer_preserving_position (stream);
+
+diff --git a/lib/fpending.c b/build-aux/gnulib/lib/fpending.c
+index c84e3a5b4..789f50e4e 100644
+--- a/lib/fpending.c
++++ b/lib/fpending.c
+@@ -32,7 +32,7 @@ __fpending (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ , because they need it for implementing getc() and putc() as
+ fast macros. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ return fp->_IO_write_ptr - fp->_IO_write_base;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+diff --git a/lib/fpurge.c b/build-aux/gnulib/lib/fpurge.c
+index b1d417c7a..3aedcc373 100644
+--- a/lib/fpurge.c
++++ b/lib/fpurge.c
+@@ -62,7 +62,7 @@ fpurge (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ , because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_IO_read_end = fp->_IO_read_ptr;
+ fp->_IO_write_ptr = fp->_IO_write_base;
+ /* Avoid memory leak when there is an active ungetc buffer. */
+diff --git a/lib/freadahead.c b/build-aux/gnulib/lib/freadahead.c
+index c2ecb5b28..23ec76ee5 100644
+--- a/lib/freadahead.c
++++ b/lib/freadahead.c
+@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *);
+ size_t
+ freadahead (FILE *fp)
+ {
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_write_ptr > fp->_IO_write_base)
+ return 0;
+ return (fp->_IO_read_end - fp->_IO_read_ptr)
+diff --git a/lib/freading.c b/build-aux/gnulib/lib/freading.c
+index 73c28acdd..c24d0c88a 100644
+--- a/lib/freading.c
++++ b/lib/freading.c
+@@ -31,7 +31,7 @@ freading (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ , because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ return ((fp->_flags & _IO_NO_WRITES) != 0
+ || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+ && fp->_IO_read_base != NULL));
+diff --git a/lib/fseeko.c b/build-aux/gnulib/lib/fseeko.c
+index 0101ab55f..193f4e8ce 100644
+--- a/lib/fseeko.c
++++ b/lib/fseeko.c
+@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+
+ /* These tests are based on fpurge.c. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_read_end == fp->_IO_read_ptr
+ && fp->_IO_write_ptr == fp->_IO_write_base
+ && fp->_IO_save_base == NULL)
+@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+ return -1;
+ }
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags &= ~_IO_EOF_SEEN;
+ fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+diff --git a/lib/stdio-impl.h b/build-aux/gnulib/lib/stdio-impl.h
+index 78d896e9f..05c5752a2 100644
+--- a/lib/stdio-impl.h
++++ b/lib/stdio-impl.h
+@@ -18,6 +18,12 @@
+ the same implementation of stdio extension API, except that some fields
+ have different naming conventions, or their access requires some casts. */
+
++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
++ problem by defining it ourselves. FIXME: Do not rely on glibc
++ internals. */
++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
++# define _IO_IN_BACKUP 0x100
++#endif
+
+ /* BSD stdio derived implementations. */
+
+--
+2.14.1
diff --git a/buildroot/package/m4/0002-fflush-be-more-paranoid-about-libio.h-change.patch b/buildroot/package/m4/0002-fflush-be-more-paranoid-about-libio.h-change.patch
new file mode 100644
index 000000000..755984e32
--- /dev/null
+++ b/buildroot/package/m4/0002-fflush-be-more-paranoid-about-libio.h-change.patch
@@ -0,0 +1,150 @@
+From 74d9d6a293d7462dea8f83e7fc5ac792e956a0ad Mon Sep 17 00:00:00 2001
+From: Paul Eggert
+Date: Thu, 8 Mar 2018 16:42:45 -0800
+Subject: [PATCH 2/2] fflush: be more paranoid about libio.h change
+
+Suggested by Eli Zaretskii in:
+https://lists.gnu.org/r/emacs-devel/2018-03/msg00270.html
+* lib/fbufmode.c (fbufmode):
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpending.c (__fpending):
+* lib/fpurge.c (fpurge):
+* lib/freadable.c (freadable):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/freadptr.c (freadptr):
+* lib/freadseek.c (freadptrinc):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+* lib/fwritable.c (fwritable):
+* lib/fwriting.c (fwriting):
+Look at _IO_ftrylockfile as well as at _IO_EOF_SEEN.
+---
+ lib/fflush.c | 9 ++++++---
+ lib/fpending.c | 3 ++-
+ lib/fpurge.c | 3 ++-
+ lib/freadahead.c | 3 ++-
+ lib/freading.c | 3 ++-
+ lib/fseeko.c | 6 ++++--
+ 6 files changed, 18 insertions(+), 9 deletions(-)
+
+[yann.morin.1998@free.fr: partially backport from upstream gnulib]
+Signed-off-by: "Yann E. MORIN"
+
+diff --git a/lib/fflush.c b/build-aux/gnulib/lib/fflush.c
+index a6edfa105..a140b7ad9 100644
+--- a/lib/fflush.c
++++ b/lib/fflush.c
+@@ -33,7 +33,8 @@
+ #undef fflush
+
+
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++/* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
+ static void
+@@ -72,7 +73,8 @@ clear_ungetc_buffer (FILE *fp)
+
+ #endif
+
+-#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
++#if ! (defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1)
++/* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+@@ -148,7 +150,8 @@ rpl_fflush (FILE *stream)
+ if (stream == NULL || ! freading (stream))
+ return fflush (stream);
+
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ clear_ungetc_buffer_preserving_position (stream);
+
+diff --git a/lib/fpending.c b/build-aux/gnulib/lib/fpending.c
+index 789f50e4e..7bc235ded 100644
+--- a/lib/fpending.c
++++ b/lib/fpending.c
+@@ -32,7 +32,8 @@ __fpending (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ , because they need it for implementing getc() and putc() as
+ fast macros. */
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ return fp->_IO_write_ptr - fp->_IO_write_base;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+diff --git a/lib/fpurge.c b/build-aux/gnulib/lib/fpurge.c
+index 3aedcc373..554790b56 100644
+--- a/lib/fpurge.c
++++ b/lib/fpurge.c
+@@ -62,7 +62,8 @@ fpurge (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ , because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_IO_read_end = fp->_IO_read_ptr;
+ fp->_IO_write_ptr = fp->_IO_write_base;
+ /* Avoid memory leak when there is an active ungetc buffer. */
+diff --git a/lib/freadahead.c b/build-aux/gnulib/lib/freadahead.c
+index 23ec76ee5..ed3dd0ebd 100644
+--- a/lib/freadahead.c
++++ b/lib/freadahead.c
+@@ -30,7 +30,8 @@ extern size_t __sreadahead (FILE *);
+ size_t
+ freadahead (FILE *fp)
+ {
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_write_ptr > fp->_IO_write_base)
+ return 0;
+ return (fp->_IO_read_end - fp->_IO_read_ptr)
+diff --git a/lib/freading.c b/build-aux/gnulib/lib/freading.c
+index c24d0c88a..790f92ca3 100644
+--- a/lib/freading.c
++++ b/lib/freading.c
+@@ -31,7 +31,8 @@ freading (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ , because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ return ((fp->_flags & _IO_NO_WRITES) != 0
+ || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+ && fp->_IO_read_base != NULL));
+diff --git a/lib/fseeko.c b/build-aux/gnulib/lib/fseeko.c
+index 193f4e8ce..e5c5172e7 100644
+--- a/lib/fseeko.c
++++ b/lib/fseeko.c
+@@ -47,7 +47,8 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+
+ /* These tests are based on fpurge.c. */
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_read_end == fp->_IO_read_ptr
+ && fp->_IO_write_ptr == fp->_IO_write_base
+ && fp->_IO_save_base == NULL)
+@@ -123,7 +124,8 @@ fseeko (FILE *fp, off_t offset, int whence)
+ return -1;
+ }
+
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags &= ~_IO_EOF_SEEN;
+ fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+--
+2.14.1
diff --git a/buildroot/package/m4/m4.mk b/buildroot/package/m4/m4.mk
index 9b5d2d1fa..b08e3ff47 100644
--- a/buildroot/package/m4/m4.mk
+++ b/buildroot/package/m4/m4.mk
@@ -4,10 +4,10 @@
#
################################################################################
-M4_VERSION = 1.4.17
+M4_VERSION = 1.4.18
M4_SOURCE = m4-$(M4_VERSION).tar.xz
M4_SITE = $(BR2_GNU_MIRROR)/m4
-M4_LICENSE = GPLv3+
+M4_LICENSE = GPLv3.0+
M4_LICENSE_FILES = COPYING
HOST_M4_CONF_OPTS = --disable-static
diff --git a/buildroot/package/ncurses/ncurses-5.9-gcc-5.patch b/buildroot/package/ncurses/ncurses-5.9-gcc-5.patch
new file mode 100644
index 000000000..2448229b8
--- /dev/null
+++ b/buildroot/package/ncurses/ncurses-5.9-gcc-5.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/545114
+
+extracted from the upstream change (which had many unrelated commits in one)
+
+From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001
+From: "Thomas E. Dickey"
+Date: Sun, 7 Dec 2014 03:10:09 +0000
+Subject: [PATCH] ncurses 5.9 - patch 20141206
+
++ modify MKlib_gen.sh to work around change in development version of
+ gcc introduced here:
+ https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
+ https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
+ (reports by Marcus Shawcroft, Maohui Lei).
+
+diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
+index d8cc3c9..b91398c 100755
+--- a/ncurses/base/MKlib_gen.sh
++++ b/ncurses/base/MKlib_gen.sh
+@@ -474,11 +474,22 @@ sed -n -f $ED1 \
+ -e 's/gen_$//' \
+ -e 's/ / /g' >>$TMP
+
++cat >$ED1 < $ED2
++cat $ED2 >$TMP
++
+ $preprocessor $TMP 2>/dev/null \
+-| sed \
+- -e 's/ / /g' \
+- -e 's/^ //' \
+- -e 's/_Bool/NCURSES_BOOL/g' \
++| sed -f $ED1 \
+ | $AWK -f $AW2 \
+ | sed -f $ED3 \
+ | sed \
diff --git a/buildroot/package/python/001-remove-host-header-path.patch b/buildroot/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch
similarity index 78%
rename from buildroot/package/python/001-remove-host-header-path.patch
rename to buildroot/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch
index dfb84ffa1..3b2c9833e 100644
--- a/buildroot/package/python/001-remove-host-header-path.patch
+++ b/buildroot/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch
@@ -1,4 +1,7 @@
-setup.py: do not add invalid header locations
+From 3dc31a435b67de2ba3dd3457f0c939e20b58e8de Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:17:06 +0100
+Subject: [PATCH] setup.py: do not add invalid header locations
This piece of code incorrectly adds /usr/include to
self.compiler.include_dirs, and results in the following invalid
@@ -17,11 +20,15 @@ cc1: warning: include location "/usr/include" is unsafe for cross-compilation [-
[...]
Signed-off-by: Thomas Petazzoni
-Index: b/setup.py
-===================================================================
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 54054c2..64001e2 100644
--- a/setup.py
+++ b/setup.py
-@@ -480,7 +480,7 @@
+@@ -496,7 +496,7 @@ class PyBuildExt(build_ext):
for directory in reversed(options.dirs):
add_dir_to_list(dir_list, directory)
@@ -30,3 +37,6 @@ Index: b/setup.py
and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
# OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
# (PYTHONFRAMEWORK is set) to avoid # linking problems when
+--
+2.7.4
+
diff --git a/buildroot/package/python/002-fix-get-python-inc.patch b/buildroot/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch
similarity index 76%
rename from buildroot/package/python/002-fix-get-python-inc.patch
rename to buildroot/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch
index bfee03aaa..b28ef2440 100644
--- a/buildroot/package/python/002-fix-get-python-inc.patch
+++ b/buildroot/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch
@@ -1,4 +1,7 @@
-Fix get_python_inc() for cross-compilation
+From 367ee7d103cf9f670c3925d555edf6f6a5b9d8d5 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:17:25 +0100
+Subject: [PATCH] Fix get_python_inc() for cross-compilation
When we are cross compiling, doing os.path.dirname(sys.executable) to
get the build directory is incorrect, because we're executing the host
@@ -21,11 +24,15 @@ This patch allows to fix the
incorrectly added to the header paths.
Signed-off-by: Thomas Petazzoni
-Index: b/Lib/distutils/sysconfig.py
-===================================================================
+---
+ Lib/distutils/sysconfig.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+index de7da1d..d72b6e5 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
-@@ -79,7 +79,7 @@
+@@ -79,7 +79,7 @@ def get_python_inc(plat_specific=0, prefix=None):
if os.name == "posix":
if python_build:
@@ -34,3 +41,6 @@ Index: b/Lib/distutils/sysconfig.py
if plat_specific:
# python.h is located in the buildir
inc_dir = buildir
+--
+2.7.4
+
diff --git a/buildroot/package/python/004-sysconfigdata-install-location.patch b/buildroot/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
similarity index 64%
rename from buildroot/package/python/004-sysconfigdata-install-location.patch
rename to buildroot/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
index a72db1ae7..db5bfe1a1 100644
--- a/buildroot/package/python/004-sysconfigdata-install-location.patch
+++ b/buildroot/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
@@ -1,4 +1,7 @@
-Change the install location of _sysconfigdata.py
+From 0ef0d4ddd3f2261e381f22061a9a451dfbb1dc9e Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:17:59 +0100
+Subject: [PATCH] Change the install location of _sysconfigdata.py
The _sysconfigdata.py module contains definitions that are needed when
building Python modules. In cross-compilation mode, when building
@@ -16,12 +19,16 @@ this directory gets added to the PYTHONPATH of the host Python
interpreter when building Python modules for the target.
Signed-off-by: Thomas Petazzoni
+---
+ Makefile.pre.in | 12 ++++++++++--
+ configure.ac | 2 +-
+ 2 files changed, 11 insertions(+), 3 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index e288964..5367df7 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -462,6 +462,9 @@
+@@ -529,6 +529,9 @@ pybuilddir.txt: $(BUILDPYTHON)
rm -f ./pybuilddir.txt ; \
exit 1 ; \
fi
@@ -29,9 +36,9 @@ Index: b/Makefile.pre.in
+ mkdir -p `cat pysysconfigdatadir.txt`
+ cp `cat pybuilddir.txt`/_sysconfigdata.py `cat pysysconfigdatadir.txt`
- # Build the shared modules
- # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
-@@ -1002,7 +1005,7 @@
+ # This is shared by the math and cmath modules
+ Modules/_math.o: Modules/_math.c Modules/_math.h
+@@ -1080,7 +1083,7 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
else true; \
fi; \
done
@@ -40,7 +47,7 @@ Index: b/Makefile.pre.in
do \
if test -x $$i; then \
$(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
-@@ -1012,6 +1015,11 @@
+@@ -1090,6 +1093,11 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
echo $(INSTALL_DATA) $$i $(LIBDEST); \
fi; \
done
@@ -52,25 +59,28 @@ Index: b/Makefile.pre.in
@for d in $(LIBSUBDIRS); \
do \
a=$(srcdir)/Lib/$$d; \
-@@ -1337,7 +1345,7 @@
+@@ -1418,7 +1426,7 @@ distclean: clobber
Modules/Setup Modules/Setup.local Modules/Setup.config \
Modules/ld_so_aix Modules/python.exp Misc/python.pc
-rm -f python*-gdb.py
- -rm -f pybuilddir.txt
+ -rm -f pybuilddir.txt pysysconfigdatadir.txt
- find $(srcdir)/[a-zA-Z]* '(' -name '*.fdc' -o -name '*~' \
- -o -name '[@,#]*' -o -name '*.old' \
- -o -name '*.orig' -o -name '*.rej' \
-Index: b/configure.ac
-===================================================================
+ # Issue #28258: set LC_ALL to avoid issues with Estonian locale.
+ # Expansion is performed here by shell (spawned by make) itself before
+ # arguments are passed to find. So LC_ALL=C must be set as a separate
+diff --git a/configure.ac b/configure.ac
+index 1273465..5f89797 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -33,7 +33,7 @@
+@@ -33,7 +33,7 @@ if test "$cross_compiling" = yes; then
AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
fi
AC_MSG_RESULT($interp)
-- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp
-+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pysysconfigdatadir.txt && echo $(abs_builddir)/`cat pysysconfigdatadir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp
+- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
++ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pysysconfigdatadir.txt && echo $(abs_builddir)/`cat pysysconfigdatadir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
fi
- elif test "$cross_compiling" = maybe; then
- AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
+ # Used to comment out stuff for rebuilding generated files
+ GENERATED_COMMENT='#'
+--
+2.7.4
+
diff --git a/buildroot/package/python/005-pyc-pyo-conditional.patch b/buildroot/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
similarity index 68%
rename from buildroot/package/python/005-pyc-pyo-conditional.patch
rename to buildroot/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
index 0a2f727bb..3bf407d54 100644
--- a/buildroot/package/python/005-pyc-pyo-conditional.patch
+++ b/buildroot/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
@@ -1,8 +1,22 @@
-Index: b/Makefile.pre.in
-===================================================================
+From 168e6c594e80395583de5ab0d082be119b2061fc Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:18:57 +0100
+Subject: [PATCH] Make the compilation of .pyc and .pyo conditional
+
+This commit adds --{enable,disable}-{pyc,pyo} options to enable/disable
+the compilation of pyc/pyo files.
+
+Signed-off-by: Thomas Petazzoni
+---
+ Makefile.pre.in | 8 ++++++++
+ configure.ac | 11 +++++++++++
+ 2 files changed, 19 insertions(+)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 5367df7..96fc718 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1050,24 +1050,32 @@
+@@ -1128,24 +1128,32 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
fi
@@ -35,11 +49,11 @@ Index: b/Makefile.pre.in
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 5f89797..4aafc82 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -736,6 +736,17 @@
+@@ -759,6 +759,17 @@ SunOS*)
;;
esac
@@ -57,3 +71,6 @@ Index: b/configure.ac
AC_SUBST(LIBRARY)
AC_MSG_CHECKING(LIBRARY)
+--
+2.7.4
+
diff --git a/buildroot/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch b/buildroot/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch
new file mode 100644
index 000000000..e0a24ec80
--- /dev/null
+++ b/buildroot/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch
@@ -0,0 +1,29 @@
+From 2d971c3cdca9ecc55f2da8aba12ca89e1a66519a Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:19:47 +0100
+Subject: [PATCH] Adjust getaddrinfo() test for cross-compilation
+
+The getaddrinfo() test in configure.ac uses AC_RUN_IFELSE(), which isn't
+cross-compilation friendly.
+
+Signed-off-by: Thomas Petazzoni
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4aafc82..63e6918 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3527,7 +3527,7 @@ fi
+
+ AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
+
+-if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes
++if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes
+ then
+ if test $ipv6 = yes
+ then
+--
+2.7.4
+
diff --git a/buildroot/package/python/007-disable-extensions.patch b/buildroot/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
similarity index 57%
rename from buildroot/package/python/007-disable-extensions.patch
rename to buildroot/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
index be4d9437a..44a8ae2cc 100644
--- a/buildroot/package/python/007-disable-extensions.patch
+++ b/buildroot/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
@@ -1,8 +1,24 @@
-Index: b/Makefile.pre.in
-===================================================================
+From 977de9474c1fb46359ab6a487e153fbd91a2b568 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:21:28 +0100
+Subject: [PATCH] Add minimal infrastructure to be able to disable extensions
+
+This commit adds some logic to the Python build system to be able to
+disable Python extensions. Follow-up commits actually add options to
+disable specific extensions.
+
+Signed-off-by: Thomas Petazzoni
+---
+ Makefile.pre.in | 6 +++++-
+ configure.ac | 2 ++
+ setup.py | 5 ++++-
+ 3 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 96fc718..33b994d 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -156,6 +156,8 @@
+@@ -161,6 +161,8 @@ FILEMODE= 644
# configure script arguments
CONFIG_ARGS= @CONFIG_ARGS@
@@ -11,7 +27,7 @@ Index: b/Makefile.pre.in
# Subdirectories with code
SRCDIRS= @SRCDIRS@
-@@ -477,6 +479,7 @@
+@@ -548,6 +550,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
esac; \
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
@@ -19,7 +35,7 @@ Index: b/Makefile.pre.in
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
# Build static library
-@@ -1191,7 +1194,8 @@
+@@ -1269,7 +1272,8 @@ libainstall: all python-config
# Install the dynamically loadable modules
# This goes into $(exec_prefix)
sharedinstall: sharedmods
@@ -29,24 +45,24 @@ Index: b/Makefile.pre.in
--prefix=$(prefix) \
--install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 63e6918..5d4232f 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2284,6 +2284,8 @@
+@@ -2462,6 +2462,8 @@ LIBS="$withval $LIBS"
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+ PKG_PROG_PKG_CONFIG
+AC_SUBST(DISABLED_EXTENSIONS)
+
# Check for use of the system expat library
AC_MSG_CHECKING(for --with-system-expat)
AC_ARG_WITH(system_expat,
-Index: b/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index 64001e2..3b51c0a 100644
--- a/setup.py
+++ b/setup.py
-@@ -33,7 +33,10 @@
+@@ -33,7 +33,10 @@ host_platform = get_platform()
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
# This global variable is used to hold the list of modules to be disabled.
@@ -58,3 +74,6 @@ Index: b/setup.py
def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
+--
+2.7.4
+
diff --git a/buildroot/package/python/008-distutils-use-python-sysroot.patch b/buildroot/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch
similarity index 75%
rename from buildroot/package/python/008-distutils-use-python-sysroot.patch
rename to buildroot/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch
index 7cd748761..c68f1bf7f 100644
--- a/buildroot/package/python/008-distutils-use-python-sysroot.patch
+++ b/buildroot/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch
@@ -1,4 +1,7 @@
-Adjust library/header paths for cross-compilation
+From f3e0a677c4736f95338825a022a884f8dc7a5c14 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:22:19 +0100
+Subject: [PATCH] Adjust library/header paths for cross-compilation
When cross-compiling third-party extensions, the get_python_inc() or
get_python_lib() can be called, to return the path to headers or
@@ -15,12 +18,32 @@ The _python_sysroot variable is also used to prefix the LIBDIR value
taken from the sysconfigdata module.
Signed-off-by: Thomas Petazzoni
+---
+ Lib/distutils/command/build_ext.py | 5 ++++-
+ Lib/distutils/sysconfig.py | 9 +++++++--
+ 2 files changed, 11 insertions(+), 3 deletions(-)
-Index: b/Lib/distutils/sysconfig.py
-===================================================================
+diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
+index 2c68be3..375b08c 100644
+--- a/Lib/distutils/command/build_ext.py
++++ b/Lib/distutils/command/build_ext.py
+@@ -240,7 +240,10 @@ class build_ext (Command):
+ if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
+ if not sysconfig.python_build:
+ # building third party extensions
+- self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
++ libdir = sysconfig.get_config_var('LIBDIR')
++ if "_python_sysroot" in os.environ:
++ libdir = os.environ.get("_python_sysroot") + libdir
++ self.library_dirs.append(libdir)
+ else:
+ # building python standard extensions
+ self.library_dirs.append('.')
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+index d72b6e5..72151df 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
-@@ -19,8 +19,13 @@
+@@ -19,8 +19,13 @@ import sys
from distutils.errors import DistutilsPlatformError
# These are needed in a couple of spots, so just compute them once.
@@ -36,19 +59,6 @@ Index: b/Lib/distutils/sysconfig.py
# Path to the base directory of the project. On Windows the binary may
# live in project/PCBuild9. If we're dealing with an x64 Windows build,
-Index: b/Lib/distutils/command/build_ext.py
-===================================================================
---- a/Lib/distutils/command/build_ext.py
-+++ b/Lib/distutils/command/build_ext.py
-@@ -237,7 +237,10 @@
- if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
- if not sysconfig.python_build:
- # building third party extensions
-- self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
-+ libdir = sysconfig.get_config_var('LIBDIR')
-+ if "_python_sysroot" in os.environ:
-+ libdir = os.environ.get("_python_sysroot") + libdir
-+ self.library_dirs.append(libdir)
- else:
- # building python standard extensions
- self.library_dirs.append('.')
+--
+2.7.4
+
diff --git a/buildroot/package/python/009-no-termcap-host-path.patch b/buildroot/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
similarity index 67%
rename from buildroot/package/python/009-no-termcap-host-path.patch
rename to buildroot/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
index 781e17952..d523b7463 100644
--- a/buildroot/package/python/009-no-termcap-host-path.patch
+++ b/buildroot/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
@@ -1,13 +1,18 @@
-Don't look in /usr/lib/termcap for libraries
+From 87b627d8845e67fd798449b414bece04f18bd450 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:22:40 +0100
+Subject: [PATCH] Don't look in /usr/lib/termcap for libraries
Signed-off-by: Thomas Petazzoni
+---
+ setup.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
-
-Index: b/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index 3b51c0a..fa32532 100644
--- a/setup.py
+++ b/setup.py
-@@ -764,12 +764,9 @@
+@@ -784,12 +784,9 @@ class PyBuildExt(build_ext):
pass # Issue 7384: Already linked against curses or tinfo.
elif curses_library:
readline_libs.append(curses_library)
@@ -21,3 +26,6 @@ Index: b/setup.py
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
else:
+--
+2.7.4
+
diff --git a/buildroot/package/python/010-fix-python-config.patch b/buildroot/package/python/0009-Fix-python-config-for-cross-builds.patch
similarity index 77%
rename from buildroot/package/python/010-fix-python-config.patch
rename to buildroot/package/python/0009-Fix-python-config-for-cross-builds.patch
index 2beb2333b..761d6d929 100644
--- a/buildroot/package/python/010-fix-python-config.patch
+++ b/buildroot/package/python/0009-Fix-python-config-for-cross-builds.patch
@@ -1,55 +1,31 @@
+From e5b0d225f4343e82791cb80e4e0c01a9b49eeff4 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias
+Date: Tue, 7 Mar 2017 22:23:14 +0100
+Subject: [PATCH] Fix python-config for cross-builds
+
Add a backport of http://bugs.python.org/issue16235 so we can use
python-config for cross builds.
-This basically replaces the python version of python-config with a pure-shell
-version that's already preprocessed when installed and doesn't depend
-on the sysconfig import that usually leads to bad data/results.
+
+This basically replaces the python version of python-config with a
+pure-shell version that's already preprocessed when installed and
+doesn't depend on the sysconfig import that usually leads to bad
+data/results.
Signed-off-by: Gustavo Zacarias
+[Bernd: rebased for Python 2.7.15]
+Signed-off-by: Bernd Kuhls
+---
+ Makefile.pre.in | 13 +++---
+ Misc/python-config.sh.in | 102 +++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 7 +++-
+ 3 files changed, 116 insertions(+), 6 deletions(-)
+ create mode 100644 Misc/python-config.sh.in
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -882,6 +882,7 @@
-
- # Other platforms follow
- if test $enable_shared = "yes"; then
-+ PY_ENABLE_SHARED=1
- AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.])
- case $ac_sys_system in
- BeOS*)
-@@ -942,6 +943,7 @@
-
- esac
- else # shared is disabled
-+ PY_ENABLE_SHARED=0
- case $ac_sys_system in
- CYGWIN*)
- BLDLIBRARY='$(LIBRARY)'
-@@ -1918,6 +1920,9 @@
- AC_SUBST(BLDSHARED)
- AC_SUBST(CCSHARED)
- AC_SUBST(LINKFORSHARED)
-+AC_SUBST(PY_ENABLE_SHARED)
-+LIBPL="${prefix}/lib/python${VERSION}/config"
-+AC_SUBST(LIBPL)
- # SO is the extension of shared libraries `(including the dot!)
- # -- usually .so, .sl on HP-UX, .dll on Cygwin
- AC_MSG_CHECKING(SO)
-@@ -4581,7 +4586,7 @@
- AC_SUBST(ENSUREPIP)
-
- # generate output files
--AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc)
-+AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh)
- AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
- AC_OUTPUT
-
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 33b994d..beb0837 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -166,7 +166,7 @@
+@@ -171,7 +171,7 @@ SRCDIRS= @SRCDIRS@
SUBDIRSTOO= Include Lib Misc Demo
# Files and directories to be distributed
@@ -58,16 +34,16 @@ Index: b/Makefile.pre.in
DISTFILES= README ChangeLog $(CONFIGFILES)
DISTDIRS= $(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
DIST= $(DISTFILES) $(DISTDIRS)
-@@ -410,7 +410,7 @@
+@@ -431,7 +431,7 @@ LIBRARY_OBJS= \
# Default target
- all: build_all
--build_all: $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks
-+build_all: $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks python-config
+ all: @DEF_MAKE_ALL_RULE@
+-build_all: check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks
++build_all: check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks python-config
- # Compile a binary with gcc profile guided optimization.
+ # Compile a binary with profile guided optimization.
profile-opt:
-@@ -1101,10 +1101,12 @@
+@@ -1179,10 +1179,12 @@ $(srcdir)/Lib/$(PLATDIR):
fi; \
cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
@@ -82,7 +58,7 @@ Index: b/Makefile.pre.in
# Install the include files
INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
-@@ -1163,7 +1165,7 @@
+@@ -1241,7 +1243,7 @@ libainstall: all python-config
$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
@@ -91,7 +67,7 @@ Index: b/Makefile.pre.in
@if [ -s Modules/python.exp -a \
"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
echo; echo "Installing support files for building shared extension modules on AIX:"; \
-@@ -1345,6 +1347,7 @@
+@@ -1426,6 +1428,7 @@ clobber: clean profile-removal
config.cache config.log pyconfig.h Modules/config.c
-rm -rf build platform
-rm -rf $(PYTHONFRAMEWORKDIR)
@@ -99,8 +75,9 @@ Index: b/Makefile.pre.in
# Make things extra clean, before making a distribution:
# remove all generated files, even Makefile[.pre]
-Index: b/Misc/python-config.sh.in
-===================================================================
+diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
+new file mode 100644
+index 0000000..10db4c1
--- /dev/null
+++ b/Misc/python-config.sh.in
@@ -0,0 +1,102 @@
@@ -206,3 +183,45 @@ Index: b/Misc/python-config.sh.in
+ ;;
+esac
+done
+diff --git a/configure.ac b/configure.ac
+index 5d4232f..183a903 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -905,6 +905,7 @@ fi
+
+ # Other platforms follow
+ if test $enable_shared = "yes"; then
++ PY_ENABLE_SHARED=1
+ AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.])
+ case $ac_sys_system in
+ BeOS*)
+@@ -965,6 +966,7 @@ if test $enable_shared = "yes"; then
+
+ esac
+ else # shared is disabled
++ PY_ENABLE_SHARED=0
+ case $ac_sys_system in
+ CYGWIN*)
+ BLDLIBRARY='$(LIBRARY)'
+@@ -2096,6 +2098,9 @@ AC_SUBST(LDCXXSHARED)
+ AC_SUBST(BLDSHARED)
+ AC_SUBST(CCSHARED)
+ AC_SUBST(LINKFORSHARED)
++AC_SUBST(PY_ENABLE_SHARED)
++LIBPL="${prefix}/lib/python${VERSION}/config"
++AC_SUBST(LIBPL)
+ # SO is the extension of shared libraries `(including the dot!)
+ # -- usually .so, .sl on HP-UX, .dll on Cygwin
+ AC_MSG_CHECKING(SO)
+@@ -4818,7 +4823,7 @@ AC_MSG_RESULT($ENSUREPIP)
+ AC_SUBST(ENSUREPIP)
+
+ # generate output files
+-AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc)
++AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh)
+ AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
+ AC_OUTPUT
+
+--
+2.7.4
+
diff --git a/buildroot/package/python/011-remove-python-symlink.patch b/buildroot/package/python/0010-Remove-the-python-symlink-install-rules.patch
similarity index 55%
rename from buildroot/package/python/011-remove-python-symlink.patch
rename to buildroot/package/python/0010-Remove-the-python-symlink-install-rules.patch
index b0548c31d..864ccbfb7 100644
--- a/buildroot/package/python/011-remove-python-symlink.patch
+++ b/buildroot/package/python/0010-Remove-the-python-symlink-install-rules.patch
@@ -1,19 +1,27 @@
-Remove the python symlink install rules.
+From bddfcbb8a4c011ca2fe471f7a4124cd64b5b0f00 Mon Sep 17 00:00:00 2001
+From: Samuel Martin
+Date: Tue, 7 Mar 2017 22:23:58 +0100
+Subject: [PATCH] Remove the python symlink install rules
-The python symlink installation will be handled by Buildroot itself, because
-Buildroot needs to control to what python interpreter (python2 or python3) the
-python symlink points to.
+The python symlink installation will be handled by Buildroot itself,
+because Buildroot needs to control to what python interpreter (python2
+or python3) the python symlink points to.
Signed-off-by: Samuel Martin
+[Bernd: rebased against version 2.7.12.]
+Signed-off-by: Bernd Kuhls
+---
+ Makefile.pre.in | 7 -------
+ 1 file changed, 7 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index beb0837..dedcf61 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -890,17 +890,10 @@
- # $(PYTHON) -> python2 -> python$(VERSION))
- # Also create equivalent chains for other installed files
- bininstall: altbininstall
+@@ -968,17 +968,10 @@ bininstall: altbininstall
+ echo "Creating directory $(LIBPC)"; \
+ $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \
+ fi
- -if test -f $(DESTDIR)$(BINDIR)/$(PYTHON) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON); \
- then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
- else true; \
@@ -28,3 +36,6 @@ Index: b/Makefile.pre.in
-test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC)
-rm -f $(DESTDIR)$(LIBPC)/python2.pc
(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc)
+--
+2.7.4
+
diff --git a/buildroot/package/python/013-dont-add-multiarch-path.patch b/buildroot/package/python/0011-Don-t-add-multiarch-paths.patch
similarity index 68%
rename from buildroot/package/python/013-dont-add-multiarch-path.patch
rename to buildroot/package/python/0011-Don-t-add-multiarch-paths.patch
index 24e7af9ff..b84c9077c 100644
--- a/buildroot/package/python/013-dont-add-multiarch-path.patch
+++ b/buildroot/package/python/0011-Don-t-add-multiarch-paths.patch
@@ -1,4 +1,7 @@
-Don't add multiarch paths
+From 50a243a9c90f95e9248ac720e42e802b5922ab90 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:24:28 +0100
+Subject: [PATCH] Don't add multiarch paths
The add_multiarch_paths() function leads, in certain build
environments, to the addition of host header paths to the CFLAGS,
@@ -9,12 +12,15 @@ cross-compiling.
Investigation done by David .
Signed-off-by: Thomas Petazzoni
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-Index: b/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index fa32532..0b9ea57 100644
--- a/setup.py
+++ b/setup.py
-@@ -456,9 +456,9 @@
+@@ -461,9 +461,9 @@ class PyBuildExt(build_ext):
if not cross_compiling:
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
@@ -25,3 +31,6 @@ Index: b/setup.py
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
+--
+2.7.4
+
diff --git a/buildroot/package/python/014-abort-on-failed-modules.patch b/buildroot/package/python/0012-Abort-on-failed-module-build.patch
similarity index 57%
rename from buildroot/package/python/014-abort-on-failed-modules.patch
rename to buildroot/package/python/0012-Abort-on-failed-module-build.patch
index 4bceeb62d..7d952ca5c 100644
--- a/buildroot/package/python/014-abort-on-failed-modules.patch
+++ b/buildroot/package/python/0012-Abort-on-failed-module-build.patch
@@ -1,4 +1,7 @@
-Abort on failed module build
+From a131e2ff219872d97eef6585117bd2f8ff9e310d Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:24:48 +0100
+Subject: [PATCH] Abort on failed module build
When building a Python module fails, the setup.py script currently
doesn't exit with an error, and simply continues. This is not a really
@@ -6,12 +9,15 @@ nice behavior, so this patch changes setup.py to abort with an error,
so that the build issue is clearly noticeable.
Signed-off-by: Thomas Petazzoni
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
-Index: b/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index 0b9ea57..9a5c2b8 100644
--- a/setup.py
+++ b/setup.py
-@@ -283,6 +283,7 @@
+@@ -299,6 +299,7 @@ class PyBuildExt(build_ext):
print "Failed to build these modules:"
print_three_column(failed)
print
@@ -19,3 +25,6 @@ Index: b/setup.py
def build_extension(self, ext):
+--
+2.7.4
+
diff --git a/buildroot/package/python/015-fix-sqlite-without-threads.patch b/buildroot/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch
similarity index 72%
rename from buildroot/package/python/015-fix-sqlite-without-threads.patch
rename to buildroot/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch
index f51c37b37..dfc11efc7 100644
--- a/buildroot/package/python/015-fix-sqlite-without-threads.patch
+++ b/buildroot/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch
@@ -1,4 +1,7 @@
-sqlite3: fix build when threads are not used/available
+From 0f0be88526ece7d2f6ee21c1f59b1546ec6dc7c0 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN"
+Date: Tue, 7 Mar 2017 22:25:14 +0100
+Subject: [PATCH] sqlite3: fix build when threads are not used/available
When threads are not used/available, a function in the sqlite3 extension
ends up with a label at the end:
@@ -34,12 +37,15 @@ Fix that by adding a dummy statement after the label, so that the label
is never the last statement of the function.
Signed-off-by: "Yann E. MORIN"
+---
+ Modules/_sqlite/connection.c | 1 +
+ 1 file changed, 1 insertion(+)
-Index: b/Modules/_sqlite/connection.c
-===================================================================
+diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
+index 237d6e4..cdf69ab 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
-@@ -786,6 +786,7 @@
+@@ -794,6 +794,7 @@ error:
#ifdef WITH_THREAD
PyGILState_Release(threadstate);
#endif
@@ -47,3 +53,6 @@ Index: b/Modules/_sqlite/connection.c
}
static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self)
+--
+2.7.4
+
diff --git a/buildroot/package/python/016-serial-ioctl-workaround.patch b/buildroot/package/python/0014-Serial-ioctl-workaround.patch
similarity index 66%
rename from buildroot/package/python/016-serial-ioctl-workaround.patch
rename to buildroot/package/python/0014-Serial-ioctl-workaround.patch
index 80ed65e39..468d535ac 100644
--- a/buildroot/package/python/016-serial-ioctl-workaround.patch
+++ b/buildroot/package/python/0014-Serial-ioctl-workaround.patch
@@ -1,4 +1,7 @@
-Serial ioctl() workaround
+From 22e5a4c5d29ddf0856d7f68f5a613aec00e26168 Mon Sep 17 00:00:00 2001
+From: Baruch Siach
+Date: Tue, 7 Mar 2017 22:25:36 +0100
+Subject: [PATCH] Serial ioctl() workaround
The ioctls.h of some architectures (notably xtensa) references structs from
linux/serial.h. Make sure to include this header as well.
@@ -8,8 +11,11 @@ but isn't actually referenced in modern kernels.
Signed-off-by: Baruch Siach
---
-Index: b/Modules/termios.c
-===================================================================
+ Modules/termios.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Modules/termios.c b/Modules/termios.c
+index 57f30dc..a8c9855 100644
--- a/Modules/termios.c
+++ b/Modules/termios.c
@@ -16,7 +16,9 @@
@@ -22,3 +28,6 @@ Index: b/Modules/termios.c
/* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR,
* MDTR, MRI, and MRTS (appearantly used internally by some things
+--
+2.7.4
+
diff --git a/buildroot/package/python/017-distutils-scripts-dont-adjust-shebang.patch b/buildroot/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
similarity index 61%
rename from buildroot/package/python/017-distutils-scripts-dont-adjust-shebang.patch
rename to buildroot/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
index da4dc36df..fecf29f4d 100644
--- a/buildroot/package/python/017-distutils-scripts-dont-adjust-shebang.patch
+++ b/buildroot/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
@@ -1,4 +1,8 @@
-Do not adjust the shebang of Python scripts for cross-compilation
+From 70049366ddf1fc9084bb02cf4459380976cdf8f7 Mon Sep 17 00:00:00 2001
+From: Christophe Vu-Brugier
+Date: Tue, 7 Mar 2017 22:26:09 +0100
+Subject: [PATCH] Do not adjust the shebang of Python scripts for
+ cross-compilation
The copy_scripts() method in distutils copies the scripts listed in
the setup file and adjusts the first line to refer to the current
@@ -9,12 +13,15 @@ This patch modifies copy_scripts() to preserve the shebang when
cross-compilation is detected.
Signed-off-by: Christophe Vu-Brugier
+---
+ Lib/distutils/command/build_scripts.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-Index: b/Lib/distutils/command/build_scripts.py
-===================================================================
+diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py
+index 567df65..4922d50 100644
--- a/Lib/distutils/command/build_scripts.py
+++ b/Lib/distutils/command/build_scripts.py
-@@ -89,7 +89,7 @@
+@@ -89,7 +89,7 @@ class build_scripts (Command):
adjust = 1
post_interp = match.group(1) or ''
@@ -23,3 +30,6 @@ Index: b/Lib/distutils/command/build_scripts.py
log.info("copying and adjusting %s -> %s", script,
self.build_dir)
if not self.dry_run:
+--
+2.7.4
+
diff --git a/buildroot/package/python/100-optional-test-modules.patch b/buildroot/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
similarity index 77%
rename from buildroot/package/python/100-optional-test-modules.patch
rename to buildroot/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
index 1180b2906..2e1a054f3 100644
--- a/buildroot/package/python/100-optional-test-modules.patch
+++ b/buildroot/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
@@ -1,21 +1,25 @@
-Add an option to disable installation of test modules
+From 0eac7789c0dd4aebe9e69d3c73d0c95e96922ea3 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:27:16 +0100
+Subject: [PATCH] Add an option to disable installation of test modules
The Python standard distribution comes with many test modules, that
are not necessarly useful on embedded targets.
Signed-off-by: Thomas Petazzoni
Signed-off-by: Samuel Martin
-
+[Bernd: rebased against version 2.7.14]
+Signed-off-by: Bernd Kuhls
---
- Makefile.pre.in | 40 +++++++++++++++++++++++++++-------------
- configure.in | 6 ++++++
- 2 files changed, 33 insertions(+), 13 deletions(-)
+ Makefile.pre.in | 48 ++++++++++++++++++++++++++++++++----------------
+ configure.ac | 6 ++++++
+ 2 files changed, 38 insertions(+), 16 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index dedcf61..280cc4e 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -960,27 +960,43 @@
+@@ -1032,28 +1032,44 @@
plat-mac/lib-scriptpackages/SystemEvents \
plat-mac/lib-scriptpackages/Terminal
PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
@@ -24,6 +28,7 @@ Index: b/Makefile.pre.in
- test/data test/cjkencodings test/decimaltestdata test/xmltestdata \
- test/imghdrdata \
- test/subprocessdata \
+- test/support \
- test/tracedmodules \
+LIBSUBDIRS= lib-tk site-packages \
encodings compiler hotshot \
@@ -56,6 +61,7 @@ Index: b/Makefile.pre.in
+ test/cjkencodings test/decimaltestdata test/xmltestdata \
+ test/imghdrdata \
+ test/subprocessdata \
++ test/support \
+ test/tracedmodules \
+ email/test email/test/data \
+ json/tests \
@@ -75,11 +81,11 @@ Index: b/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 183a903..a1a35f6 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2628,6 +2628,12 @@
+@@ -2806,6 +2806,12 @@ if test "$posix_threads" = "yes"; then
fi
@@ -92,3 +98,6 @@ Index: b/configure.ac
# Check for enable-ipv6
AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
AC_MSG_CHECKING([if --enable-ipv6 is specified])
+--
+2.7.4
+
diff --git a/buildroot/package/python/101-optional-pydoc.patch b/buildroot/package/python/0017-Add-an-option-to-disable-pydoc.patch
similarity index 70%
rename from buildroot/package/python/101-optional-pydoc.patch
rename to buildroot/package/python/0017-Add-an-option-to-disable-pydoc.patch
index d5dc3d72f..18582f189 100644
--- a/buildroot/package/python/101-optional-pydoc.patch
+++ b/buildroot/package/python/0017-Add-an-option-to-disable-pydoc.patch
@@ -1,22 +1,24 @@
-Add an option to disable pydoc
+From 52463745b6c46a46a6f2e2bc17983bb3f7bdac6e Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:27:34 +0100
+Subject: [PATCH] Add an option to disable pydoc
It removes 0.5 MB of data from the target plus the pydoc script
itself.
Signed-off-by: Thomas Petazzoni
Signed-off-by: Samuel Martin
-
---
- Makefile.pre.in | 6 +++++-
- configure.in | 5 +++++
- setup.py | 10 +++++++---
+ Makefile.pre.in | 6 +++++-
+ configure.ac | 5 +++++
+ setup.py | 10 +++++++---
3 files changed, 17 insertions(+), 4 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 280cc4e..84d5fc6 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -974,7 +974,7 @@
+@@ -1052,7 +1052,7 @@ LIBSUBDIRS= lib-tk site-packages \
multiprocessing multiprocessing/dummy \
unittest \
lib-old \
@@ -25,7 +27,7 @@ Index: b/Makefile.pre.in
TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
lib-tk/test/test_ttk test test/audiodata test/capath test/data \
-@@ -997,6 +997,10 @@
+@@ -1075,6 +1075,10 @@ ifeq (@TEST_MODULES@,yes)
LIBSUBDIRS += $(TESTSUBDIRS)
endif
@@ -36,11 +38,11 @@ Index: b/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index a1a35f6..8bab160 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2627,6 +2627,11 @@
+@@ -2805,6 +2805,11 @@ if test "$posix_threads" = "yes"; then
AC_CHECK_FUNCS(pthread_atfork)
fi
@@ -52,11 +54,11 @@ Index: b/configure.ac
AC_SUBST(TEST_MODULES)
-Index: b/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index 9a5c2b8..69771e2 100644
--- a/setup.py
+++ b/setup.py
-@@ -2222,6 +2222,12 @@
+@@ -2233,6 +2233,12 @@ def main():
# turn off warnings when deprecated modules are imported
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -69,7 +71,7 @@ Index: b/setup.py
setup(# PyPI Metadata (PEP 301)
name = "Python",
version = sys.version.split()[0],
-@@ -2242,9 +2248,7 @@
+@@ -2253,9 +2259,7 @@ def main():
ext_modules=[Extension('_struct', ['_struct.c'])],
# Scripts to install
@@ -80,3 +82,6 @@ Index: b/setup.py
)
# --install-platlib
+--
+2.7.4
+
diff --git a/buildroot/package/python/102-optional-2to3.patch b/buildroot/package/python/0018-Add-an-option-to-disable-lib2to3.patch
similarity index 71%
rename from buildroot/package/python/102-optional-2to3.patch
rename to buildroot/package/python/0018-Add-an-option-to-disable-lib2to3.patch
index 76edfa102..765b05d97 100644
--- a/buildroot/package/python/102-optional-2to3.patch
+++ b/buildroot/package/python/0018-Add-an-option-to-disable-lib2to3.patch
@@ -1,22 +1,24 @@
-Add an option to disable lib2to3
+From d0cf9ebed6d34d820cf594578cf513797fb52772 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:27:49 +0100
+Subject: [PATCH] Add an option to disable lib2to3
lib2to3 is a library to convert Python 2.x code to Python 3.x. As
such, it is probably not very useful on embedded system targets.
Signed-off-by: Thomas Petazzoni
Signed-off-by: Samuel Martin
-
---
- Makefile.pre.in | 24 +++++++++++++++++-------
- configure.in | 6 ++++++
- setup.py | 5 +++--
- 3 files changed, 26 insertions(+), 9 deletions(-)
+ Makefile.pre.in | 11 ++++++++---
+ configure.ac | 6 ++++++
+ setup.py | 5 +++--
+ 3 files changed, 17 insertions(+), 5 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 84d5fc6..b2a0490 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -967,7 +967,6 @@
+@@ -1045,7 +1045,6 @@ LIBSUBDIRS= lib-tk site-packages \
json \
sqlite3 \
logging bsddb csv importlib wsgiref \
@@ -24,7 +26,7 @@ Index: b/Makefile.pre.in
ctypes ctypes/macholib \
idlelib idlelib/Icons \
distutils distutils/command $(XMLLIBSUBDIRS) \
-@@ -986,8 +985,6 @@
+@@ -1064,8 +1063,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
json/tests \
sqlite3/test \
bsddb/test \
@@ -33,7 +35,7 @@ Index: b/Makefile.pre.in
ctypes/test \
idlelib/idle_test \
distutils/tests \
-@@ -1001,6 +998,14 @@
+@@ -1079,6 +1076,14 @@ ifeq (@PYDOC@,yes)
LIBSUBDIRS += pydoc_data
endif
@@ -48,11 +50,11 @@ Index: b/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 8bab160..270f337 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2639,6 +2639,12 @@
+@@ -2817,6 +2817,12 @@ AC_ARG_ENABLE(test-modules,
AS_HELP_STRING([--disable-test-modules], [disable test modules]),
[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
@@ -65,11 +67,11 @@ Index: b/configure.ac
# Check for enable-ipv6
AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
AC_MSG_CHECKING([if --enable-ipv6 is specified])
-Index: b/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index 69771e2..f51ef8c 100644
--- a/setup.py
+++ b/setup.py
-@@ -2223,10 +2223,11 @@
+@@ -2234,10 +2234,11 @@ def main():
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -83,3 +85,6 @@ Index: b/setup.py
setup(# PyPI Metadata (PEP 301)
name = "Python",
+--
+2.7.4
+
diff --git a/buildroot/package/python/103-optional-sqlite.patch b/buildroot/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
similarity index 59%
rename from buildroot/package/python/103-optional-sqlite.patch
rename to buildroot/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
index eb43c7a02..bffe3faab 100644
--- a/buildroot/package/python/103-optional-sqlite.patch
+++ b/buildroot/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
@@ -1,38 +1,20 @@
-Add option to disable the sqlite3 module
+From 570e1e81484d9bcbd30a7719b07d02785a5cab24 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:28:06 +0100
+Subject: [PATCH] Add option to disable the sqlite3 module
Signed-off-by: Thomas Petazzoni
Signed-off-by: Samuel Martin
-
---
- Makefile.pre.in | 24 +++++++++++++++++-------
- configure.in | 9 +++++++++
- 2 file changed, 9 insertions(+)
+ Makefile.pre.in | 7 +++++--
+ configure.ac | 9 +++++++++
+ 2 files changed, 14 insertions(+), 2 deletions(-)
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2627,6 +2627,15 @@
- AC_CHECK_FUNCS(pthread_atfork)
- fi
-
-+AC_SUBST(SQLITE3)
-+AC_ARG_ENABLE(sqlite3,
-+ AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]),
-+ [ SQLITE3="${enableval}" ], [ SQLITE3=yes ])
-+
-+if test "$SQLITE3" = "no" ; then
-+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
-+fi
-+
- AC_SUBST(PYDOC)
-
- AC_ARG_ENABLE(pydoc,
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index b2a0490..974a052 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -965,7 +965,6 @@
+@@ -1043,7 +1043,6 @@ LIBSUBDIRS= lib-tk site-packages \
email email/mime \
ensurepip ensurepip/_bundled \
json \
@@ -40,7 +22,7 @@ Index: b/Makefile.pre.in
logging bsddb csv importlib wsgiref \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
-@@ -983,7 +982,6 @@
+@@ -1061,7 +1060,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
test/tracedmodules \
email/test email/test/data \
json/tests \
@@ -48,7 +30,7 @@ Index: b/Makefile.pre.in
bsddb/test \
ctypes/test \
idlelib/idle_test \
-@@ -1006,6 +1004,11 @@
+@@ -1084,6 +1082,11 @@ TESTSUBDIRS += lib2to3/tests \
lib2to3/tests/data/fixers/myfixes
endif
@@ -60,3 +42,26 @@ Index: b/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
+diff --git a/configure.ac b/configure.ac
+index 270f337..e9e1897 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2805,6 +2805,15 @@ if test "$posix_threads" = "yes"; then
+ AC_CHECK_FUNCS(pthread_atfork)
+ fi
+
++AC_SUBST(SQLITE3)
++AC_ARG_ENABLE(sqlite3,
++ AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]),
++ [ SQLITE3="${enableval}" ], [ SQLITE3=yes ])
++
++if test "$SQLITE3" = "no" ; then
++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
++fi
++
+ AC_SUBST(PYDOC)
+
+ AC_ARG_ENABLE(pydoc,
+--
+2.7.4
+
diff --git a/buildroot/package/python/104-optional-tk.patch b/buildroot/package/python/0020-Add-an-option-to-disable-the-tk-module.patch
similarity index 65%
rename from buildroot/package/python/104-optional-tk.patch
rename to buildroot/package/python/0020-Add-an-option-to-disable-the-tk-module.patch
index f402e420f..82df405e4 100644
--- a/buildroot/package/python/104-optional-tk.patch
+++ b/buildroot/package/python/0020-Add-an-option-to-disable-the-tk-module.patch
@@ -1,18 +1,20 @@
-Add an option to disable the tk module
+From 05fbe2527b6f87edeef11f288c36bcbaa378ca02 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:28:57 +0100
+Subject: [PATCH] Add an option to disable the tk module
Signed-off-by: Thomas Petazzoni
Signed-off-by: Samuel Martin
-
---
- Makefile.pre.in | 14 ++++++++++----
- configure.in | 9 +++++++++
- 2 files changed, 19 insertions(+), 4 deletions(-)
+ Makefile.pre.in | 11 ++++++++---
+ configure.ac | 9 +++++++++
+ 2 files changed, 17 insertions(+), 3 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 974a052..f7f025f 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -960,7 +960,7 @@
+@@ -1038,7 +1038,7 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
plat-mac/lib-scriptpackages/SystemEvents \
plat-mac/lib-scriptpackages/Terminal
PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
@@ -21,7 +23,7 @@ Index: b/Makefile.pre.in
encodings compiler hotshot \
email email/mime \
ensurepip ensurepip/_bundled \
-@@ -974,8 +974,7 @@
+@@ -1052,8 +1052,7 @@ LIBSUBDIRS= lib-tk site-packages \
lib-old \
curses $(MACHDEPS)
@@ -31,7 +33,7 @@ Index: b/Makefile.pre.in
test/cjkencodings test/decimaltestdata test/xmltestdata \
test/imghdrdata \
test/subprocessdata \
-@@ -1009,6 +1008,12 @@
+@@ -1087,6 +1086,12 @@ LIBSUBDIRS += sqlite3
TESTSUBDIRS += sqlite3/test
endif
@@ -44,11 +46,11 @@ Index: b/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index e9e1897..d0f032c 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2636,6 +2636,15 @@
+@@ -2814,6 +2814,15 @@ if test "$SQLITE3" = "no" ; then
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
@@ -64,3 +66,6 @@ Index: b/configure.ac
AC_SUBST(PYDOC)
AC_ARG_ENABLE(pydoc,
+--
+2.7.4
+
diff --git a/buildroot/package/python/105-optional-curses.patch b/buildroot/package/python/0021-Add-an-option-to-disable-the-curses-module.patch
similarity index 62%
rename from buildroot/package/python/105-optional-curses.patch
rename to buildroot/package/python/0021-Add-an-option-to-disable-the-curses-module.patch
index a73fb04e3..c36942ad6 100644
--- a/buildroot/package/python/105-optional-curses.patch
+++ b/buildroot/package/python/0021-Add-an-option-to-disable-the-curses-module.patch
@@ -1,18 +1,20 @@
-Add an option to disable the curses module
+From dba12f15baad06cc7e17a275201cc022bb6c84f7 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:29:06 +0100
+Subject: [PATCH] Add an option to disable the curses module
Signed-off-by: Thomas Petazzoni
Signed-off-by: Samuel Martin
-
---
- Makefile.pre.in | 6 +++++-
- configure.in | 9 +++++++++
+ Makefile.pre.in | 6 +++++-
+ configure.ac | 9 +++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index f7f025f..bd537d9 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -972,7 +972,7 @@
+@@ -1050,7 +1050,7 @@ LIBSUBDIRS= site-packages \
multiprocessing multiprocessing/dummy \
unittest \
lib-old \
@@ -21,7 +23,7 @@ Index: b/Makefile.pre.in
TESTSUBDIRS = test test/audiodata test/capath test/data \
test/cjkencodings test/decimaltestdata test/xmltestdata \
-@@ -1014,6 +1014,10 @@
+@@ -1092,6 +1092,10 @@ TESTSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \
lib-tk/test/test_ttk
endif
@@ -32,11 +34,11 @@ Index: b/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index d0f032c..ab081bc 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2645,6 +2645,15 @@
+@@ -2823,6 +2823,15 @@ if test "$TK" = "no"; then
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
fi
@@ -52,3 +54,6 @@ Index: b/configure.ac
AC_SUBST(PYDOC)
AC_ARG_ENABLE(pydoc,
+--
+2.7.4
+
diff --git a/buildroot/package/python/106-optional-expat.patch b/buildroot/package/python/0022-Add-an-option-to-disable-expat.patch
similarity index 75%
rename from buildroot/package/python/106-optional-expat.patch
rename to buildroot/package/python/0022-Add-an-option-to-disable-expat.patch
index 1ee117cec..8253f112f 100644
--- a/buildroot/package/python/106-optional-expat.patch
+++ b/buildroot/package/python/0022-Add-an-option-to-disable-expat.patch
@@ -1,4 +1,7 @@
-Add an option to disable expat
+From 5f0f30bf342cd2b13f98513c39fd8f17351b1a2f Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:29:20 +0100
+Subject: [PATCH] Add an option to disable expat
This patch replaces the existing --with-system-expat option with a
--with-expat={system,builtin,none} option, which allows to tell Python
@@ -8,18 +11,17 @@ installation of XML modules).
Signed-off-by: Thomas Petazzoni
Signed-off-by: Samuel Martin
-
---
- Makefile.pre.in | 6 +++++-
- configure.in | 18 +++++++++++++-----
- setup.py | 2 +-
+ Makefile.pre.in | 6 +++++-
+ configure.ac | 18 +++++++++++++-----
+ setup.py | 2 +-
3 files changed, 19 insertions(+), 7 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index bd537d9..e5d0dd7 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -968,7 +968,7 @@
+@@ -1046,7 +1046,7 @@ LIBSUBDIRS= site-packages \
logging bsddb csv importlib wsgiref \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
@@ -28,7 +30,7 @@ Index: b/Makefile.pre.in
multiprocessing multiprocessing/dummy \
unittest \
lib-old \
-@@ -1018,6 +1018,10 @@
+@@ -1096,6 +1096,10 @@ ifeq (@CURSES@,yes)
LIBSUBDIRS += curses
endif
@@ -39,11 +41,11 @@ Index: b/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index ab081bc..63ee545 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2292,13 +2292,21 @@
+@@ -2470,13 +2470,21 @@ PKG_PROG_PKG_CONFIG
AC_SUBST(DISABLED_EXTENSIONS)
# Check for use of the system expat library
@@ -70,11 +72,11 @@ Index: b/configure.ac
# Check for use of the system libffi library
AC_MSG_CHECKING(for --with-system-ffi)
-Index: b/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index f51ef8c..c68f6b4 100644
--- a/setup.py
+++ b/setup.py
-@@ -1474,7 +1474,7 @@
+@@ -1483,7 +1483,7 @@ class PyBuildExt(build_ext):
#
# More information on Expat can be found at www.libexpat.org.
#
@@ -83,3 +85,6 @@ Index: b/setup.py
expat_inc = []
define_macros = []
expat_lib = ['expat']
+--
+2.7.4
+
diff --git a/buildroot/package/python/107-optional-codecs-cjk.patch b/buildroot/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
similarity index 58%
rename from buildroot/package/python/107-optional-codecs-cjk.patch
rename to buildroot/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
index 6329b0cca..e2c2d98b3 100644
--- a/buildroot/package/python/107-optional-codecs-cjk.patch
+++ b/buildroot/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
@@ -1,16 +1,18 @@
-Add an option to disable CJK codecs
+From cb848dae763a3f57e31d734d3be6889f660fa0d0 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:29:31 +0100
+Subject: [PATCH] Add an option to disable CJK codecs
Signed-off-by: Thomas Petazzoni
-
---
- configure.in | 6 ++++++
+ configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 63ee545..6a854ab 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2644,6 +2644,12 @@
+@@ -2822,6 +2822,12 @@ if test "$SQLITE3" = "no" ; then
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
@@ -23,3 +25,6 @@ Index: b/configure.ac
AC_SUBST(TK)
AC_ARG_ENABLE(tk,
AS_HELP_STRING([--disable-tk], [disable tk]),
+--
+2.7.4
+
diff --git a/buildroot/package/python/108-optional-nis.patch b/buildroot/package/python/0024-Add-an-option-to-disable-NIS.patch
similarity index 63%
rename from buildroot/package/python/108-optional-nis.patch
rename to buildroot/package/python/0024-Add-an-option-to-disable-NIS.patch
index f07bbb610..877dfd965 100644
--- a/buildroot/package/python/108-optional-nis.patch
+++ b/buildroot/package/python/0024-Add-an-option-to-disable-NIS.patch
@@ -1,19 +1,21 @@
-Add an option to disable NIS
+From 133776d396b8eaf0243484dc990a53576de9685f Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:29:41 +0100
+Subject: [PATCH] Add an option to disable NIS
NIS is not necessarily available in uClibc, so we need an option to
not compile support for it.
Signed-off-by: Thomas Petazzoni
-
---
- configure.in | 6 ++++++
+ configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 6a854ab..4c2cbc1 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2650,6 +2650,12 @@
+@@ -2828,6 +2828,12 @@ AC_ARG_ENABLE(codecs-cjk,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
fi])
@@ -26,3 +28,6 @@ Index: b/configure.ac
AC_SUBST(TK)
AC_ARG_ENABLE(tk,
AS_HELP_STRING([--disable-tk], [disable tk]),
+--
+2.7.4
+
diff --git a/buildroot/package/python/109-optional-unicodedata.patch b/buildroot/package/python/0025-Add-an-option-to-disable-unicodedata.patch
similarity index 58%
rename from buildroot/package/python/109-optional-unicodedata.patch
rename to buildroot/package/python/0025-Add-an-option-to-disable-unicodedata.patch
index 10da1ea78..a1255e568 100644
--- a/buildroot/package/python/109-optional-unicodedata.patch
+++ b/buildroot/package/python/0025-Add-an-option-to-disable-unicodedata.patch
@@ -1,16 +1,18 @@
-Add an option to disable unicodedata
+From aa78e3684c0e8f7a5e910e838f9eca2631262048 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:29:52 +0100
+Subject: [PATCH] Add an option to disable unicodedata
Signed-off-by: Thomas Petazzoni
-
---
- configure.in | 6 ++++++
+ configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 4c2cbc1..09cb3de 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2656,6 +2656,12 @@
+@@ -2834,6 +2834,12 @@ AC_ARG_ENABLE(nis,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
@@ -23,3 +25,6 @@ Index: b/configure.ac
AC_SUBST(TK)
AC_ARG_ENABLE(tk,
AS_HELP_STRING([--disable-tk], [disable tk]),
+--
+2.7.4
+
diff --git a/buildroot/package/python/110-optional-db.patch b/buildroot/package/python/0026-Add-an-option-to-disable-bsddb.patch
similarity index 72%
rename from buildroot/package/python/110-optional-db.patch
rename to buildroot/package/python/0026-Add-an-option-to-disable-bsddb.patch
index 4b54e24cd..e3ccd4498 100644
--- a/buildroot/package/python/110-optional-db.patch
+++ b/buildroot/package/python/0026-Add-an-option-to-disable-bsddb.patch
@@ -1,4 +1,7 @@
-Add an option to disable bsddb
+From cfad2bcae8f572a9422ce5a6adb4caa7c0e521ad Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:30:06 +0100
+Subject: [PATCH] Add an option to disable bsddb
bsddb has an external dependency on Berkeley DB. Since we want to be
able to build Python without it, this patch adds an option to disable
@@ -6,17 +9,16 @@ the build/installation of this Python module.
Signed-off-by: Thomas Petazzoni
Signed-off-by: Samuel Martin
-
---
- Makefile.pre.in | 10 ++++++++--
- configure.in | 22 ++++++++++++++++++++++
- 2 files changed, 30 insertions(+), 2 deletions(-)
+ Makefile.pre.in | 8 ++++++--
+ configure.ac | 22 ++++++++++++++++++++++
+ 2 files changed, 28 insertions(+), 2 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index e5d0dd7..2582574 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -965,7 +965,7 @@
+@@ -1043,7 +1043,7 @@ LIBSUBDIRS= site-packages \
email email/mime \
ensurepip ensurepip/_bundled \
json \
@@ -25,7 +27,7 @@ Index: b/Makefile.pre.in
ctypes ctypes/macholib \
idlelib idlelib/Icons \
distutils distutils/command \
-@@ -981,7 +981,6 @@
+@@ -1059,7 +1059,6 @@ TESTSUBDIRS = test test/audiodata test/capath test/data \
test/tracedmodules \
email/test email/test/data \
json/tests \
@@ -33,7 +35,7 @@ Index: b/Makefile.pre.in
ctypes/test \
idlelib/idle_test \
distutils/tests \
-@@ -1022,6 +1021,11 @@
+@@ -1100,6 +1099,11 @@ ifeq (@EXPAT@,yes)
LIBSUBDIRS += $(XMLLIBSUBDIRS)
endif
@@ -45,11 +47,11 @@ Index: b/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 09cb3de..524614c 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2656,6 +2656,28 @@
+@@ -2834,6 +2834,28 @@ AC_ARG_ENABLE(nis,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
@@ -78,3 +80,6 @@ Index: b/configure.ac
AC_ARG_ENABLE(unicodedata,
AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]),
[ if test "$enableval" = "no"; then
+--
+2.7.4
+
diff --git a/buildroot/package/python/111-optional-ssl.patch b/buildroot/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
similarity index 50%
rename from buildroot/package/python/111-optional-ssl.patch
rename to buildroot/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
index 72891cd59..5f2fb87b1 100644
--- a/buildroot/package/python/111-optional-ssl.patch
+++ b/buildroot/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
@@ -1,25 +1,30 @@
-Add an option to disable the ssl module
+From fc16ab40e3e6a5b4deed2fa7c5475fa216ff8d17 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:30:22 +0100
+Subject: [PATCH] Add an option to disable the ssl module
Signed-off-by: Thomas Petazzoni
-
---
- configure.in | 6 ++++++
+ configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 524614c..cadac82 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2656,6 +2656,12 @@
+@@ -2834,6 +2834,12 @@ AC_ARG_ENABLE(nis,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
+AC_ARG_ENABLE(ssl,
+ AS_HELP_STRING([--disable-ssl], [disable SSL]),
+ [ if test "$enableval" = "no"; then
-+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _ssl"
+ fi])
+
AC_ARG_ENABLE(dbm,
AS_HELP_STRING([--disable-dbm], [disable DBM]),
[ if test "$enableval" = "no"; then
+--
+2.7.4
+
diff --git a/buildroot/package/python/112-optional-bzip2.patch b/buildroot/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
similarity index 58%
rename from buildroot/package/python/112-optional-bzip2.patch
rename to buildroot/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
index 3a646e17a..da914b478 100644
--- a/buildroot/package/python/112-optional-bzip2.patch
+++ b/buildroot/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
@@ -1,15 +1,18 @@
-Add an option to disable the bz2 module
+From 6b10788fa040442ace100c3a28cbfff29c9db471 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:30:33 +0100
+Subject: [PATCH] Add an option to disable the bz2 module
Signed-off-by: Thomas Petazzoni
---
- configure.in | 6 ++++++
+ configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 743707a..f1762e9 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2662,6 +2662,12 @@
+@@ -2840,6 +2840,12 @@ AC_ARG_ENABLE(ssl,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
fi])
@@ -22,3 +25,6 @@ Index: b/configure.ac
AC_ARG_ENABLE(dbm,
AS_HELP_STRING([--disable-dbm], [disable DBM]),
[ if test "$enableval" = "no"; then
+--
+2.7.4
+
diff --git a/buildroot/package/python/113-optional-zlib.patch b/buildroot/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
similarity index 58%
rename from buildroot/package/python/113-optional-zlib.patch
rename to buildroot/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
index a4ca8bd44..b4354e27d 100644
--- a/buildroot/package/python/113-optional-zlib.patch
+++ b/buildroot/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
@@ -1,15 +1,18 @@
-Add an option to disable the zlib module
+From af2c56aa0a5900272cc2d04ce667d4b38e34b596 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:30:45 +0100
+Subject: [PATCH] Add an option to disable the zlib module
Signed-off-by: Thomas Petazzoni
---
- configure.in | 6 ++++++
+ configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index f1762e9..291ba35 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2668,6 +2668,12 @@
+@@ -2846,6 +2846,12 @@ AC_ARG_ENABLE(bz2,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
fi])
@@ -22,3 +25,6 @@ Index: b/configure.ac
AC_ARG_ENABLE(dbm,
AS_HELP_STRING([--disable-dbm], [disable DBM]),
[ if test "$enableval" = "no"; then
+--
+2.7.4
+
diff --git a/buildroot/package/python/114-remove-idle-editor.patch b/buildroot/package/python/0030-Do-not-install-the-idle-editor.patch
similarity index 63%
rename from buildroot/package/python/114-remove-idle-editor.patch
rename to buildroot/package/python/0030-Do-not-install-the-idle-editor.patch
index 67b9050b1..60e64c885 100644
--- a/buildroot/package/python/114-remove-idle-editor.patch
+++ b/buildroot/package/python/0030-Do-not-install-the-idle-editor.patch
@@ -1,4 +1,7 @@
-Do not install the idle editor
+From 4b7c45c756dccfd3b5ece36fe572042353d1c2f0 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:30:56 +0100
+Subject: [PATCH] Do not install the idle editor
IDLE is the Python IDE built with the tkinter GUI toolkit. Since it's
highly unlikely to ever be useful in an embedded Linux system
@@ -7,12 +10,16 @@ idle and the related Python modules. It saves 800 KB-900 KB of
installed .pyc files.
Signed-off-by: Thomas Petazzoni
+---
+ Makefile.pre.in | 2 --
+ setup.py | 2 +-
+ 2 files changed, 1 insertion(+), 3 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 2582574..3cfc590 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -967,7 +967,6 @@
+@@ -1045,7 +1045,6 @@ LIBSUBDIRS= site-packages \
json \
logging csv importlib wsgiref \
ctypes ctypes/macholib \
@@ -20,7 +27,7 @@ Index: b/Makefile.pre.in
distutils distutils/command \
multiprocessing multiprocessing/dummy \
unittest \
-@@ -982,7 +981,6 @@
+@@ -1060,7 +1059,6 @@ TESTSUBDIRS = test test/audiodata test/capath test/data \
email/test email/test/data \
json/tests \
ctypes/test \
@@ -28,11 +35,11 @@ Index: b/Makefile.pre.in
distutils/tests \
unittest/test
-Index: b/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index c68f6b4..8045a9b 100644
--- a/setup.py
+++ b/setup.py
-@@ -2223,7 +2223,7 @@
+@@ -2234,7 +2234,7 @@ def main():
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -41,3 +48,6 @@ Index: b/setup.py
if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
scripts += [ 'Tools/scripts/pydoc' ]
if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"):
+--
+2.7.4
+
diff --git a/buildroot/package/python/115-optional-ossaudiodev.patch b/buildroot/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
similarity index 70%
rename from buildroot/package/python/115-optional-ossaudiodev.patch
rename to buildroot/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
index de820368e..c2aea5ede 100644
--- a/buildroot/package/python/115-optional-ossaudiodev.patch
+++ b/buildroot/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
@@ -1,7 +1,7 @@
-From 30351d9b41a03c43d627d52d46e49ab91bfe342d Mon Sep 17 00:00:00 2001
+From 6af0f179d3db956146bbabac8748675e3abc1f78 Mon Sep 17 00:00:00 2001
From: Zoltan Gyarmati
-Date: Thu, 8 Jan 2015 11:41:40 +0100
-Subject: [PATCH 1/1] Add an option to disable the ossaudiodev module
+Date: Tue, 7 Mar 2017 22:31:22 +0100
+Subject: [PATCH] Add an option to disable the ossaudiodev module
Signed-off-by: Zoltan Gyarmati
---
@@ -9,10 +9,10 @@ Signed-off-by: Zoltan Gyarmati
1 file changed, 6 insertions(+)
diff --git a/configure.ac b/configure.ac
-index e8cb52a..579e05b 100644
+index 291ba35..8dc573e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2717,6 +2717,12 @@ if test "$CURSES" = "no"; then
+@@ -2898,6 +2898,12 @@ if test "$CURSES" = "no"; then
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
fi
@@ -26,5 +26,5 @@ index e8cb52a..579e05b 100644
AC_ARG_ENABLE(pydoc,
--
-2.1.0
+2.7.4
diff --git a/buildroot/package/python/0032-Add-option-to-disable-the-hashlib-module.patch b/buildroot/package/python/0032-Add-option-to-disable-the-hashlib-module.patch
new file mode 100644
index 000000000..bb3ccfa76
--- /dev/null
+++ b/buildroot/package/python/0032-Add-option-to-disable-the-hashlib-module.patch
@@ -0,0 +1,30 @@
+From f11dc326ae216911a67bd563b619f39522c14bf2 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:33:02 +0100
+Subject: [PATCH] Add option to disable the hashlib module
+
+Signed-off-by: Thomas Petazzoni
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 8dc573e..854724d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2840,6 +2840,12 @@ AC_ARG_ENABLE(ssl,
+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
+ fi])
+
++AC_ARG_ENABLE(hashlib,
++ AS_HELP_STRING([--disable-hashlib], [disable hashlib]),
++ [ if test "$enableval" = "no"; then
++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _hashlib"
++ fi])
++
+ AC_ARG_ENABLE(bz2,
+ AS_HELP_STRING([--disable-bz2], [disable BZIP2]),
+ [ if test "$enableval" = "no"; then
+--
+2.7.4
+
diff --git a/buildroot/package/python/0033-Add-an-option-to-disable-readline-module.patch b/buildroot/package/python/0033-Add-an-option-to-disable-readline-module.patch
new file mode 100644
index 000000000..ade729fb3
--- /dev/null
+++ b/buildroot/package/python/0033-Add-an-option-to-disable-readline-module.patch
@@ -0,0 +1,30 @@
+From 6b461f698bd33b3493207baf79f4ee02286be8e8 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:33:55 +0100
+Subject: [PATCH] Add an option to disable readline module
+
+Signed-off-by: Thomas Petazzoni
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 854724d..0a06497 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2846,6 +2846,12 @@ AC_ARG_ENABLE(hashlib,
+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _hashlib"
+ fi])
+
++AC_ARG_ENABLE(readline,
++ AS_HELP_STRING([--disable-readline], [disable readline]),
++ [ if test "$enableval" = "no"; then
++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline"
++ fi])
++
+ AC_ARG_ENABLE(bz2,
+ AS_HELP_STRING([--disable-bz2], [disable BZIP2]),
+ [ if test "$enableval" = "no"; then
+--
+2.7.4
+
diff --git a/buildroot/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch b/buildroot/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch
new file mode 100644
index 000000000..8fe722bc6
--- /dev/null
+++ b/buildroot/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch
@@ -0,0 +1,37 @@
+From d2bfa8805206db8c57c182094396d20a9d94bd8f Mon Sep 17 00:00:00 2001
+From: Samuel Cabrero
+Date: Sat, 1 Apr 2017 09:31:52 +0200
+Subject: [PATCH] Override system locale and set to default when adding gcc
+ paths
+
+Forces the use of the default locale in the function
+add_gcc_paths, which is called when cross compiling to add the
+include and library paths. This is necessary because otherwise
+the gcc output is localized and the output parsing fails, which
+results in no paths added and detect_modules not able to find
+any system library (eg. libz, libssl, etc.)
+
+[Thomas: patch taken from https://bugs.python.org/issue23767.]
+
+Signed-off-by: Samuel Cabrero
+Signed-off-by: Thomas Petazzoni
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 8045a9b..c14f4ab 100644
+--- a/setup.py
++++ b/setup.py
+@@ -430,7 +430,7 @@ class PyBuildExt(build_ext):
+ tmpfile = os.path.join(self.build_temp, 'gccpaths')
+ if not os.path.exists(self.build_temp):
+ os.makedirs(self.build_temp)
+- ret = os.system('%s -E -v - %s 1>/dev/null' % (gcc, tmpfile))
++ ret = os.system('LC_ALL=C %s -E -v - %s 1>/dev/null' % (gcc, tmpfile))
+ is_gcc = False
+ in_incdirs = False
+ inc_dirs = []
+--
+2.7.4
+
diff --git a/buildroot/package/python/006-cross-compile-getaddrinfo.patch b/buildroot/package/python/006-cross-compile-getaddrinfo.patch
deleted file mode 100644
index ba6e6f0a0..000000000
--- a/buildroot/package/python/006-cross-compile-getaddrinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -3346,7 +3346,7 @@
-
- AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
-
--if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes
-+if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes
- then
- if test $ipv6 = yes
- then
diff --git a/buildroot/package/python/012-support-library-path-old-compilers.patch b/buildroot/package/python/012-support-library-path-old-compilers.patch
deleted file mode 100644
index 980382125..000000000
--- a/buildroot/package/python/012-support-library-path-old-compilers.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-python: do not rely only on LIBRARY_PATH for old compilers
-
-The cross-compilation improvements integrated in Python rely on the
-compiler exposing a line starting with LIBRARY_PATH when called with
--E -v. This is used by Python setup.py to find the installation
-locations of libraries.
-
-However, this LIBRARY_PATH line is not shown by very old compilers,
-such as the gcc 4.2.x compiler used on the AVR32 architecture. This
-causes libraries installed in the sysroot, such as libffi, to not be
-detected by the setup.py script.
-
-To fix this problem, this patch adds addtional logic to setup.py,
-which consists in deriving the library paths from the sysroot
-location, if no LIBRARY_PATH field was found.
-
-Signed-off-by: Thomas Petazzoni
-
-Index: b/setup.py
-===================================================================
---- a/setup.py
-+++ b/setup.py
-@@ -418,6 +418,7 @@
- in_incdirs = False
- inc_dirs = []
- lib_dirs = []
-+ compiler_has_library_path = False
- try:
- if ret >> 8 == 0:
- with open(tmpfile) as fp:
-@@ -429,6 +430,7 @@
- elif line.startswith("End of search list"):
- in_incdirs = False
- elif is_gcc and line.startswith("LIBRARY_PATH"):
-+ compiler_has_library_path = True
- for d in line.strip().split("=")[1].split(":"):
- d = os.path.normpath(d)
- if '/gcc/' not in d:
-@@ -440,6 +442,15 @@
- finally:
- os.unlink(tmpfile)
-
-+ if not compiler_has_library_path:
-+ ret = os.system("%s -print-file-name=libc.a | sed -r -e 's:(usr/)?lib(32|64)?/([^/]*/)?libc\.a::' >%s" % (gcc, tmpfile))
-+ with open(tmpfile) as fp:
-+ line = fp.readline().strip()
-+ add_dir_to_list(self.compiler.library_dirs,
-+ os.path.join(line, "usr", "lib"))
-+ add_dir_to_list(self.compiler.library_dirs,
-+ os.path.join(line, "lib"))
-+
- def detect_modules(self):
- # Ensure that /usr/local is always used
- if not cross_compiling:
diff --git a/buildroot/package/python/Config.in b/buildroot/package/python/Config.in
index 87defad81..a7f16450e 100644
--- a/buildroot/package/python/Config.in
+++ b/buildroot/package/python/Config.in
@@ -1,26 +1,28 @@
+comment "python needs a toolchain w/ wchar, threads, dynamic library"
+ depends on BR2_USE_MMU
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+
config BR2_PACKAGE_PYTHON
bool "python"
depends on BR2_USE_WCHAR
# uses fork()
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_THREADS # libffi
+ depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_LIBFFI
help
The python language interpreter.
http://www.python.org/
-comment "python needs a toolchain w/ wchar, threads"
- depends on BR2_USE_MMU
- depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
-
if BR2_PACKAGE_PYTHON
choice
prompt "python module format to install"
default BR2_PACKAGE_PYTHON_PYC_ONLY
help
- Select Python module format to install on target (py, pyc or both)
+ Select Python module format to install on target (py, pyc or
+ both)
config BR2_PACKAGE_PYTHON_PY_ONLY
bool ".py sources only"
@@ -38,14 +40,14 @@ menu "core python modules"
comment "The following modules are unusual or require extra libraries"
config BR2_PACKAGE_PYTHON_BZIP2
- select BR2_PACKAGE_BZIP2
bool "bzip2 module"
+ select BR2_PACKAGE_BZIP2
help
bzip2 module for Python
config BR2_PACKAGE_PYTHON_BSDDB
- select BR2_PACKAGE_BERKELEYDB
bool "bsddb module"
+ select BR2_PACKAGE_BERKELEYDB
help
bsddb module for Python.
@@ -55,8 +57,8 @@ config BR2_PACKAGE_PYTHON_CODECSCJK
Chinese/Japanese/Korean codecs module for Python (large).
config BR2_PACKAGE_PYTHON_CURSES
- select BR2_PACKAGE_NCURSES
bool "curses module"
+ select BR2_PACKAGE_NCURSES
help
curses module for Python.
@@ -65,22 +67,16 @@ config BR2_PACKAGE_PYTHON_OSSAUDIODEV
help
ossaudiodev module for Python.
-config BR2_PACKAGE_PYTHON_PYEXPAT
- select BR2_PACKAGE_EXPAT
- bool "pyexpat"
- help
- pyexpat module for Python.
-
config BR2_PACKAGE_PYTHON_READLINE
- select BR2_PACKAGE_READLINE
bool "readline"
+ select BR2_PACKAGE_READLINE
help
readline module for Python (required for command-line
editing in the Python shell).
config BR2_PACKAGE_PYTHON_SSL
- select BR2_PACKAGE_OPENSSL
bool "ssl"
+ select BR2_PACKAGE_OPENSSL
help
_ssl module for Python (required for https in urllib etc).
@@ -88,7 +84,8 @@ config BR2_PACKAGE_PYTHON_UNICODEDATA
bool "unicodedata module"
default y
help
- Unicode character database (used by stringprep module) (large).
+ Unicode character database (used by stringprep module)
+ (large).
if BR2_PACKAGE_PYTHON_UNICODEDATA
@@ -114,6 +111,12 @@ config BR2_PACKAGE_PYTHON_SQLITE
help
SQLite database support
+config BR2_PACKAGE_PYTHON_PYEXPAT
+ bool "xml module"
+ select BR2_PACKAGE_EXPAT
+ help
+ pyexpat and xml libraries for Python
+
config BR2_PACKAGE_PYTHON_ZLIB
bool "zlib module"
select BR2_PACKAGE_ZLIB
diff --git a/buildroot/package/python/python.hash b/buildroot/package/python/python.hash
new file mode 100644
index 000000000..feadcfdcb
--- /dev/null
+++ b/buildroot/package/python/python.hash
@@ -0,0 +1,5 @@
+# From https://www.python.org/downloads/release/python-2715/
+md5 a80ae3cc478460b922242f43a1b4094d Python-2.7.15.tar.xz
+# Locally calculated
+sha256 22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574 Python-2.7.15.tar.xz
+sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 LICENSE
diff --git a/buildroot/package/python/python.mk b/buildroot/package/python/python.mk
index 4a3e71c8a..42adaf771 100644
--- a/buildroot/package/python/python.mk
+++ b/buildroot/package/python/python.mk
@@ -5,10 +5,10 @@
################################################################################
PYTHON_VERSION_MAJOR = 2.7
-PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).9
+PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).15
PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz
-PYTHON_SITE = http://python.org/ftp/python/$(PYTHON_VERSION)
-PYTHON_LICENSE = Python software foundation license v2, others
+PYTHON_SITE = https://python.org/ftp/python/$(PYTHON_VERSION)
+PYTHON_LICENSE = Python-2.0, others
PYTHON_LICENSE_FILES = LICENSE
PYTHON_LIBTOOL_PATCH = NO
@@ -17,30 +17,34 @@ PYTHON_LIBTOOL_PATCH = NO
# also installed in $(HOST_DIR), as it is needed when cross-compiling
# third-party Python modules.
-HOST_PYTHON_CONF_OPTS += \
- --enable-static \
- --without-cxx-main \
- --disable-sqlite3 \
- --disable-tk \
- --with-expat=system \
- --disable-curses \
- --disable-codecs-cjk \
- --disable-nis \
- --enable-unicodedata \
- --disable-dbm \
- --disable-gdbm \
- --disable-bsddb \
- --disable-test-modules \
- --disable-bz2 \
- --disable-ssl \
- --disable-ossaudiodev \
+HOST_PYTHON_CONF_OPTS += \
+ --enable-static \
+ --without-cxx-main \
+ --disable-sqlite3 \
+ --disable-tk \
+ --with-expat=system \
+ --disable-curses \
+ --disable-codecs-cjk \
+ --disable-nis \
+ --enable-unicodedata \
+ --disable-dbm \
+ --disable-gdbm \
+ --disable-bsddb \
+ --disable-test-modules \
+ --disable-bz2 \
+ --disable-ssl \
+ --disable-ossaudiodev \
--disable-pyo-build
# Make sure that LD_LIBRARY_PATH overrides -rpath.
# This is needed because libpython may be installed at the same time that
# python is called.
+# Make python believe we don't have 'hg' and 'svn', so that it doesn't
+# try to communicate over the network during the build.
HOST_PYTHON_CONF_ENV += \
- LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags"
+ LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \
+ ac_cv_prog_HAS_HG=/bin/false \
+ ac_cv_prog_SVNVERSION=/bin/false
# Building host python in parallel sometimes triggers a "Bus error"
# during the execution of "./python setup.py build" in the
@@ -50,7 +54,7 @@ HOST_PYTHON_CONF_ENV += \
# MAKE1 has shown to workaround the problem.
HOST_PYTHON_MAKE = $(MAKE1)
-PYTHON_DEPENDENCIES = host-python libffi
+PYTHON_DEPENDENCIES = host-python libffi $(TARGET_NLS_DEPENDENCIES)
HOST_PYTHON_DEPENDENCIES = host-expat host-zlib
@@ -58,6 +62,8 @@ PYTHON_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_PYTHON_READLINE),y)
PYTHON_DEPENDENCIES += readline
+else
+PYTHON_CONF_OPTS += --disable-readline
endif
ifeq ($(BR2_PACKAGE_PYTHON_CURSES),y)
@@ -101,6 +107,9 @@ endif
# Default is UCS2 w/o a conf opt
ifeq ($(BR2_PACKAGE_PYTHON_UCS4),y)
+# host-python must have the same UCS2/4 configuration as the target
+# python
+HOST_PYTHON_CONF_OPTS += --enable-unicode=ucs4
PYTHON_CONF_OPTS += --enable-unicode=ucs4
endif
@@ -118,6 +127,8 @@ endif
ifeq ($(BR2_PACKAGE_PYTHON_HASHLIB),y)
PYTHON_DEPENDENCIES += openssl
+else
+PYTHON_CONF_OPTS += --disable-hashlib
endif
ifeq ($(BR2_PACKAGE_PYTHON_OSSAUDIODEV),y)
@@ -126,24 +137,36 @@ else
PYTHON_CONF_OPTS += --disable-ossaudiodev
endif
+# Make python believe we don't have 'hg' and 'svn', so that it doesn't
+# try to communicate over the network during the build.
PYTHON_CONF_ENV += \
ac_cv_have_long_long_format=yes \
ac_cv_file__dev_ptmx=yes \
ac_cv_file__dev_ptc=yes \
- ac_cv_working_tzset=yes
+ ac_cv_working_tzset=yes \
+ ac_cv_prog_HAS_HG=/bin/false \
+ ac_cv_prog_SVNVERSION=/bin/false
+
+# GCC is always compliant with IEEE754
+ifeq ($(BR2_ENDIAN),"LITTLE")
+PYTHON_CONF_ENV += ac_cv_little_endian_double=yes
+else
+PYTHON_CONF_ENV += ac_cv_big_endian_double=yes
+endif
PYTHON_CONF_OPTS += \
- --without-cxx-main \
- --without-doc-strings \
- --with-system-ffi \
- --disable-pydoc \
- --disable-test-modules \
- --disable-lib2to3 \
- --disable-gdbm \
- --disable-tk \
- --disable-nis \
- --disable-dbm \
- --disable-pyo-build
+ --without-cxx-main \
+ --without-doc-strings \
+ --with-system-ffi \
+ --disable-pydoc \
+ --disable-test-modules \
+ --disable-lib2to3 \
+ --disable-gdbm \
+ --disable-tk \
+ --disable-nis \
+ --disable-dbm \
+ --disable-pyo-build \
+ --disable-pyc-build
# This is needed to make sure the Python build process doesn't try to
# regenerate those files with the pgen program. Otherwise, it builds
@@ -204,29 +227,61 @@ PYTHON_AUTORECONF = YES
# for the target, otherwise the default python program may be missing.
ifneq ($(BR2_PACKAGE_PYTHON3),y)
define HOST_PYTHON_INSTALL_PYTHON_SYMLINK
- ln -sf python2 $(HOST_DIR)/usr/bin/python
- ln -sf python2-config $(HOST_DIR)/usr/bin/python-config
+ mkdir -p $(HOST_DIR)/bin
+ ln -sf python $(HOST_DIR)/bin/python
+ ln -sf python2-config $(HOST_DIR)/bin/python-config
endef
HOST_PYTHON_POST_INSTALL_HOOKS += HOST_PYTHON_INSTALL_PYTHON_SYMLINK
endif
# Provided to other packages
-PYTHON_PATH = $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/sysconfigdata/:$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/
+PYTHON_PATH = $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/sysconfigdata/
$(eval $(autotools-package))
$(eval $(host-autotools-package))
+ifeq ($(BR2_REPRODUCIBLE),y)
+define PYTHON_FIX_TIME
+ find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' -print0 | \
+ xargs -0 --no-run-if-empty touch -d @$(SOURCE_DATE_EPOCH)
+endef
+endif
+
+define PYTHON_CREATE_PYC_FILES
+ $(PYTHON_FIX_TIME)
+ PYTHONPATH="$(PYTHON_PATH)" \
+ cd $(TARGET_DIR) && $(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR) \
+ $(TOPDIR)/support/scripts/pycompile.py \
+ $(if $(BR2_REPRODUCIBLE),--force) \
+ usr/lib/python$(PYTHON_VERSION_MAJOR)
+endef
+
+ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY)$(BR2_PACKAGE_PYTHON_PY_PYC),y)
+PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_CREATE_PYC_FILES
+endif
+
ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y)
-define PYTHON_FINALIZE_TARGET
- find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' -print0 | xargs -0 rm -f
+define PYTHON_REMOVE_PY_FILES
+ find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' -print0 | \
+ xargs -0 --no-run-if-empty rm -f
endef
+PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PY_FILES
endif
+# Normally, *.pyc files should not have been compiled, but just in
+# case, we make sure we remove all of them.
ifeq ($(BR2_PACKAGE_PYTHON_PY_ONLY),y)
-define PYTHON_FINALIZE_TARGET
- find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.pyc' -print0 | xargs -0 rm -f
+define PYTHON_REMOVE_PYC_FILES
+ find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.pyc' -print0 | \
+ xargs -0 --no-run-if-empty rm -f
endef
+PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PYC_FILES
endif
-TARGET_FINALIZE_HOOKS += PYTHON_FINALIZE_TARGET
+# In all cases, we don't want to keep the optimized .pyo files
+define PYTHON_REMOVE_PYO_FILES
+ find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.pyo' -print0 | \
+ xargs -0 --no-run-if-empty rm -f
+endef
+PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PYO_FILES
diff --git a/buildroot/package/rebootp/rebootp.mk b/buildroot/package/rebootp/rebootp.mk
index 5cfd647a4..9867f52af 100644
--- a/buildroot/package/rebootp/rebootp.mk
+++ b/buildroot/package/rebootp/rebootp.mk
@@ -15,7 +15,7 @@ REBOOTP_INSTALL_STAGING = NO
define REBOOTP_BUILD_CMDS
cd $(@D)
$(MAKE) -C $(@D) all
- $(TARGET_STRIP) $(@D)/rebootp
+# $(TARGET_STRIP) $(@D)/rebootp
endef
define REBOOTP_INSTALL_TARGET_CMDS
diff --git a/buildroot/package/squashfs/0001-include-sysmacros.patch b/buildroot/package/squashfs/0001-include-sysmacros.patch
new file mode 100644
index 000000000..d794836c0
--- /dev/null
+++ b/buildroot/package/squashfs/0001-include-sysmacros.patch
@@ -0,0 +1,47 @@
+From 968aa53dd6d2c0831a9af01873441767c06b88d0 Mon Sep 17 00:00:00 2001
+From: Thomas De Schampheleire
+Date: Wed, 1 Aug 2018 12:17:10 +0200
+Subject: [PATCH] mksquashfs/unsquashfs: fix compilation with glibc 2.25+
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From glibc 2.25 release notes:
+https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html
+"* The inclusion of by is deprecated.
+ This means that in a future release, the macros “major”, “minor”, and
+ “makedev” will only be available from ."
+
+See glibc bug https://sourceware.org/bugzilla/show_bug.cgi?id=19239 .
+
+Fetch from: https://github.com/plougher/squashfs-tools/pull/52.patch
+Signed-off-by: Richard Kunze
+---
+ squashfs-tools/mksquashfs.c | 1 +
+ squashfs-tools/unsquashfs.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
+index d696a51..8d57c3e 100644
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -35,6 +35,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
+index a57f85c..a492b27 100644
+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -33,6 +33,7 @@
+ #include "fnmatch_compat.h"
+
+ #include
++#include
+ #include
+ #include
+ #include
diff --git a/buildroot/package/squashfs/Config.in b/buildroot/package/squashfs/Config.in
index 6dd65e30a..c16ebbf27 100644
--- a/buildroot/package/squashfs/Config.in
+++ b/buildroot/package/squashfs/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_SQUASHFS
bool "squashfs"
- depends on BR2_LARGEFILE
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_SQUASHFS_GZIP if !(BR2_PACKAGE_SQUASHFS_LZMA || BR2_PACKAGE_SQUASHFS_LZO)
@@ -42,8 +41,14 @@ config BR2_PACKAGE_SQUASHFS_XZ
help
Support XZ compression algorithm
+config BR2_PACKAGE_SQUASHFS_ZSTD
+ bool "zstd support"
+ select BR2_PACKAGE_ZSTD
+ help
+ Support ZSTD compression algorithm
+
endif
-comment "squashfs needs a toolchain w/ largefile, threads"
- depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
+comment "squashfs needs a toolchain w/ threads"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU
diff --git a/buildroot/package/squashfs/squashfs.hash b/buildroot/package/squashfs/squashfs.hash
index e308089b9..4464e62c0 100644
--- a/buildroot/package/squashfs/squashfs.hash
+++ b/buildroot/package/squashfs/squashfs.hash
@@ -1,2 +1,5 @@
-# Locally computed:
-sha256 0d605512437b1eb800b4736791559295ee5f60177e102e4d4ccd0ee241a5f3f6 squashfs4.3.tar.gz
+# Locally computed
+sha256 bd0aa3011320b8ebee68aa406060de277bef16daf81bad5b9f70cbea6db1a779 squashfs-e38956b92f738518c29734399629e7cdb33072d3.tar.gz
+
+# License files
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/buildroot/package/squashfs/squashfs.mk b/buildroot/package/squashfs/squashfs.mk
index 8ca9e2e51..80955a5f1 100644
--- a/buildroot/package/squashfs/squashfs.mk
+++ b/buildroot/package/squashfs/squashfs.mk
@@ -4,14 +4,12 @@
#
################################################################################
-SQUASHFS_VERSION = 4.3
-SQUASHFS_SOURCE = squashfs$(SQUASHFS_VERSION).tar.gz
-SQUASHFS_SITE = http://downloads.sourceforge.net/project/squashfs/squashfs/squashfs$(SQUASHFS_VERSION)
-SQUASHFS_LICENSE = GPLv2+
+SQUASHFS_VERSION = e38956b92f738518c29734399629e7cdb33072d3
+SQUASHFS_SITE = https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git
+SQUASHFS_SITE_METHOD = git
+SQUASHFS_LICENSE = GPL-2.0+
SQUASHFS_LICENSE_FILES = COPYING
-
-# no libattr in BR
-SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0
+SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1
ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y)
SQUASHFS_DEPENDENCIES += lz4
@@ -41,6 +39,13 @@ else
SQUASHFS_MAKE_ARGS += LZO_SUPPORT=0
endif
+ifeq ($(BR2_PACKAGE_SQUASHFS_ZSTD),y)
+SQUASHFS_DEPENDENCIES += zstd
+SQUASHFS_MAKE_ARGS += ZSTD_SUPPORT=1 COMP_DEFAULT=zstd
+else
+SQUASHFS_MAKE_ARGS += ZSTD_SUPPORT=0
+endif
+
ifeq ($(BR2_PACKAGE_SQUASHFS_GZIP),y)
SQUASHFS_DEPENDENCIES += zlib
SQUASHFS_MAKE_ARGS += GZIP_SUPPORT=1 COMP_DEFAULT=gzip
@@ -48,21 +53,21 @@ else
SQUASHFS_MAKE_ARGS += GZIP_SUPPORT=0
endif
-HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz
+HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz host-zstd
-# no libattr/xz in BR
HOST_SQUASHFS_MAKE_ARGS = \
- XATTR_SUPPORT=0 \
- XZ_SUPPORT=1 \
- GZIP_SUPPORT=1 \
- LZ4_SUPPORT=1 \
- LZO_SUPPORT=1 \
- LZMA_XZ_SUPPORT=1
+ XATTR_SUPPORT=1 \
+ XZ_SUPPORT=1 \
+ GZIP_SUPPORT=1 \
+ LZ4_SUPPORT=1 \
+ LZO_SUPPORT=1 \
+ LZMA_XZ_SUPPORT=1 \
+ ZSTD_SUPPORT=1
define SQUASHFS_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) \
- CC="$(TARGET_CC)" \
- EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+ $(TARGET_MAKE_ENV) $(MAKE) \
+ CC="$(TARGET_CC)" \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS) -fgnu89-inline" \
EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
$(SQUASHFS_MAKE_ARGS) \
-C $(@D)/squashfs-tools/
@@ -76,7 +81,7 @@ endef
define HOST_SQUASHFS_BUILD_CMDS
$(HOST_MAKE_ENV) $(MAKE) \
CC="$(HOSTCC)" \
- EXTRA_CFLAGS="$(HOST_CFLAGS)" \
+ EXTRA_CFLAGS="$(HOST_CFLAGS)" \
EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
$(HOST_SQUASHFS_MAKE_ARGS) \
-C $(@D)/squashfs-tools/
diff --git a/buildroot/package/zstd/Config.in b/buildroot/package/zstd/Config.in
new file mode 100644
index 000000000..9fa70c65c
--- /dev/null
+++ b/buildroot/package/zstd/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_ZSTD
+ bool "zstd"
+ help
+ Zstandard, or zstd as short version, is a fast lossless
+ compression algorithm, targeting real-time compression
+ scenarios at zlib-level and better compression ratios
+
+ The selection of other packages will enable some features:
+ xz, lz4 and/or zlib will enable support for corresponding
+ compression formats
+
+ https://facebook.github.io/zstd
diff --git a/buildroot/package/zstd/Config.in.host b/buildroot/package/zstd/Config.in.host
new file mode 100644
index 000000000..05751f8fb
--- /dev/null
+++ b/buildroot/package/zstd/Config.in.host
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HOST_ZSTD
+ bool "host zstd"
+ help
+ Zstandard, or zstd as short version, is a fast lossless
+ compression algorithm, targeting real-time compression
+ scenarios at zlib-level and better compression ratios
+
+ https://facebook.github.io/zstd
diff --git a/buildroot/package/zstd/zstd.hash b/buildroot/package/zstd/zstd.hash
new file mode 100644
index 000000000..95b227098
--- /dev/null
+++ b/buildroot/package/zstd/zstd.hash
@@ -0,0 +1,6 @@
+# Locally computed
+sha256 d6e1559e4cdb7c4226767d4ddc990bff5f9aab77085ff0d0490c828b025e2eea zstd-v1.3.5.tar.gz
+
+# License files (locally computed as well)
+sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE
+sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING
diff --git a/buildroot/package/zstd/zstd.mk b/buildroot/package/zstd/zstd.mk
new file mode 100644
index 000000000..a1a11f9ab
--- /dev/null
+++ b/buildroot/package/zstd/zstd.mk
@@ -0,0 +1,87 @@
+################################################################################
+#
+# zstd
+#
+################################################################################
+
+ZSTD_VERSION = v1.3.5
+ZSTD_SITE = $(call github,facebook,zstd,$(ZSTD_VERSION))
+ZSTD_INSTALL_STAGING = YES
+ZSTD_LICENSE = BSD-3-Clause or GPL-2.0
+ZSTD_LICENSE_FILES = LICENSE COPYING
+
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+ZSTD_OPTS += HAVE_THREAD=1
+else
+ZSTD_OPTS += HAVE_THREAD=0
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+ZSTD_DEPENDENCIES += zlib
+ZSTD_OPTS += HAVE_ZLIB=1
+else
+ZSTD_OPTS += HAVE_ZLIB=0
+endif
+
+ifeq ($(BR2_PACKAGE_XZ),y)
+ZSTD_DEPENDENCIES += xz
+ZSTD_OPTS += HAVE_LZMA=1
+else
+ZSTD_OPTS += HAVE_LZMA=0
+endif
+
+ifeq ($(BR2_PACKAGE_LZ4),y)
+ZSTD_DEPENDENCIES += lz4
+ZSTD_OPTS += HAVE_LZ4=1
+else
+ZSTD_OPTS += HAVE_LZ4=0
+endif
+
+ifeq ($(BR2_STATIC_LIBS),y)
+ZSTD_BUILD_LIBS = libzstd.a
+ZSTD_INSTALL_LIBS = install-static
+else ifeq ($(BR2_SHARED_LIBS),y)
+ZSTD_BUILD_LIBS = libzstd
+ZSTD_INSTALL_LIBS = install-shared
+else
+ZSTD_BUILD_LIBS = libzstd.a libzstd
+ZSTD_INSTALL_LIBS = install-static install-shared
+endif
+
+define ZSTD_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \
+ -C $(@D)/lib $(ZSTD_BUILD_LIBS)
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \
+ -C $(@D) zstd
+endef
+
+define ZSTD_INSTALL_STAGING_CMDS
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \
+ DESTDIR=$(STAGING_DIR) PREFIX=/usr -C $(@D)/lib \
+ install-pc install-includes $(ZSTD_INSTALL_LIBS)
+endef
+
+define ZSTD_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \
+ DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D)/programs install
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \
+ DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D)/lib $(ZSTD_INSTALL_LIBS)
+endef
+
+# note: no 'HAVE_...' options for host library build only
+define HOST_ZSTD_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \
+ -C $(@D)/lib
+ $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \
+ -C $(@D) zstd
+endef
+
+define HOST_ZSTD_INSTALL_CMDS
+ $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \
+ DESTDIR=$(HOST_DIR) PREFIX=/usr -C $(@D)/lib install
+ $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \
+ DESTDIR=$(HOST_DIR) PREFIX=/usr -C $(@D)/programs install
+endef
+
+$(eval $(generic-package))
+$(eval $(host-generic-package))
diff --git a/changes.md b/changes.md
index 719ac82a9..7d1e27ce9 100644
--- a/changes.md
+++ b/changes.md
@@ -501,3 +501,7 @@ Fixes the incorrect recovery.cmdline bug in v2.5.2.
- **Added file checksums** - for download verification
- **Added partition_setup.sh checksum** - for download verification
- **Added options dialog** - To make option setting easier.
+
+### V3.2.1
+
+- **Bootselectiondialog** - update for CEC and keyboard
diff --git a/history.md b/history.md
index 04bce0aab..cf3000574 100644
--- a/history.md
+++ b/history.md
@@ -5,6 +5,10 @@ PINN is a version of the NOOBS Operating System Installer for the Raspberry Pi w
## Change History
+### V3.2.1
+
+- **Bootselectiondialog** - update for CEC and keyboard
+
### V3.2
- **Added Ts & C's dialog** - for Future OSes
diff --git a/rebootp/Makefile b/rebootp/Makefile
index ce23eb043..ef93e0a4f 100644
--- a/rebootp/Makefile
+++ b/rebootp/Makefile
@@ -1,5 +1,5 @@
#CC=/home/kevin/noobs_test/buildroot/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc
-CC=$(PWD)/../noobs_test/buildroot/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc
+#CC=$(PWD)/../noobs_test/buildroot/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc
all: rebootp
$(MAKE) $(AM_MAKEFLAGS) rebootp
diff --git a/recovery/bootselectiondialog.cpp b/recovery/bootselectiondialog.cpp
index 8bd4f76ac..5bf6c4c28 100644
--- a/recovery/bootselectiondialog.cpp
+++ b/recovery/bootselectiondialog.cpp
@@ -469,6 +469,7 @@ void BootSelectionDialog::on_buttonBox_clicked(QAbstractButton *button)
void BootSelectionDialog::on_pb_Up_clicked()
{
int row = ui->list->currentRow();
+ _counter.stopCountdown();
if(row>0)
{
_altered=true;
@@ -478,13 +479,13 @@ void BootSelectionDialog::on_pb_Up_clicked()
QVariant entry = installed_os.takeAt(row);
installed_os.insert(row-1,entry);
-
}
}
void BootSelectionDialog::on_pb_Down_clicked()
{
int row = ui->list->currentRow();
+ _counter.stopCountdown();
if(rowlist->count()-1){
_altered=true;
QListWidgetItem* pTemp = ui->list->takeItem(row);
diff --git a/recovery/bootselectiondialog.ui b/recovery/bootselectiondialog.ui
index e21f5dfea..cc613a6fe 100644
--- a/recovery/bootselectiondialog.ui
+++ b/recovery/bootselectiondialog.ui
@@ -42,23 +42,29 @@
-
- Up
+ &Up
:/icons/up.png :/icons/up.png
+
+ U
+
-
- Down
+ &Down
:/icons/down.png :/icons/down.png
+
+ D
+
-
@@ -118,6 +124,8 @@
list
pushButton
buttonBox
+ pb_Up
+ pb_Down
SD اعداد بطاقة
- RECOMMENDED
اوصي
@@ -695,8 +695,8 @@ WARNING: This will erase all data on your SD card
Confirm
تاكيد
@@ -773,7 +773,7 @@ See debug log for details
Error
خطا
@@ -873,7 +873,7 @@ See debug log for details
Backup OSes
@@ -963,8 +963,8 @@ Would you like to make this setting permanent?
Download error
خطا في التحميل
@@ -979,164 +979,164 @@ Would you like to make this setting permanent?
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
مطلوب الوصول إلى الشبكة لاستخدام المكونات البينية بدون الصور المحلية. الرجاء تحديد شبكه wifi الخاصة بك في الشاشة التالية.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
مطلوب الوصول إلى الشبكة السلكية لاستخدام pinoy بدون الصور المحلية. الرجاء إدخال كبل شبكه اتصال في منفذ الشبكة.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
هل تريد بالتاكيد أعاده تهيئه محرك الاقراص '%1' لاستخدامه مع الشبكة PINN ؟ سيتم حذف كافة البيانات الموجودة علي محرك!
- This will erase all content on the device '%s'. Are you sure?
سيؤدي ذلك إلى مسح كافة المحتويات الموجودة علي الجهاز '%s'. هل أنت متأكد؟
- Clone SD Card
إستنسخ بطاقة SD
- Yes
نعم
- No
لا
- Clone Completed
اكتمل الاستنساخ
- Clone Completed Successfully
تم إكمال النسخ بنجاح
- Error downloading update file
حدث خطا اثناء تنزيل ملف التحديث
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
PINN تحديث
- A new version of PINN is available
يتوفر إصدار جديد من الشبكة PINN
- Do you want to download this version?
هل تريد تحميل هذا الإصدار ؟
- Downloading Update
تنزيل التحديث
- Press ESC to cancel
اضغط هروب لالغاء الامر
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1147,7 +1147,7 @@ Do you want to continue?
is not available.
Please provide it locally or connect to the internet.
Error writing downloaded file to SD card. SD card or file system may be damaged.
حدث خطأ أثناء كتابة الملف الذي تم تنزيله إلى بطاقة SD . قد تتلف بطاقة SD أو نظام الملفات.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
أعاده تهيئه محرك الاقراص ؟
No network access
لا يوجد وصول إلى الشبكة
@@ -1228,22 +1228,32 @@ Booting this drive again will re-instate PINN's partition structure.إنهاء الكتابة (مزامنة)
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
خطا في تنزيل الكره أو استخراجها
- Finished downloading %1
diff --git a/recovery/translation_ast.ts b/recovery/translation_ast.ts
index f478b9e18..6baa13be0 100644
--- a/recovery/translation_ast.ts
+++ b/recovery/translation_ast.ts
@@ -765,8 +765,8 @@ AVISU: Esto desaniciará tolos datos na to tarxeta SD
- RECOMMENDED
ACONSEYÁU
@@ -787,8 +787,8 @@ AVISU: Esto desaniciará tolos datos na to tarxeta SD
Confirm
Confirmar
@@ -837,7 +837,7 @@ See debug log for details
Backup OSes
@@ -904,164 +904,164 @@ See debug log for details
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1078,7 +1078,7 @@ Do you want to continue?
is not available.
Please provide it locally or connect to the internet.
Error
Fallu
@@ -1149,8 +1149,8 @@ Booting this drive again will re-instate PINN's partition structure.
No network access
Ensin accesu de rede
@@ -1171,8 +1171,8 @@ Booting this drive again will re-instate PINN's partition structure.
Download error
Fallu de descarga
@@ -1200,22 +1200,22 @@ Booting this drive again will re-instate PINN's partition structure.
Error writing downloaded file to SD card. SD card or file system may be damaged.
Fallu baxando'l ficheru a la tarxeta SD. Quiciabes tean dañaos o'l sistema ficheros o la tarxeta SD.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
@@ -1228,22 +1228,32 @@ Booting this drive again will re-instate PINN's partition structure.Finóse cola escritura (sincronizando)
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
Fallu baxando o estrayendo'l comprimíu
- Finished downloading %1
diff --git a/recovery/translation_ca.ts b/recovery/translation_ca.ts
index 5180b4d9d..b346674ba 100644
--- a/recovery/translation_ca.ts
+++ b/recovery/translation_ca.ts
@@ -764,8 +764,8 @@ WARNING: This will erase all data on your SD card
- RECOMMENDED
RECOMANAT
@@ -786,8 +786,8 @@ WARNING: This will erase all data on your SD card
Confirm
Confirma
@@ -836,7 +836,7 @@ See debug log for details
Backup OSes
@@ -903,164 +903,164 @@ See debug log for details
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1077,7 +1077,7 @@ Do you want to continue?
is not available.
Please provide it locally or connect to the internet.
Error
Error
@@ -1147,8 +1147,8 @@ Booting this drive again will re-instate PINN's partition structure.
No network access
@@ -1169,8 +1169,8 @@ Booting this drive again will re-instate PINN's partition structure.
Download error
Error writing downloaded file to SD card. SD card or file system may be damaged.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
@@ -1226,22 +1226,32 @@ Booting this drive again will re-instate PINN's partition structure.
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
- Finished downloading %1
diff --git a/recovery/translation_de.ts b/recovery/translation_de.ts
index 955b02854..a0294a2cf 100644
--- a/recovery/translation_de.ts
+++ b/recovery/translation_de.ts
@@ -680,8 +680,8 @@ Achtung: Dies löscht alle Ihre Daten auf der SD-Karte
W
- RECOMMENDED
EMPFOHLEN
@@ -691,8 +691,8 @@ Achtung: Dies löscht alle Ihre Daten auf der SD-Karte
Confirm
Bestätigung
@@ -728,7 +728,7 @@ Achtung: Dies löscht alle Ihre Daten auf der SD-Karte
is not available.
Please provide it locally or connect to the internet.
ist nicht verfügbar. Bitte stelle es lokal zur Verfügung oder verbinde dich mit dem Internet
@@ -744,7 +744,7 @@ Please provide it locally or connect to the internet.
Error
Fehler
@@ -849,7 +849,7 @@ See debug log for details
Backup OSes
Sichere die Betriebssysteme
@@ -939,8 +939,8 @@ Wollen Sie diese Einstellung dauerhaft speichern?
Download error
Download-Fehler
@@ -955,164 +955,164 @@ Wollen Sie diese Einstellung dauerhaft speichern?
Fehler beim Download einer Meta-Datei:
- Replace OSes
Ersetze das Betriebssystem/die Betriebssysteme
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
Dieses Backup braucht vielleicht
- MB of backup space, but only
MB Backup-Speicher, aber nur
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
MB sind verfügbar. Dies ist nur eine Einschätzung. Wenn du fortfährst wird das Backup eventuell nicht erfolgreich fertiggestellt.
- WARNING: Backup Space
WARNUNG: Backup-Speicher
- Backup Info
Backup-Info
- Always test your backups before relying on them
Teste deine Backups immer, bevor du dich auf sie verlässt.
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
Internetzugriff wird benötigt, um PINN ohne lokalen Images zu benutzen. Bitte lege dein Wi-Fi Netzwerk auf dem nächsten Bildschirm fest.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
Internetzugriff per Kabel wird benötigt, um PINN ohne lokalen Images zu benutzen. Bitte stecke ein Netzwerkkabel in den Netzwerkanschluss.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
Bist du sicher, dass du das Laufwerk '%1' für die Benutzung mit PINN neu formatieren willst? Alle vorhanden Daten auf dem Laufwerk werden gelöscht!
- This will erase all content on the device '%s'. Are you sure?
Dies löscht alle Daten auf dem Laufwerk '%s'. Bist du sicher?
- Clone SD Card
Klone die SD-Karte
- Yes
Ja
- No
Nein
- Clone Completed
Klonen abgeschlossen
- Clone Completed Successfully
Klonen erfolgreich abgeschlossen
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1189,29 +1189,29 @@ Booting this drive again will re-instate PINN's partition structure.
Error writing downloaded file to SD card. SD card or file system may be damaged.
Fehler beim Schreiben der heruntergeladenen Datei auf die SD-Karte. Die SD-Karte oder deren Dateisystem könnte fehlerhaft sein.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
No network access
Kein Netzwerk gefunden
@@ -1229,22 +1229,32 @@ Booting this drive again will re-instate PINN's partition structure.Schließe Schreibvorgang ab (sync)
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
Fehler beim Herunterladen oder Extrahieren des TAR-Archivs
- Finished downloading %1
diff --git a/recovery/translation_en.ts b/recovery/translation_en.ts
index f015ade5e..40fd6802b 100644
--- a/recovery/translation_en.ts
+++ b/recovery/translation_en.ts
@@ -764,13 +764,13 @@ WARNING: This will erase all data on your SD card
- has an incompatible number of partitions with
- RECOMMENDED
@@ -796,8 +796,8 @@ WARNING: This will erase all data on your SD card
Confirm
Backup OSes
@@ -866,7 +866,7 @@ See debug log for details
Error
No network access
@@ -966,8 +966,8 @@ Would you like to make this setting permanent?
Download error
- filesize error checking
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1074,7 +1074,7 @@ Do you want to continue?
is not available.
Please provide it locally or connect to the internet.
Error writing downloaded file to SD card. SD card or file system may be damaged.
- Replace OSes
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Reformat drive?
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
@@ -1226,22 +1226,32 @@ Booting this drive again will re-instate PINN's partition structure.
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
- Finished downloading %1
diff --git a/recovery/translation_es.ts b/recovery/translation_es.ts
index 82acd0768..0d02b8ec3 100644
--- a/recovery/translation_es.ts
+++ b/recovery/translation_es.ts
@@ -752,8 +752,8 @@ ADVERTENCIA: Esto borrará todos los datos de tu tarjeta SD
- RECOMMENDED
etiqueta para marcar el sistema recomendado en la lista de SOs
RECOMENDADO
@@ -764,8 +764,8 @@ ADVERTENCIA: Esto borrará todos los datos de tu tarjeta SD
Confirm
Confirmar
@@ -798,7 +798,7 @@ ADVERTENCIA: Esto borrará todos los datos de tu tarjeta SD
is not available.
Please provide it locally or connect to the internet.
Backup OSes
@@ -862,7 +862,7 @@ See debug log for details
Error
Error
@@ -924,170 +924,170 @@ Booting this drive again will re-instate PINN's partition structure.
- filesize error checking
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
Es necesario tener acceso a internet para usar PINN sin imágenes locales de los SO. Seleccione su red wifi en la siguiente pantalla.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
... Conecte el cable de red al puerto.
Es necesario tener acceso a internet para usar PINN sin imágenes locales de los SO. Conecte el cable al puerto de red.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
¿Está seguro de que desea volver a formatear la unidad '%1' para usarla con PINN? ¡Se borrarán todos los datos existentes en la unidad!
- This will erase all content on the device '%s'. Are you sure?
Esto borrará todo el contenido del dispositivo '%s' ¿Estás seguro?
- Clone SD Card
Clonar tarjeta SD
- Yes
Si
- No
No
- Clone Completed
Clonación completada
- Clone Completed Successfully
Clonación completada correctamente
- Error downloading update file
Error al descargar archivo de actualización
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
ACTUALIZACIÓN PINN
- A new version of PINN is available
Una nueva versión de PINN está disponible
- Do you want to download this version?
¿Quiere descargar esta versión?
- Downloading Update
Descargando actualización
- Press ESC to cancel
Pulsar Esc para cancelar
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1162,8 +1162,8 @@ Would you like to make this setting permanent?
No network access
Sin acceso a la red
@@ -1185,8 +1185,8 @@ Would you like to make this setting permanent?
Download error
Error en la descarga
@@ -1214,17 +1214,17 @@ Would you like to make this setting permanent?
Error writing downloaded file to SD card. SD card or file system may be damaged.
Error al escribir archivo descargado a la tarjeta SD. La tarjeta SD o el sistema de archivos podrían estar dañados.
- has an incompatible number of partitions with
- Reformat drive?
¿Reformatear unidad?
@@ -1237,22 +1237,32 @@ Would you like to make this setting permanent?
Terminando de escribir (sincronizar)
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
Error al descargar o extraer el archivo comprimido (tarball)
- Finished downloading %1
diff --git a/recovery/translation_eu.ts b/recovery/translation_eu.ts
index cbcc688f0..60158ea33 100644
--- a/recovery/translation_eu.ts
+++ b/recovery/translation_eu.ts
@@ -769,8 +769,8 @@ KONTUZ: Honek zure SD txarteleko datu guztiak ezabatuko ditu
- RECOMMENDED
GOMENDATUA
@@ -791,8 +791,8 @@ KONTUZ: Honek zure SD txarteleko datu guztiak ezabatuko ditu
Confirm
Berretsi
@@ -841,7 +841,7 @@ See debug log for details
Backup OSes
@@ -908,164 +908,164 @@ See debug log for details
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
Sareko sarbidea behar da PINN irudi lokalik gabe erabiltzeko. Hautatu zure wifi sarea hurrengo pantailan.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
Haridun sareko sarbidea behar da PINN irudi lokalik gabe erabiltzeko. Txertatu sareko kable bat sareko atakan.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
Ziur zaude '%1' unitatea PINNekin erabiltzeko birformateatu nahi duzula? Unitateko datu guztiak ezabatuko dira!
- This will erase all content on the device '%s'. Are you sure?
Honek '%s' gailuko eduki guztiak ezabatuko ditu. Ziur zaude?
- Clone SD Card
Klonatu SD txartela
- Yes
Bai
- No
Ez
- Clone Completed
Klonazio burututa
- Clone Completed Successfully
Klonazioa behar bezala burutu da
- Error downloading update file
Errorea eguneraketa fitxategia deskargatzean
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
PINN EGUNERAKETA
- A new version of PINN is available
PINNen bertsio berri bat eskuragarri dago
- Do you want to download this version?
Bertsio hau deskargatu nahi duzu?
- Downloading Update
Eguneraketa deskargatzen
- Press ESC to cancel
Sakatu ESC ezeztatzeko
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1082,7 +1082,7 @@ Do you want to continue?
is not available.
Please provide it locally or connect to the internet.
Error
Errorea
@@ -1153,8 +1153,8 @@ Booting this drive again will re-instate PINN's partition structure.
No network access
Sareko sarbiderik ez
@@ -1175,8 +1175,8 @@ Booting this drive again will re-instate PINN's partition structure.
Download error
Errorea deskargatzean
@@ -1204,22 +1204,22 @@ Booting this drive again will re-instate PINN's partition structure.
Error writing downloaded file to SD card. SD card or file system may be damaged.
Errorea deskargatutako fitxategia SD txartelean idaztean. SD txartela edo fitxategi-sistema hondatuta egon daitezke.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
Unitatea birformateatu?
@@ -1232,22 +1232,32 @@ Booting this drive again will re-instate PINN's partition structure.Idazten bukatu (sinkronizatu)
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
Errorea tar fitxategia deskargatu edo erauztean
- Finished downloading %1
diff --git a/recovery/translation_fi.ts b/recovery/translation_fi.ts
index 577b27a83..7a83ad01d 100644
--- a/recovery/translation_fi.ts
+++ b/recovery/translation_fi.ts
@@ -684,8 +684,8 @@ WARNING: This will erase all data on your SD card
Valmistellaan SD muistikorttia
- RECOMMENDED
SUOSITELTU
@@ -695,8 +695,8 @@ WARNING: This will erase all data on your SD card
Confirm
Vahvista
@@ -773,7 +773,7 @@ See debug log for details
Error
Virhe
@@ -873,7 +873,7 @@ See debug log for details
Backup OSes
@@ -962,8 +962,8 @@ Would you like to make this setting permanent?
Download error
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1146,7 +1146,7 @@ Do you want to continue?
is not available.
Please provide it locally or connect to the internet.
Error writing downloaded file to SD card. SD card or file system may be damaged.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
No network access
Ei verkkoyhteyttä
@@ -1227,22 +1227,32 @@ Booting this drive again will re-instate PINN's partition structure.Viimeistellään kirjoitusta (synkronointi)
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
- Finished downloading %1
diff --git a/recovery/translation_fr.ts b/recovery/translation_fr.ts
index 6a8887dfc..d0f9bc2cd 100644
--- a/recovery/translation_fr.ts
+++ b/recovery/translation_fr.ts
@@ -685,8 +685,8 @@ WARNING: This will erase all data on your SD card
Paramétrage de la carte SD
- RECOMMENDED
RECOMMANDé
@@ -696,8 +696,8 @@ WARNING: This will erase all data on your SD card
Confirm
Confirmer
@@ -774,7 +774,7 @@ See debug log for details
Error
Erreur
@@ -874,7 +874,7 @@ See debug log for details
Backup OSes
@@ -964,8 +964,8 @@ Would you like to make this setting permanent?
Download error
Erreur durant le téléchargement
@@ -980,164 +980,164 @@ Would you like to make this setting permanent?
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
Un accès au réseau est nécessaire pour utiliser PINN sans images locales. Merci de sélectionner votre réseau wifi dans le prochain écran
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
Tout le contenu du lecteur '%s' seront effacées. Etes-vous sûrs?
- Clone SD Card
Cloner la carte SD
- Yes
Oui
- No
Non
- Clone Completed
Clonage terminé
- Clone Completed Successfully
Clonage terminé avec succès
- Error downloading update file
Erreur lors du téléchargement du fichier de mise à jour
- PINN Update Check
Vérification mise à jour de PINN
- Error contacting update server
Erreur lors de la connexion au serveur de mise à jour
- No updates available
Pas de mise à jour disponible
- PINN UPDATE
MISE à JOUR DE PINN
- A new version of PINN is available
Une nouvelle version de PINN est disponible
- Do you want to download this version?
Voulez-vous télécharger cette version?
- Downloading Update
Téléchargement de la mise à jour
- Press ESC to cancel
Appuyez sur Echap pour annuler
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1148,7 +1148,7 @@ Do you want to continue?
is not available.
Please provide it locally or connect to the internet.
Error writing downloaded file to SD card. SD card or file system may be damaged.
Erreur lors de l'écriture des fichiers téléchargés. La carte SD ou le système de fichiers sont peut-être endommagés.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
No network access
Pas d'accés réseau
@@ -1229,22 +1229,32 @@ Booting this drive again will re-instate PINN's partition structure.écriture terminée (sync)
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
Erreur durant le téléchargement ou l'extraction du tarball
- Finished downloading %1
Téléchargement de %1 terminé
diff --git a/recovery/translation_hu.ts b/recovery/translation_hu.ts
index 3bb14b289..676b51667 100644
--- a/recovery/translation_hu.ts
+++ b/recovery/translation_hu.ts
@@ -680,8 +680,8 @@ FIGYELEM: ez letörli az SD kártyát lévő összes adatot
- RECOMMENDED
AJÁNLOTT
@@ -691,8 +691,8 @@ FIGYELEM: ez letörli az SD kártyát lévő összes adatot
Confirm
Megerősítés
@@ -728,7 +728,7 @@ FIGYELEM: ez letörli az SD kártyát lévő összes adatot
is not available.
Please provide it locally or connect to the internet.
Error
Hiba
@@ -849,7 +849,7 @@ See debug log for details
Backup OSes
@@ -939,8 +939,8 @@ El szeretnéd menteni ezt a beállítást?
Download error
Letöltési hiba
@@ -955,164 +955,164 @@ El szeretnéd menteni ezt a beállítást?
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1189,29 +1189,29 @@ Booting this drive again will re-instate PINN's partition structure.
Error writing downloaded file to SD card. SD card or file system may be damaged.
Nem sikerült a letöltött fájl SD kártyára történő kiírása. Az SD kártya vagy a fájlrendszer sérült lehet.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
No network access
Nincs hálózati hozzáférés
@@ -1229,22 +1229,32 @@ Booting this drive again will re-instate PINN's partition structure.Írás befejezése (szink.)
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
Nem sikerült a tömörített fájl letöltése vagy kibontása
- Finished downloading %1
diff --git a/recovery/translation_it.ts b/recovery/translation_it.ts
index 8d814b478..5ff198401 100644
--- a/recovery/translation_it.ts
+++ b/recovery/translation_it.ts
@@ -46,7 +46,7 @@
%1: Checksumming (%2)
- %1: creazione checksum (%2)
Up
- Su
Down
- Giù
Edit Options
- Modifica opzioni
Impostazione scheda SD
- RECOMMENDED
RACCOMANDATO
@@ -696,8 +696,8 @@ ATTENZIONE: questo eliminerà tutti i dati nella scheda SD
Confirm
Conferma
@@ -729,44 +729,47 @@ ATTENZIONE: questo eliminerà tutti i dati nella scheda SD
install
- installa
reinstall
- reinstalla
replace
- sostituisci
USB drive
- Unità USB
Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- Attenzioen: questo %1 i sistemi operativi selezionati in %2.
+Tutti i dati esistenti in %3 verranno eliminati.
The %1 process will begin shortly.
- Il processo '%1' partirà a breve.
OS(es) Downloaded with errors.
See debug log for details
- SO scaricati con errori.
+Vedi registro debug per i dettagli.
OS(es) Installed with errors.
See debug log for details
- SO installati con errori.
+Vedi registro debug per i dettagli.
Error
Errore
@@ -877,7 +880,7 @@ Per i dettagli vedi registro debug
Backup OSes
Backup SO
@@ -890,27 +893,27 @@ Per i dettagli vedi registro debug
Installation complete
- Installazione completata
Abort
- Interrompi
Discard
- Scarta
Retry
- Riprova
Keep
- Mantieni
Download error
Errore download
@@ -984,34 +987,34 @@ Vuoi rendere questa impostazione permanente?
Errore download file meta:
- Replace OSes
Sostiuisci SO
- Resume partial downloads?
- Vuoi riprendere i download parziali?
- Normally select NO, unless your last download was not successful, in which case select YES
- Normalmente seleziona NO, a meno che l'ultimo download non è stato completato, in questo caso seleziona SI.
- This backup may require
Questo backup richiede
- MB of backup space, but only
MB come spazio backup, ma solo
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
@@ -1021,132 +1024,132 @@ Se continui, il backup potrebbe non essere completato correttamente.
Vuoi continuare?
- WARNING: Backup Space
ATTENZIONE: spazio backup
- Backup Info
Info backup
- Always test your backups before relying on them
Prova semrpe i backup prima di usarli
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
Per usare PINN senza immagini locali è richiesto l'accesso alla rete. Seleziona nella finestra successiva la rete Wi-Fi.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
Per usare PINN senza immagini locali è richiesto l'accesso alla rete cablata. Inserisci un cavo di rete nella porta ethernet.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
Sei sicuro di voler riformattare l'unità '%1' per l'uso con PINN? Tutti i dati esistenti nell'unità verranno eliminati!
- This will erase all content on the device '%s'. Are you sure?
Questo cancellerà tutto il contenuto del dispositivo '%s'. Sei sicuro di voler continuare?
- Clone SD Card
Clona scheda SD
- Yes
Sì
- No
No
- Clone Completed
Clonazione completata
- Clone Completed Successfully
Clonazione completata correttamente
- Error downloading update file
Errore download file aggiornamento
- PINN Update Check
Verifica aggiornamenti PINN
- Error contacting update server
Errore di connesisone al server aggiornamenti
- No updates available
Il software PINN è aggiornato
- PINN UPDATE
AGGIORNAMENTO PINN
- A new version of PINN is available
È disponibile una nuova versione di PINN
- Do you want to download this version?
Vuoi scaricare questa versione?
- Downloading Update
Download aggiornamento
- Press ESC to cancel
Premi ESC per annullare
- Error: No OSes selected
(Do not choose RISC OS or PINN)
Errore: nessun S.O. selezionato
(non scegliere OS RISC o PINN)
- Warning: No OSes selected
Attenzione: nessun S.O. selezionato
- Warning: this will backup the selected Operating System(s).
Attenzione: verrà effettuato il backup dei sistemi operativi selezionati.
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
Attenzione: rilevati sistemi operativi non supportati.
PINN attualmente non può efefttuare il backup dei seguenti SO:
@@ -1158,7 +1161,7 @@ PINN attualmente non può efefttuare il backup dei seguenti SO:
is not available.
Please provide it locally or connect to the internet.
non è disponibile.
@@ -1202,29 +1205,29 @@ Riavviando l'unità verrà re-installata la struttura di PINN.
Error writing downloaded file to SD card. SD card or file system may be damaged.
Errore scrittura su SD del file scaricato. La scheda SD o il file system potrebbero essere danneggiati.
- filesize error checking
Errore verifica dimensione file
- has an incompatible number of partitions with
ha un numero incompatibile di partizioni con
- Reformat drive?
Riformattare l'unità?
No network access
Nessun accesso alla rete
@@ -1242,22 +1245,32 @@ Riavviando l'unità verrà re-installata la struttura di PINN.Completamento scrittura (sync)
- File '%1' does not need downloading
Il file '%1' non richiede il download
- Error in checksum
- Downloading %1:%2
+ Download %1:%2
+
+
+ Checking %1:%2
+ Verifica %1:%2
Error in checksum
+ Errore nella checksum
+
+
+ Error downloading or extracting tarball
Errore download od estrazione tarball
- Finished downloading %1
Download di %1 completato
@@ -1387,7 +1400,7 @@ Partizione non abbastanza grande per la nuova immagine.
Operation cancelled by user
- Operazione annullata dall'utente
OS: '%1' needs a partition label of '%2' which is not available
- SO: '%1' richiede un'etichetta partizione '%2' che non è disponibile
Error in checksum for partition_setup.sh
- Errore nella checksum per partition_setup.sh
An incorrect file checksum has been detected in %1
- È stato rilevata una checksum file errata in %1
Checksum error
- Errore checksum
PINN Options
- Opzioni PINN
Installation
- Installazione
PREVENTS any noobsconfig customisations from being applied to an OS on installation
- PREVIENE che venga applicata qualsiasi personalizzazione ai SO in installazione
noobsconfig
- noobsconfig
Reserve some space on PINN's partition (MB)
- Riserva spazio (xx MB) nella partizione PINN
reserve=
- reserve=
Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Specifica un percorso o una URL dove i file di personalizzazione noobconfig sono disponibili (a meno che siano in /os/<distro>/)
configpath=
- configpath=
Amount of space to reserve (MB) on PINN's partition
- Quantità di spazio da riservare (in MB) nella partizione PINN
Selecting this will erase all of your OSes
- Selezionando questa opzione verranno eliminati tutti i SO
runinstaller
- runinstaller
Prevents PINN from checking for self updates
- Evita che PINN cerchi gli aggiornamenti
no_update
- no_update
Force PINN to self-update whenever a new version is detected
- Forza PINN all'aggiornamento automaticato quando viene rilevata una nuova versione
forceupdatepinn
- forceupdatepinn
DO not update the firmware of old OSes on installation
- NON aggiorna i firmware di vecchie installazioni di SO
nofirmware
- nofirmware
Selects all OSes where the most recent one is on the SD card
- Seleziona tutti i SO in cui si trova il più recente nella scheda SD
allsd
- allsd
Selects all OSes where the most recent one is on a local USB drive
- Seleziona tutti i SO in cui si trova il più recente nell'unità USB
allusb
- allusb
Selects all OSes where the most recent one is on remote repositories.
- Seleziona tutti i SO in cui si trova il più recente nei repository remoti
allnetwork
- allnetwork
Ensures all installed OSes are selected again.
- Verifica di nuovo tutti i SO installati.
allinstalled
- allinstalled
Waits for all OSes on the SD card to be listed
- Attende che siano elencati tutti i sistemi operativi presenti nella scheda SD
waitsd
- waitsd
Waits for all OSes on local USBs to be listed
- Attende che siano elencati tutti i sistemi operativi presenti nell'unità USB
waitusb
- waitusb
Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- Attende che siano elencati tutti i sistemi operativi presenti nei repository remoti
waitnetwork
- waitnetwork
Waits for OSes from all sources to be listed
- Attende che siano elencati tutti i sistemi operativi presenti in tutte le sorgenti
waitall
- waitall
The list of OSes that will be selected at startup
- L'elenco dei sistemi operativi che saranno selezionati all'avvio
Reserve an ADDITIONAL amount of space
- Riserva una quantità AGGIUNTIVA di spazio
+
- +
Automatically reinstalls any selected OSes if newer versions exist
- Installa automaticamente tutti i SO selezionati se esistono versioni più recenti
silentreinstallnewer
- silentreinstallnewer
Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- Consente l'installazione automatica di un singolo o più SO, utile durante installazioni automatiche.
silentinstall
- silentreinstallnewer
select=
- select=
Source
- Sorgente
Prevents the default RaspberryPi Foundation repository from being used.
- Impedisce l'utilizzo del repository predefinito di RaspberryPi Foundation.
no_default_source
nodefaultsource
- no_default_source
Prevents OSes stored on local USB memory devices from being used.
- Impedisce l'utilizzo di sistemi operativi memorizzati nei dispositivi di memoria USB locali.
disableusbimages
- disableusbimages
Prevent OSes stored on the SD card from being used.
- Impedisce l'uso dei sistemi operativi memorizzati nella scheda SD.
disablesdimages
- disablesdimages
Shows all available installable OSes, whether they are suitable for the current model of Pi or not. Useful for preparing SD cards to be used in other RPis.
- Visualizza tutti i SO installabili disponibili, indipendentemente dal fatto che siano adatti al modello attuale di Pi o meno.
+Utile per preparare le schede SD da utilizzare in altri RPi.
showall
- showall
Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- Fornisce l'URL di un file repo_list.json che contiene un elenco di URL per altri file os-list_v3.json.
+Ciò consente una facile gestione remota dei repository internet.
repo_list=
- repo_list=
-
+
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
+ Simile a alt_image_source ma corrisponde al metodo NOOBS di specificare un elenco di respository aggiuntivi come stringa quotata separata da spazio.
repo=
- repo=
: Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- : Fornisce l'URL di un file os_list_v3.json aggiuntivo che indica la posizione di altri sistemi operativi che possono essere scaricati da Internet.
+Possono essere usate istanze multiple di questa opzione.
alt_image_source=
- alt_image_source=
Booting
- Booting
-
+
When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
+ Quando viene usato insieme a forcetrigger, imposta un periodo di timeout massimo in secondi per la visualizzazione del menu di ripristino prima di continuare con la finestra di dialogo di selezione di avvio e di selezionare potenzialmente un SO predefinito per l'avvio.
remotetimeout=<secs>
- remotetimeout=<sec>
Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- Forza l'accesso all'interfaccia PINN all'avvio (come se fosse stato premuto il tasto Maiusc).
+Questo è molto utile quando si usa una connessione VNC.
forcetrigger
- forcetrigger
Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- Forza la modalità di recupero da inserire all'avvio se il pin 3 del GPIO sull'header P1 è collegato a GND (pin 25).
gpiotriggerenable
- gpiotriggerenable
This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- Questa impostazione consente di specificare il timeout della rete in secondi, soprattutto per le reti che impiegano più tempo per stabilirsi.
networktimeout=<secs>
- networktimeout=<sec>
-
+
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
+ Impedisce che la pressione dela tasto MAIUSC abiliti la modalità di ripristino all'avvio (potresti avere una tastiera problematica che si attiva erroneamente ogni volta che fai il boot)
keyboardtriggerenable
- keyboardtriggerenable
Interface
- Interfaccia
Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
- Usa una connessione di rete VNC per controllare PINN anziché qualsiasi tastiera, mouse e display collegati localmente.
+Quando viene usata, qualsiasi display locale rimarrà vuoto.
vncinstall
- vncinstall
-
+
Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
+ Usa una connessione di rete VNC per controllare PINN.
+Tuttavia, a differenza di vncinstall, qualsiasi tastiera e mouse collegati localmente saranno ancora attivi e il display sarà duplicato sullo schermo locale e nella connessione VNC.
vncshare
- vncshare
Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- Abilita una connessione SSH al rescueshell in PINN.
+Non può essere usata per controllare PINN, ma avere una shell è molto utile per eseguire la manutenzione remota in una qualsiasi delle partizioni della scheda SD.
ssh
- ssh
This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- Questa opzione fa sì che una shell di comando locale venga aperta all'avvio di PINN.
+Quando la shell viene chiusa, PINN verrà avviato normalmente.
rescueshell
- rescueshell
Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- Impedisce l'avvio in safemode se si dispone di hardware esterno che fa il pullup verso il basso del pin 5.
disablesafemode
- disablesafemode
A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- Una speciale funzione di avvio per scambiare la priorità delle uscite video DSI e HDMI, consentendo a un sistema operativo di dare priorità a uno schermo HDMI se collegato.
dsi
- dsi
Prevents the list of OSes from being grouped into categories.
- Impedisce che l'elenco dei sistemi operativi venga raggruppato in categorie.
no_group
- no_group
Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- Impedisce che il cursore venga visualizzato nella finestra di dialogo di avvio (richiesto per i dispositivi touchscreen)
no_cursor
- no_cursor
Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- Fa sì che un file wallpaper.jpg o wallpaper.png personalizzato venga ridimensionato per riempire l'intero desktop
wallpaper_resize
- wallpaper_resize
Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- Imposta una delle 4 modalità di visualizzazione: 0 = HDMI preferito, 1 = HDMI sicuro, 2 = PAL 4:3, 3 = NTSC 4:3
display=
- display=
Changes the style of the windows
- Modifica lo stile delle finestre
style=
- style=
Changes the default timeout allowed before an OS is booted without any selection.
- Modifica il timeout predefinito prima che un SO venga avviato senza alcuna selezione.
bootmenutimeout=<secs>
- bootmenutimeout=<sec>
-
+
To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
+ Per modificare il colore di sfondo per lo schermo e la maggior parte delle finestre, aggiungi background=r,g,b, dove 0,0,0 è il nero e 255,255,255 è il bianco.
+Ti suggeriamo di usare valori superiori a 127.
background=<r,g,b>
- background=<r,g,b>
none
- nessuno
0
- 0
1
- 1
2
- 2
3
- 3
windows
- finestre
motif
- motif
platinum
- platino
WARNING
- ATTENZIONE
Warning: You have chosen the 'runinstaller' option.
This will erase all your OSes on next boot.
Are you sure?
- Attenzione: hai scelto l'opzione 'runinstaller'.
+Questo cancellerà tutti i tuoi SO al prossimo avvio.
+Vuoi proseguire?
@@ -2258,12 +2282,12 @@ Are you sure?
Dialog
- Accettazione termini e condizioni
Please accept these T&Cs to continue.
- Per continuare accetta Termini e &condidizoni
@@ -2511,12 +2535,12 @@ Are you sure?
Error in checksum for partition_setup.sh
- Errore nella checksum per partition_setup.sh
Expected csum= %1 Calculated= %2
- Checksum attesa= %1 calcolata= %2
- RECOMMENDED
推奨
@@ -691,8 +691,8 @@ WARNING: This will erase all data on your SD card
Confirm
確認
@@ -728,7 +728,7 @@ WARNING: This will erase all data on your SD card
is not available.
Please provide it locally or connect to the internet.
Error
エラー
@@ -849,7 +849,7 @@ See debug log for details
Backup OSes
@@ -939,8 +939,8 @@ Would you like to make this setting permanent?
Download error
ダウンロードエラー
@@ -955,164 +955,164 @@ Would you like to make this setting permanent?
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1189,29 +1189,29 @@ Booting this drive again will re-instate PINN's partition structure.
Error writing downloaded file to SD card. SD card or file system may be damaged.
ダウンロードしたファイルのSDカード書き込みエラー.SDカードかファイルシステムが壊れているかもしれません.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
No network access
ネットワークが接続されていません
@@ -1229,22 +1229,32 @@ Booting this drive again will re-instate PINN's partition structure.書き込み完了(同期)
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
tarballのダウンロード中もしくは展開中のエラー
- Finished downloading %1
diff --git a/recovery/translation_ko.ts b/recovery/translation_ko.ts
index 6ef6f08e7..758cff537 100644
--- a/recovery/translation_ko.ts
+++ b/recovery/translation_ko.ts
@@ -746,13 +746,13 @@ See debug log for details
PINN v%1 - 빌드: %2 (%3) %4
- has an incompatible number of partitions with
은(는) 다음 파티션과 호환되지 않은 파티션 번호를 갖고 있습니다.대상 파티션:
- RECOMMENDED
추천 파티션
@@ -778,8 +778,8 @@ See debug log for details
Confirm
확인
@@ -791,7 +791,7 @@ See debug log for details
is not available.
Please provide it locally or connect to the internet.
은(는) 사용할 수 없습니다.
@@ -873,7 +873,7 @@ See debug log for details
Backup OSes
백업 대상 OS
@@ -893,7 +893,7 @@ See debug log for details
Error
오류
@@ -980,8 +980,8 @@ Booting this drive again will re-instate PINN's partition structure.
No network access
네트워크에 접속할 수 없음
@@ -1002,8 +1002,8 @@ Booting this drive again will re-instate PINN's partition structure.
Download error
다운로드 오류
@@ -1041,44 +1041,44 @@ Booting this drive again will re-instate PINN's partition structure.
Error writing downloaded file to SD card. SD card or file system may be damaged.
다운로드한 파일을 SD 카드에 기록하는 과정에서 오류가 발생하였습니다. SD 카드 또는 파일 시스템이 손상되었는지 확인하여 주십시오.
- filesize error checking
파일 크기 오류를 확인합니다. URL:
- Replace OSes
OS 교체
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
이 백업은
- MB of backup space, but only
MB를 백업 공간으로 이용합니다. 그러나 남은 용량이
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
@@ -1087,137 +1087,137 @@ Do you want to continue?
계속하시겠습니까?
- WARNING: Backup Space
경고: 백업 공간
- Backup Info
백업 정보
- Always test your backups before relying on them
이 백업을 신뢰하기 전에 정상 여부를 항상 확인하십시요.
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
로컬 이미지가 없는 PINN은 네트워크 접속이 필요합니다. 다음 화면에서 Wi-Fi 네트워크를 선택해 주십시오.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
로컬에 운영체제 이미지가 없는 PINN을 사용하려면 유선 네트워크 연결이 필요합니다. 네트워크 포트에 네트워크 케이블을 삽입하여 주십시요.
- Reformat drive?
드라이브 초기화 확인
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
'%1' 드라이브를 정말 다시 초기화하시겠습니까? 초기화를 완료하면 이 드라이브 안에 있는 모든 데이터는 완전히 삭제됩니다. 초기화 후 PINN이 이 드라이브를 이용합니다.
- This will erase all content on the device '%s'. Are you sure?
장치 '%s'의 모든 내용이 지워집니다. 정말 진행하시겠습니까?
- Clone SD Card
SD 카드 복제
- Yes
예
- No
아니요
- Clone Completed
복제 완료
- Clone Completed Successfully
복제를 완료하였습니다.
- Error downloading update file
업데이트한 파일을 다운로드 하는 과정에 오류가 발생하였습니다.
- PINN Update Check
PINN 업데이트 확인
- Error contacting update server
업데이트 서버에 연결할 수 없습니다.
- No updates available
새로운 업데이트가 없습니다.
- PINN UPDATE
PINN 업데이트
- A new version of PINN is available
새 버전의 PINN 을 사용할 수 있습니다.
- Do you want to download this version?
이 버전을 다운로드 하시겠습니까?
- Downloading Update
업데이트 다운로드
- Press ESC to cancel
취소하려면 ESC 를 누르십시요.
- Error: No OSes selected
(Do not choose RISC OS or PINN)
경고: 선택한 OS가 없습니다.
(RISC OS 또는 PINN을 선택하지 마십시요.)
- Warning: No OSes selected
경고: 선택한 OS가 없습니다.
- Warning: this will backup the selected Operating System(s).
경고: 이 동작은 선택한 운영체제를 백업합니다.
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
경고: 지원하지 않는 운영체제를 발견하였습니다. PINN은 이 운영체제에 대한 백업을 제대로 생성하지 못할 수 있습니다. 대상 운영체제:
@@ -1230,22 +1230,32 @@ Do you want to continue?
(동기화) 기록을 완료하였습니다.
- File '%1' does not need downloading
'%1' 파일은 다운로드할 필요가 없습니다.
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
tarball을 다운로드 및 압축 해제하는 과정에서 오류가 발생하였습니다
- Finished downloading %1
%1을(를) 다운로드 하였습니다.
diff --git a/recovery/translation_nl.ts b/recovery/translation_nl.ts
index fa452a70b..f64186925 100644
--- a/recovery/translation_nl.ts
+++ b/recovery/translation_nl.ts
@@ -680,8 +680,8 @@ WAARSCHUWING: Dit verwijdert alle bestaande bestanden op de SD kaartW
- RECOMMENDED
AANBEVOLEN
@@ -691,8 +691,8 @@ WAARSCHUWING: Dit verwijdert alle bestaande bestanden op de SD kaart
Confirm
Bevestigen
@@ -728,7 +728,7 @@ WAARSCHUWING: Dit verwijdert alle bestaande bestanden op de SD kaart
is not available.
Please provide it locally or connect to the internet.
Error
Fout
@@ -849,7 +849,7 @@ See debug log for details
Backup OSes
@@ -939,8 +939,8 @@ De instelling opslaan?
Download error
Fout bij downloaden
@@ -955,164 +955,164 @@ De instelling opslaan?
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1189,29 +1189,29 @@ Booting this drive again will re-instate PINN's partition structure.
Error writing downloaded file to SD card. SD card or file system may be damaged.
Fout bij wegschrijven gedownload bestand naar SD kaart. SD kaart of bestandssysteem kan beschadigd zijn.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
No network access
Geen netwerk verbinding
@@ -1229,22 +1229,32 @@ Booting this drive again will re-instate PINN's partition structure.Bezig met wegschrijven (sync)
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
Fout bij downloaden of uitpakken tarball
- Finished downloading %1
diff --git a/recovery/translation_no.ts b/recovery/translation_no.ts
index ca6b752c9..6fb2a4e40 100644
--- a/recovery/translation_no.ts
+++ b/recovery/translation_no.ts
@@ -684,8 +684,8 @@ WARNING: This will erase all data on your SD card
Klargjør SD-kort
- RECOMMENDED
ANBEFALES
@@ -695,8 +695,8 @@ WARNING: This will erase all data on your SD card
Confirm
Bekreft
@@ -773,7 +773,7 @@ See debug log for details
Error
Feil
@@ -873,7 +873,7 @@ See debug log for details
Backup OSes
@@ -961,8 +961,8 @@ Would you like to make this setting permanent?
Download error
Nedlastingsfeil
@@ -977,164 +977,164 @@ Would you like to make this setting permanent?
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
Nettverkstilgang er nødvendig for å bruke PINN uten lokal avbildning. Velg ditt WiFi-nettverk i neste bilde.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
Kablet nettverkstilgang er nødvendig for å bruke PINN uten lokal avbildning. Monter en nettverkskabel til nettverksporten.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
Er du sikker på at du vil formattere drive '%1' for bruk av PINN? Alle eksisterende data på drivet vil slettes!
- This will erase all content on the device '%s'. Are you sure?
Dette vil slette alt innhold på enheten '%s'. Er du sikker?
- Clone SD Card
Klone SD-kort
- Yes
Ja
- No
Nei
- Clone Completed
Kloning ferdig
- Clone Completed Successfully
Kloning utført med hell
- Error downloading update file
Feil ved nedlasting av oppdateringsfil
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
PINN OPPDATERING
- A new version of PINN is available
En ny versjon av PINN er tilgjengelig
- Do you want to download this version?
Vil du laste ned denne versjonen?
- Downloading Update
Laster ned oppdatering
- Press ESC to cancel
Trykk ESC for å avbryte
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1145,7 +1145,7 @@ Do you want to continue?
is not available.
Please provide it locally or connect to the internet.
Error writing downloaded file to SD card. SD card or file system may be damaged.
Feil ved skriving av nedlastet fil til SD-kort. SD-kort eller filsystem kan være ødelagt.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
Reformatter drive?
No network access
Ingen nettverkstilgang
@@ -1226,22 +1226,32 @@ Booting this drive again will re-instate PINN's partition structure.Avslutter skriving (sync)
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
Feil ved nedlasting eller utpakking av tabell
- Finished downloading %1
diff --git a/recovery/translation_pl.ts b/recovery/translation_pl.ts
index c2625b574..c8c90e095 100644
--- a/recovery/translation_pl.ts
+++ b/recovery/translation_pl.ts
@@ -680,8 +680,8 @@ UWAGA: To usunie wszystkie dane zapisane na karcie SD
- RECOMMENDED
ZALECANE
@@ -691,8 +691,8 @@ UWAGA: To usunie wszystkie dane zapisane na karcie SD
Confirm
Potwierdź
@@ -728,7 +728,7 @@ UWAGA: To usunie wszystkie dane zapisane na karcie SD
is not available.
Please provide it locally or connect to the internet.
Error
Błąd
@@ -849,7 +849,7 @@ See debug log for details
Backup OSes
@@ -939,8 +939,8 @@ Czy chcesz zachować te ustawienia?
Download error
Błąd pobierania
@@ -955,164 +955,164 @@ Czy chcesz zachować te ustawienia?
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1189,29 +1189,29 @@ Booting this drive again will re-instate PINN's partition structure.
Error writing downloaded file to SD card. SD card or file system may be damaged.
Błąd zapisywania pobranego pliku na kartę SD. Karta lub system plików mogą być uszkodzone.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
No network access
Brak połączenia z siecią
@@ -1229,22 +1229,32 @@ Booting this drive again will re-instate PINN's partition structure.Kończenie zapisywania (zrzucanie buforów)
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
Błąd pobierania lub rozpakowywania pliku tar
- Finished downloading %1
diff --git a/recovery/translation_pt.ts b/recovery/translation_pt.ts
index 31d6ebb2c..ef9107f0e 100644
--- a/recovery/translation_pt.ts
+++ b/recovery/translation_pt.ts
@@ -680,8 +680,8 @@ AVISO: Isto irá apagar todos os dados do seu cartão SD
W
- RECOMMENDED
RECOMENDADO
@@ -691,8 +691,8 @@ AVISO: Isto irá apagar todos os dados do seu cartão SD
Confirm
Confirmar
@@ -728,7 +728,7 @@ AVISO: Isto irá apagar todos os dados do seu cartão SD
is not available.
Please provide it locally or connect to the internet.
Error
Erro
@@ -849,7 +849,7 @@ See debug log for details
Backup OSes
@@ -940,8 +940,8 @@ Deseja tornar esta configuração permanente?
Download error
Erro no download
@@ -956,164 +956,164 @@ Deseja tornar esta configuração permanente?
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
O acesso à rede é necessário para usar o PINN sem imagens locais. Selecione sua rede wi-fi na próxima tela.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
O acesso à rede é necessário para usar o PINN sem imagens locais. Por favor, conecte o cabo de rede na porta de rede.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
Tem certeza de que deseja reformatar a unidade '%1' para uso com o PINN? Todos os dados existentes na unidade serão excluídos!
- This will erase all content on the device '%s'. Are you sure?
Isso irá apagar todo o conteúdo no dispositivo '%s'. Você tem certeza?
- Clone SD Card
Clonar Cartão SD
- Yes
Sim
- No
Não
- Clone Completed
Clonar Concluído
- Clone Completed Successfully
Clonar Concluído com Sucesso
- Error downloading update file
Erro ao baixar arquivo de atualização
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
ATUALIZAÇÃO DO PINN
- A new version of PINN is available
Uma nova versão do PINN está disponível
- Do you want to download this version?
Deseja baixar esta versão?
- Downloading Update
Baixando Atualização
- Press ESC to cancel
Pressione ESC para cancelar
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1190,29 +1190,29 @@ Booting this drive again will re-instate PINN's partition structure.
Error writing downloaded file to SD card. SD card or file system may be damaged.
Erro ao salvar arquivo baixado para o cartão SD. O cartão ou sistema de arquivos pode estar danificado.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
Reformatar unidade?
No network access
Sem acesso de rede
@@ -1230,22 +1230,32 @@ Booting this drive again will re-instate PINN's partition structure.Finalizando a gravação
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
Erro ao baixar ou extrair tarball
- Finished downloading %1
diff --git a/recovery/translation_ru.ts b/recovery/translation_ru.ts
index 5208f09c3..4aff41fc6 100644
--- a/recovery/translation_ru.ts
+++ b/recovery/translation_ru.ts
@@ -680,8 +680,8 @@ WARNING: This will erase all data on your SD card
W
- RECOMMENDED
РЕКОМЕНДУЕТСЯ
@@ -691,8 +691,8 @@ WARNING: This will erase all data on your SD card
Confirm
Подтвердить
@@ -728,7 +728,7 @@ WARNING: This will erase all data on your SD card
is not available.
Please provide it locally or connect to the internet.
Error
Ошибка
@@ -849,7 +849,7 @@ See debug log for details
Backup OSes
@@ -939,8 +939,8 @@ Would you like to make this setting permanent?
Download error
Ошибка загрузки
@@ -955,164 +955,164 @@ Would you like to make this setting permanent?
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1189,29 +1189,29 @@ Booting this drive again will re-instate PINN's partition structure.
Error writing downloaded file to SD card. SD card or file system may be damaged.
Ошибка записи загруженных файлов на SD карту. SD карта может быть повреждена.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
No network access
Нету доступа в интернет
@@ -1229,22 +1229,32 @@ Booting this drive again will re-instate PINN's partition structure.Закончена запись(sync)
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
Ошибка загрузки или распаковки архива
- Finished downloading %1
diff --git a/recovery/translation_sv.ts b/recovery/translation_sv.ts
index aaf8d100b..1a9c5c566 100644
--- a/recovery/translation_sv.ts
+++ b/recovery/translation_sv.ts
@@ -765,8 +765,8 @@ VARNING: Detta kommer radera all data på ditt SD-kort
- RECOMMENDED
REKOMMENDERAD
@@ -787,8 +787,8 @@ VARNING: Detta kommer radera all data på ditt SD-kort
Confirm
Bekräfta
@@ -837,7 +837,7 @@ See debug log for details
Backup OSes
@@ -904,164 +904,164 @@ See debug log for details
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1078,7 +1078,7 @@ Do you want to continue?
is not available.
Please provide it locally or connect to the internet.
Error
Fel
@@ -1149,8 +1149,8 @@ Booting this drive again will re-instate PINN's partition structure.
No network access
Ingen nätverksåtkomst
@@ -1171,8 +1171,8 @@ Booting this drive again will re-instate PINN's partition structure.
Download error
Nedladdningsfel
@@ -1200,22 +1200,22 @@ Booting this drive again will re-instate PINN's partition structure.
Error writing downloaded file to SD card. SD card or file system may be damaged.
Fel vid skrivning av nedladdad fil till SD-kort. SD-kort eller filsystem kan vara skadade.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
@@ -1228,22 +1228,32 @@ Booting this drive again will re-instate PINN's partition structure.Avslutar skrivning (sync)
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
Fel vid nedladdning eller extrahering av arkiv
- Finished downloading %1
diff --git a/recovery/translation_tr.ts b/recovery/translation_tr.ts
index 4b97b2cae..6e27b3396 100644
--- a/recovery/translation_tr.ts
+++ b/recovery/translation_tr.ts
@@ -680,8 +680,8 @@ UYARI: Bu işlem SD kartınızdaki tüm verileri silecektir
W
- RECOMMENDED
TAVSİYEDİR
@@ -691,8 +691,8 @@ UYARI: Bu işlem SD kartınızdaki tüm verileri silecektir
Confirm
Onayla
@@ -728,7 +728,7 @@ UYARI: Bu işlem SD kartınızdaki tüm verileri silecektir
is not available.
Please provide it locally or connect to the internet.
Error
Hata
@@ -849,7 +849,7 @@ See debug log for details
Backup OSes
@@ -932,8 +932,8 @@ See debug log for details
Download error
İndirme hatası
@@ -948,164 +948,164 @@ See debug log for details
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
@@ -1182,29 +1182,29 @@ Booting this drive again will re-instate PINN's partition structure.
Error writing downloaded file to SD card. SD card or file system may be damaged.
İndirilen dosya SD karta yazılırken hata. SD kart ya da dosya sistemi hasarlı olabilir.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
No network access
Ağ erişimi yok
@@ -1228,22 +1228,32 @@ Would you like to make this setting permanent?
Yazmayı bitir (sync)
- File '%1' does not need downloading
- Error in checksum
+ Downloading %1:%2
+
+
+ Checking %1:%2
Error in checksum
+
+
+ Error downloading or extracting tarball
tarball indirilir ya da çıkartılırken hata oluştu
- Finished downloading %1
diff --git a/recovery/translation_zh_TW.ts b/recovery/translation_zh_TW.ts
index 7b063f3aa..de56fb19c 100644
--- a/recovery/translation_zh_TW.ts
+++ b/recovery/translation_zh_TW.ts
@@ -1,6 +1,6 @@
-
+
BackupThread
@@ -46,7 +46,7 @@
%1: Checksumming (%2)
- %1：正在檢查雜湊碼 (%2)
Up
- 上
Down
- 下
Edit Options
- 編輯選項
install
- 安裝
reinstall
- 重新安裝
replace
- 取代
USB drive
- USB 磁碟
Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- 警告：這將會 %1 選定的作業系統到 %2。所有在 %3 上的資料都將會被刪除。
The %1 process will begin shortly.
- %1 程序將會很快開始。
- RECOMMENDED
建議
@@ -756,8 +756,8 @@ WARNING: This will erase all data on your SD card
Confirm
確認
@@ -845,7 +845,7 @@ See debug log for details
Backup OSes
備份作業系統
@@ -857,7 +857,7 @@ See debug log for details
Installation complete
- 安裝完成
Error
錯誤
Abort
- 放棄
Discard
- 丟棄
Retry
- 重試
Keep
- 保留
下載詮釋檔案錯誤：
- Replace OSes
取代作業系統
- Resume partial downloads?
- 復原部份下載？
- Normally select NO, unless your last download was not successful, in which case select YES
- 一般會選擇否，除非您最後一次下載並未成功，這種情況下才會選取是
- This backup may require
這個備份可能需要
- MB of backup space, but only
MB 的備份空間，但只有
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
@@ -957,132 +957,132 @@ Do you want to continue?
您想要繼續嗎？
- WARNING: Backup Space
警告：備份空間
- Backup Info
備份資訊
- Always test your backups before relying on them
在依賴您備份前請測試它們
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
不使用本機映像檔的 PINN 需要網路。請在下一個畫面選擇您的 wifi 連線。
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
不使用本機映像檔的 PINN 需要有線網路。請將網路線插入網路孔。
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
您確定您要重新格式化磁碟 '%1' 以供 PINN 使用嗎？所有在該磁碟上的資料都會被刪除！
- This will erase all content on the device '%s'. Are you sure?
這將會抹除在裝置 '%s' 上的所有內容。您確定嗎？
- Clone SD Card
再製 SD 記憶卡
- Yes
是
- No
否
- Clone Completed
再製完成
- Clone Completed Successfully
再製成功完成
- Error downloading update file
下載更新檔時發生錯誤
- PINN Update Check
PINN 更新檢查
- Error contacting update server
聯絡更新伺服器發生錯誤
- No updates available
無可用更新
- PINN UPDATE
PINN 更新
- A new version of PINN is available
已有新版的 PINN 可用
- Do you want to download this version?
您想要下載此版本嗎？
- Downloading Update
正在下載更新
- Press ESC to cancel
按 ESC 取消
- Error: No OSes selected
(Do not choose RISC OS or PINN)
錯誤：沒有已選取的作業系統
（不要選取 RISC OS 或 PINN）
- Warning: No OSes selected
警告：沒有選擇作業系統
- Warning: this will backup the selected Operating System(s).
警告：這將會備份選定的作業系統。
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
警告：偵測到不支援的作業系統。PINN 目前無法正確備份下列的作業系統：
@@ -1093,7 +1093,7 @@ Do you want to continue?
is not available.
Please provide it locally or connect to the internet.
不可用。
@@ -1103,7 +1103,8 @@ Please provide it locally or connect to the internet.
OS(es) Downloaded with errors.
See debug log for details
- 作業系統下載時發生錯誤。
+檢視除錯紀錄以取得更多資訊
OS(es) Installed with errors.
See debug log for details
- 作業系統安裝時發生錯誤。
+檢視除錯紀錄以取得更多資訊
No network access
無法存取網路
@@ -1182,8 +1184,8 @@ Booting this drive again will re-instate PINN's partition structure.
Download error
下載錯誤
@@ -1211,22 +1213,22 @@ Booting this drive again will re-instate PINN's partition structure.
Error writing downloaded file to SD card. SD card or file system may be damaged.
寫入已下載的檔案至 SD 記憶卡時發生錯誤。SD 記憶卡或檔案系統可能受損。
- filesize error checking
檢查檔案大小錯誤
- has an incompatible number of partitions with
有不相容數量的分割區
- Reformat drive?
重新格式化磁碟？
@@ -1239,22 +1241,32 @@ Booting this drive again will re-instate PINN's partition structure.寫入完成 (sync)
- File '%1' does not need downloading
檔案「%1」不需要下載
- Error in checksum
- Downloading %1:%2
+ 正在下載 %1：%2
+
+
+ Checking %1:%2
+ 正在檢查 %1：%2
Error in checksum
+ 檢查碼錯誤
+
+
+ Error downloading or extracting tarball
下載或解壓縮 tarball 時發生錯誤
- Finished downloading %1
下載 %1 結束
@@ -1347,7 +1359,7 @@ Partition not big enough for new image.
Operation cancelled by user
- 操作已由使用者取消
OS: '%1' needs a partition label of '%2' which is not available
- 作業系統：'%1' 需要分割區標籤 '%2'，但並不可用
Error in checksum for partition_setup.sh
- partition_setup.sh 的檢查碼錯誤
An incorrect file checksum has been detected in %1
- 在 %1 偵測到不正確的檔案檢查碼
Checksum error
- 檢查碼錯誤
PINN Options
- PINN 選項
Installation
- 安裝
PREVENTS any noobsconfig customisations from being applied to an OS on installation
- 防止將任何 noobsconfig 的自訂選項套用到安裝作業系統中
noobsconfig
- noobsconfig
Reserve some space on PINN's partition (MB)
- 在 PINN 的分割區中保留部份空間 (MB)
reserve=
- reserve=
Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- 指定尋找 noobsconfig 檔案的路徑或 URL（而不是在 /os/<distro>/）
configpath=
- configpath=
Amount of space to reserve (MB) on PINN's partition
- 要在 PINN 分割區上保留的空間 (MB)
Selecting this will erase all of your OSes
- 選取這個會抹除您所有的作業系統
runinstaller
- runinstaller
Prevents PINN from checking for self updates
- 避免 PINN 檢查自身的更新
no_update
- no_update
Force PINN to self-update whenever a new version is detected
- 強制 PINN 在檢測到新版本時自我更新
forceupdatepinn
- forceupdatepinn
DO not update the firmware of old OSes on installation
- 不要更新安裝上舊版作業系統的韌體
nofirmware
- nofirmware
Selects all OSes where the most recent one is on the SD card
- 選取所有作業系統，最新的在 SD 記憶卡上
allsd
- allsd
Selects all OSes where the most recent one is on a local USB drive
- 選取所有作業系統，最新的在 USB 磁碟上
allusb
- allusb
Selects all OSes where the most recent one is on remote repositories.
- 選取所有作業系統，最新的在遠端倉庫上。
allnetwork
- allnetwork
Ensures all installed OSes are selected again.
- 確保所有已安裝的作業系統都再次被選取。
allinstalled
- allinstalled
Waits for all OSes on the SD card to be listed
- 等待所有在 SD 記憶卡上的作業系統被列出
waitsd
- waitsd
Waits for all OSes on local USBs to be listed
- 等待所有在本機 USB 磁碟上的作業系統被列出
waitusb
- waitusb
Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- 在檢查作業系統列表前等待所有作業系統清單都被下載
waitnetwork
- waitnetwork
Waits for OSes from all sources to be listed
- 等待所有來源的作業系統都被列出
waitall
- waitall
The list of OSes that will be selected at startup
- 作業系統清單將會在啟動時被選取
Reserve an ADDITIONAL amount of space
- 保留額外的空間
+
- +
Automatically reinstalls any selected OSes if newer versions exist
- 如果新版本可用的話，自動重新安裝任何選定的作業系統
silentreinstallnewer
- silentreinstallnewer
Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- 允許自動安裝一個或多個作業系統，在無人值守安裝時很有用。
silentinstall
- silentinstall
select=
- select=
Source
- 來源
Prevents the default RaspberryPi Foundation repository from being used.
- 避免使用預設的樹莓派基金會倉庫。
no_default_source
nodefaultsource
- no_default_source
Prevents OSes stored on local USB memory devices from being used.
- 避免使用儲存在本機 USB 記憶裝置的作業系統。
disableusbimages
- disableusbimages
Prevent OSes stored on the SD card from being used.
- 避免使用儲存在 SD 記憶卡上的作業系統。
disablesdimages
- disablesdimages
Shows all available installable OSes, whether they are suitable for the current model of Pi or not. Useful for preparing SD cards to be used in other RPis.
- 顯示所有可安裝的作業系統，不管它們是否適用於目前樹莓派的型號。對準備要用於其他樹莓派上的 SD 記憶卡時很有用。
showall
- showall
Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- 提供包含其他 os-list_v3.json 檔案 URL 的 repo_list.json 檔案 URL。這讓遠端管理網路儲存庫簡單許多。
repo_list=
- repo_list=
-
+
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
+ 類似於 alt_image_source 但其與指定其他額外儲存庫的 NOOBS 方法相符合，為以空格分隔的有引號字串。
repo=
- repo=
: Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- ：提供指出其他作業系統位置的額外 os_list_v3.json 檔案 URL，可以從網路上下載。此選項可以使用多個實體。
alt_image_source=
- alt_image_source=
Booting
- 開機
-
+
When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
+ 當與 forcetrigger 一起使用時，它會設定一個最大逾時（以秒為單位），以便在繼續開機選取對話框前顯示復原選單，並可以選取要開機的預設作業系統。
remotetimeout=<secs>
- remotetimeout=<secs>
Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- 強制在啟動時進入 PINN 介面（如同按下 Shift 鍵）。這在使用 VNC 連線時非常有用。
forcetrigger
- forcetrigger
Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- 如果 GPIO 標頭 P1 上的 pin3 連線到 GND (pin25)，就強制在開機時進入復原模式。
gpiotriggerenable
- gpiotriggerenable
This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- 這個設定讓網路逾時可使用秒指定，對需要較長時間辨識的網路尤為有用。
networktimeout=<secs>
- networktimeout=<secs>
-
+
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
+ 避免在開機時按下 Shift 鍵進入復原模式（也許您有個有問題的鍵盤，會在您每次開機時錯誤觸發）
keyboardtriggerenable
- keyboardtriggerenable
Interface
- 介面
Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
- 使用 VNC 網路連線以控制 PINN 而非任何本機連線的鍵盤、滑鼠與顯示器。當使用此選項時，任何本機的顯示器都會保持為空白。
vncinstall
- vncinstall
-
+
Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
+ 使用 VNC 網路連線控制 PINN。但不像 vncinstall，任何本機連線的鍵盤與滑鼠都還是可以使用，而顯示畫面也會在本機螢幕與 VNC 連線上同步顯示。
vncshare
- vncshare
Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- 啟用到 PINN 中的緊急殼層的 SSH 連線。這對控制 PINN 沒什麼用，但在執行對任何 SD 記憶卡分割區的遠端維護時相當有用
ssh
- ssh
This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- 此選項會在 PINN 開機時開啟本機殼層。當殼層存在時，PINN 將會正常開機。
rescueshell
- rescueshell
Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- 如果您有外部硬體將 pin 5 拉低，避免進入安全模式。
disablesafemode
- disablesafemode
A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- 交換 DSI 與 HDMI 視訊輸入的特殊開機功能，讓作業系統可以在 HDMI 螢幕連線時較高的優先權。
dsi
- dsi
Prevents the list of OSes from being grouped into categories.
- 避免將作業系統清單加入到分類中。
no_group
- no_group
Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- 避免在開機選取對話框時顯示游標（對觸控螢幕有用）
no_cursor
- no_cursor
Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- 使用自訂的 wallpaper.jpg 或 wallpaper.png 檔案調整大小到填滿整個桌面
wallpaper_resize
- wallpaper_resize
Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- 設定四個簡易顯示模式其中之一：0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
display=
- display=
Changes the style of the windows
- 變更視窗樣式
style=
- style=
Changes the default timeout allowed before an OS is booted without any selection.
- 變更沒有選取作業系統時在開機選單允許的逾時。
bootmenutimeout=<secs>
- bootmenutimeout=<secs>
-
+
To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
+ 要變更畫面與大多數視窗的背景色彩，新增 background=r,g,b，0,0,0 是黑色，而 255,255,255 是白色。我建議使用 127 以上的值。
background=<r,g,b>
- background=<r,g,b>
none
- 無
0
- 0
1
- 1
2
- 2
3
- 3
windows
- windows
motif
- motif
platinum
- platinum
WARNING
- 警告
Warning: You have chosen the 'runinstaller' option.
This will erase all your OSes on next boot.
Are you sure?
- 警告：您已選擇 'runinstaller' 選項。
+這將會在下次開機抹除您所有的作業系統。
+您確定嗎？
@@ -2244,12 +2258,12 @@ Are you sure?
Dialog
- 對話框
Please accept these T&Cs to continue.
- 請接受這些條款與細則以繼續。
@@ -2497,12 +2511,12 @@ Are you sure?
Error in checksum for partition_setup.sh
- partition_setup.sh 的檢查碼錯誤
Expected csum= %1 Calculated= %2
- 預期的 csum= %1 計算後= %2