diff options
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | qpi.install | 117 |
2 files changed, 7 insertions, 124 deletions
@@ -34,8 +34,8 @@ _shadow_build=true # automatically disabled if you are building webengine _debug=true _skip_qtscript=false -_skip_web_engine=false -_skip_qt_widgets=false +_skip_qtwebengine=false +_skip_qtwidgets=false _static_build=false _build_from_head=false _patching=true @@ -105,8 +105,8 @@ esac if $_building && $_minimal; then _skip_qtscript=true; - _skip_web_engine=true; - _skip_qt_widgets=true; + _skip_qtwebengine=true; + _skip_qtwidgets=true; pkgname="${pkgname}-minimal" fi @@ -119,9 +119,9 @@ fi if [[ -z "${_dev_suffix}" ]]; then _release_type="official_releases"; fi $_build_from_head && _patching=false && _shadow_build=true -$_skip_web_engine && _additional_configure_flags="$_additional_configure_flags -skip qtwebengine -no-icu" -$_skip_qt_script && _additional_configure_flags="$_additional_configure_flags -skip qtscript" -$_skip_qt_widgets && _additional_configure_flags="$_additional_configure_flags -no-widgets" +$_skip_qtwebengine && _additional_configure_flags="$_additional_configure_flags -skip qtwebengine -no-icu" +$_skip_qtscript && _additional_configure_flags="$_additional_configure_flags -skip qtscript" +$_skip_qtwidgets && _additional_configure_flags="$_additional_configure_flags -no-widgets" $_static_build && _additional_configure_flags="$_additional_configure_flags -static" $_float && _additional_configure_flags="$_additional_configure_flags -qreal float" diff --git a/qpi.install b/qpi.install index e5f8238ecfd9..e69de29bb2d1 100644 --- a/qpi.install +++ b/qpi.install @@ -1,117 +0,0 @@ -_piver=2 -_qmakepath=/opt/qt-sdk-raspberry-pi2/bin/qmake -_sysroot=/mnt/pi2 -_sdktool="/usr/libexec/qtcreator/sdktool" -_devicefamily="raspberrypi" -_devicename="${_devicefamily}${_piver}" -_familytext="Raspberry Pi" -_devicetext="${_familytext} ${_piver}" - -setup_toolchain() { - echo "Registering toolchain with Qt Creator" -${_sdktool} addTC \ - --id "ProjectExplorer.ToolChain.Gcc:${_devicefamily}" \ - --name "${_familytext} toolchain" \ - --path /opt/arm-sirspuddarch-linux-gnueabihf/bin/arm-sirspuddarch-linux-gnueabihf-gcc \ - --abi arm-linux-generic-elf-32bit \ - --supportedAbis arm-linux-generic-elf-32bit - - echo "Registering debugger with Qt Creator" -${_sdktool} addDebugger \ - --id "${_devicefamily}_gdb" \ - --name "${_familytext} gdb" \ - --binary /opt/arm-sirspuddarch-linux-gnueabihf/bin/arm-sirspuddarch-linux-gnueabihf-gdb \ - --abis arm-linux-generic-elf-32bit \ - --engine 1 -} - -remove_toolchain() { -#TODO: Don't remove if the other pi package is present -#Not used at present -${_sdktool} rmTC \ - --id "ProjectExplorer.ToolChain.Gcc:${_devicefamily}" - -${_sdktool} rmDebugger \ - --id "${_devicefamily}_gdb" -} - -remove_kit() { -${_sdktool} rmQt \ - --id "${_devicename}_qt" - -${_sdktool} rmKit \ - --id "${_devicename}_kit" - -${_sdktool} rmDev \ - --id "${_devicename}_device" -} - -setup_kit() { - remove_kit - setup_toolchain - - echo "Registering device with Qt Creator" -${_sdktool} addDev \ - --id "${_devicename}_device" \ - --name "${_devicetext}" \ - --host "qpi${_piver}.local" \ - --uname "root" \ - --password "root" \ - --osType "GenericLinuxOsType" \ - --type 0 \ - --sshPort 22 \ - --freePorts "10000-10100" - - echo "Registering Qt install with Qt Creator" -${_sdktool} addQt \ - --id "${_devicename}_qt" \ - --name "${_devicetext} Qt" \ - --qmake ${_qmakepath} \ - --type RemoteLinux.EmbeddedLinuxQt - - echo "Creating Qt Creator Kit" -${_sdktool} addKit \ - --id "${_devicename}_kit" \ - --name "${_devicetext} Kit" \ - --debugger "${_devicefamily}_gdb" \ - --devicetype GenericLinuxOsType \ - --device "${_devicename}_device" \ - --sysroot ${_sysroot} \ - --toolchain "ProjectExplorer.ToolChain.Gcc:${_devicefamily}" \ - --qt "${_devicename}_qt" \ - --mkspec "devices/linux-rpi${_piver}-g++" -} - -## arg 1: the new package version -pre_install() { - echo "" -} - -## arg 1: the new package version -post_install() { - setup_kit -} -#post_install - -## arg 1: the new package version -## arg 2: the old package version -pre_upgrade() { - echo "" -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - setup_kit -} - -## arg 1: the old package version -pre_remove() { - echo "" -} -#pre_remove - -## arg 1: the old package version -post_remove() { - remove_kit -} |