Diverge from master to back up to a working state

Change-Id: I13e59de27ed9a9327db9091b842932187559894f

installroot/usr/share/kickstarts/Jolla-@RELEASE@-kenzo-@ARCH@.ks

@@ -0,0 +1,171 @@
+# DisplayName: Jolla kenzo/@ARCH@ (release) 1
+# KickstartType: release
+# DeviceModel: kenzo
+# DeviceVariant: kenzo
+# SuggestedImageType: fs
+# SuggestedArchitecture: armv7hl
+
+user --name nemo --groups audio,input,video --password nemo
+timezone --utc UTC
+lang en_US.UTF-8
+keyboard us
+
+### Commands from /tmp/sandbox/usr/share/ssu/kickstart/part/default
+part / --size 500 --ondisk sda --fstype=ext4
+
+## No suitable configuration found in /tmp/sandbox/usr/share/ssu/kickstart/bootloader
+
+repo --name=adaptation-community-common-kenzo-@RELEASE@ --baseurl=http://repo.merproject.org/obs/nemo:/devel:/hw:/common/sailfish_latest_@ARCH@/
+repo --name=apps-@RELEASE@ --baseurl=https://releases.jolla.com/jolla-apps/@RELEASE@/@ARCH@/
+repo --name=hotfixes-@RELEASE@ --baseurl=https://releases.jolla.com/releases/@RELEASE@/hotfixes/@ARCH@/
+repo --name=jolla-@RELEASE@ --baseurl=https://releases.jolla.com/releases/@RELEASE@/jolla/@ARCH@/
+
+%packages
+@Jolla Configuration kenzo
+%end
+
+%attachment
+### Commands from /tmp/sandbox/usr/share/ssu/kickstart/attachment/kenzo
+/boot/hybris-boot.img
+/boot/hybris-updater-script
+/boot/hybris-updater-unpack.sh
+/boot/update-binary
+
+%end
+
+%pre
+export SSU_RELEASE_TYPE=release
+### begin 01_init
+touch $INSTALL_ROOT/.bootstrap
+### end 01_init
+%end
+
+%post
+export SSU_RELEASE_TYPE=release
+### begin 01_arch-hack
+if [ "@ARCH@" == armv7hl ] || [ "@ARCH@" == armv7tnhl ]; then
+    # Without this line the rpm does not get the architecture right.
+    echo -n "@ARCH@-meego-linux" > /etc/rpm/platform
+
+    # Also libzypp has problems in autodetecting the architecture so we force tha as well.
+    # https://bugs.meego.com/show_bug.cgi?id=11484
+    echo "arch = @ARCH@" >> /etc/zypp/zypp.conf
+fi
+### end 01_arch-hack
+### begin 01_rpm-rebuilddb
+# Rebuild db using target's rpm
+echo -n "Rebuilding db using target rpm.."
+rm -f /var/lib/rpm/__db*
+rpm --rebuilddb
+echo "done"
+### end 01_rpm-rebuilddb
+### begin 50_oneshot
+# exit boostrap mode
+rm -f /.bootstrap
+
+# export some important variables until there's a better solution
+export LANG=en_US.UTF-8
+export LC_COLLATE=en_US.UTF-8
+export GSETTINGS_BACKEND=gconf
+
+# run the oneshot triggers for root and first user uid
+UID_MIN=$(grep "^UID_MIN" /etc/login.defs |  tr -s " " | cut -d " " -f2)
+DEVICEUSER=`getent passwd $UID_MIN | sed 's/:.*//'`
+
+if [ -x /usr/bin/oneshot ]; then
+   su -c "/usr/bin/oneshot --mic"
+   su -c "/usr/bin/oneshot --mic" $DEVICEUSER
+fi
+### end 50_oneshot
+### begin 60_ssu
+if [ "$SSU_RELEASE_TYPE" = "rnd" ]; then
+    [ -n "@RNDRELEASE@" ] && ssu release -r @RNDRELEASE@
+    [ -n "@RNDFLAVOUR@" ] && ssu flavour @RNDFLAVOUR@
+    # RELEASE is reused in RND setups with parallel release structures
+    # this makes sure that an image created from such a structure updates from there
+    [ -n "@RELEASE@" ] && ssu set update-version @RELEASE@
+    ssu mode 2
+else
+    [ -n "@RELEASE@" ] && ssu release @RELEASE@
+    ssu mode 4
+fi
+### end 60_ssu
+### begin 70_sdk-domain
+
+export SSU_DOMAIN=@RNDFLAVOUR@
+
+if [ "$SSU_RELEASE_TYPE" = "release" ] && [[ "$SSU_DOMAIN" = "public-sdk" ]];
+then
+    ssu domain sailfish
+fi
+### end 70_sdk-domain
+%end
+
+%post --nochroot
+export SSU_RELEASE_TYPE=release
+### begin 50_os-release
+(
+CUSTOMERS=$(find $INSTALL_ROOT/usr/share/ssu/features.d -name 'customer-*.ini' \
+    |xargs --no-run-if-empty sed -n 's/^name[[:space:]]*=[[:space:]]*//p')
+
+cat $INSTALL_ROOT/etc/os-release
+echo "SAILFISH_CUSTOMER=\"${CUSTOMERS//$'\n'/ }\""
+) > $IMG_OUT_DIR/os-release
+### end 50_os-release
+%end
+
+%pack
+export SSU_RELEASE_TYPE=release
+### begin hybris
+pushd $IMG_OUT_DIR
+
+DEVICE=kenzo
+
+VERSION_FILE=./os-release
+source $VERSION_FILE
+
+# Locate rootfs tar.bz2 archive.
+for filename in *.tar.bz2; do
+    GEN_IMG_BASE=$(basename $filename .tar.bz2)
+done
+
+if [ ! -e "$GEN_IMG_BASE.tar.bz2" ]; then
+    echo "No rootfs archive found, exiting ..."
+    exit 1
+fi
+
+IMG_SIZE=$(du -h $GEN_IMG_BASE.tar.bz2 | cut -f1)
+
+# Output filenames
+DST_IMG_BASE=$ID-$DEVICE-$SAILFISH_FLAVOUR-$VERSION_ID@EXTRA_NAME@
+DST_IMG=$DST_IMG_BASE.tar.bz2
+
+# Copy boot image, updater scripts and updater binary into updater .zip tree.
+mkdir -p updater/META-INF/com/google/android
+
+mv update-binary updater/META-INF/com/google/android/update-binary
+mv hybris-updater-script updater/META-INF/com/google/android/updater-script
+mv hybris-updater-unpack.sh updater/updater-unpack.sh
+mv hybris-boot.img updater/hybris-boot.img
+
+# Temporarily move the rootfs into the updater directory
+mv $GEN_IMG_BASE.tar.bz2 updater/$DST_IMG
+
+# Update updater-script with image details.
+sed -i -e "s %VERSION% $VERSION_ID g" -e "s %IMAGE_FILE% $DST_IMG g" -e "s %IMAGE_SIZE% $IMG_SIZE g" updater/META-INF/com/google/android/updater-script
+
+# pack updater .zip
+pushd updater
+zip -r ../$DST_IMG_BASE.zip META-INF/com/google/android/update-binary META-INF/com/google/android/updater-script updater-unpack.sh hybris-boot.img $DST_IMG_BASE.ks $DST_IMG
+popd # updater
+
+# Move the rootfs back out of the updater directory
+mv updater/$DST_IMG $GEN_IMG_BASE.tar.bz2
+
+# Clean up updater .zip working directory.
+rm -rf updater
+
+popd # $IMG_OUT_DIR
+### end hybris
+%end
+

patterns/jolla-configuration-kenzo.yaml

@@ -37,5 +37,15 @@ Requires:
 # to improve camera startup times and the like
 - mapplauncherd-booster-silica-qt5-media
 
+# Extra stuff
+- sailfish-office
+- jolla-calculator
+- jolla-email
+- jolla-notes
+- jolla-clock
+- jolla-mediaplayer
+- jolla-calendar
+- sailfish-weather
+
 Summary: Jolla Configuration kenzo
 

patterns/jolla-hw-adaptation-kenzo.yaml

@@ -50,8 +50,8 @@ Requires:
 # For devices with droidmedia and gst-droid built, see HADK pdf for more information
 - gstreamer1.0-droid
 - gstreamer1.0-droid-tools
-- gstreamer1.0-omx
-- gstreamer1.0-libav
+#- gstreamer1.0-omx
+#- gstreamer1.0-libav
 
 # This is needed for notification LEDs
 - mce-plugin-libhybris

sparse/etc/gst-droid/gstdroidcodec.conf

@@ -0,0 +1,3 @@
+[decoder-quirks]
+video/avc = dont-use-droid-convert
+

sparse/lib/systemd/system/ofono-delay-hack.service

@@ -5,7 +5,7 @@ Before=ofono.service
 
 [Service]
 Type=oneshot
-ExecStart=/bin/sleep 5
+ExecStart=/bin/sleep 7
 
 [Install]
 RequiredBy=multi-user.target

tmp/bluez4.files

@@ -0,0 +1,10 @@
+/etc/pulse/bluez4_stream_restore.pa
+/etc/pulse/xpolicy.conf.d/bluez4.conf
+/etc/pulse/xpolicy.conf.d/bluez4_earpiece.conf
+/etc/bluez4/bluetooth/main.conf
+/etc/bluez4/bluetooth/network.conf
+/etc/bluez4/bluetooth/jolla.conf
+/etc/bluez4/bluetooth/input.conf
+/etc/bluez4/bluetooth/rfcomm.conf
+/etc/bluez4/bluetooth/serial.conf
+/etc/bluez4/bluetooth/audio.conf

tmp/bluez5.files

@@ -0,0 +1,8 @@
+/etc/pulse/bluez5_stream_restore.pa
+/etc/pulse/xpolicy.conf.d/bluez5.conf
+/etc/pulse/xpolicy.conf.d/bluez5_earpiece.conf
+/etc/bluez5/bluetooth/main.conf
+/etc/bluez5/bluetooth/network.conf
+/etc/bluez5/bluetooth/exclude.conf
+/etc/bluez5/bluetooth/jolla.conf
+/etc/bluez5/bluetooth/input.conf

tmp/droid-config.files

@@ -0,0 +1,96 @@
+%defattr(-,root,root,-)
+/usr/sbin/adbd-functionfs.sh
+/usr/bin/droid/droid-hal-shutdown.sh
+/usr/bin/droid/get_partition.sh
+/usr/bin/droid/droid-init-done.sh
+/usr/bin/droid/droid-hal-startup.sh
+/usr/share/environment/nemo/hybris.conf
+/usr/lib/tmpfiles.d/droid-hal.conf
+/etc/sec_config
+/etc/xdg/QtProject/QPlatformTheme.conf
+/etc/xdg/QtProject/QtQuick2.conf
+/etc/xdg/QtProject/Sensors.conf
+/etc/obexd/root
+/etc/obexd/opp.conf
+/etc/obexd/pbap.conf
+/etc/obexd/excludes/bluetooth:pcsuite
+/etc/obexd/noplugins/ftp
+/etc/obexd/noplugins/irmc
+/etc/obexd/noplugins/syncevolution
+/etc/obexd/noplugins/mas
+/etc/media_codecs_performance.xml
+/etc/media_codecs.xml
+/etc/audio_platform_info.xml
+/etc/sensorfw/primaryuse.conf
+/etc/izat.conf
+/etc/gps.conf
+/etc/media_codecs_google_video.xml
+/etc/acdbdata
+/etc/usb-moded/dyn-modes/mtp_mode-droid.ini
+/etc/sysctl.d/ipv4-settings.conf
+/etc/sysctl.d/ipv6-settings.conf
+/etc/xtwifi.conf
+/etc/sap.conf
+/etc/media_codecs_ffmpeg.xml
+/etc/media_profiles.xml
+/etc/mixer_paths.xml
+/etc/xtra_root_cert.pem
+/etc/modprobe.d/blacklist-evbug.conf
+/etc/lowi.conf
+/etc/media_codecs_google_audio.xml
+/etc/media_codecs_google_telephony.xml
+/lib/systemd/system/adbd.service
+/lib/systemd/system/droid-hal-init.service
+/lib/systemd/system/graphical.target.wants/droid-hal-init.service
+/lib/systemd/system/graphical.target.wants/droid-late-start.service
+/lib/systemd/system/droid-late-start.service
+/lib/systemd/system/adbd-prepare.service
+/lib/systemd/system/actdead.target.wants/droid-hal-init.service
+/lib/udev/rules.d/998-droid-system.rules
+/lib/udev/rules.d/997-droid-drm.rules
+/var/lib/environment/nemo/99-hybris.conf
+/var/lib/environment/nemo/60-multimedia.conf
+/var/lib/environment/ofono/noplugin.conf
+/usr/bin/droid/droid-hcismd-up.sh
+/usr/share/csd/settings.d/hw-settings.ini
+/usr/libexec/droid-hybris/system/etc/init/vdc.rc
+/usr/libexec/droid-hybris/system/etc/init/gatekeeperd.rc
+/usr/libexec/droid-hybris/system/etc/init/logd.rc
+/usr/libexec/droid-hybris/system/etc/init/logcatd.rc
+/usr/libexec/droid-hybris/system/etc/init/racoon.rc
+/usr/libexec/droid-hybris/system/etc/init/dumpstate.rc
+/usr/libexec/droid-hybris/system/etc/init/mediacodec.rc
+/usr/libexec/droid-hybris/system/etc/init/drmserver.rc
+/usr/libexec/droid-hybris/system/etc/init/debuggerd.rc
+/usr/libexec/droid-hybris/system/etc/init/init-debug.rc
+/usr/libexec/droid-hybris/system/etc/init/uncrypt.rc
+/usr/libexec/droid-hybris/system/etc/init/superuser.rc
+/usr/libexec/droid-hybris/system/etc/init/atrace.rc
+/usr/libexec/droid-hybris/system/etc/init/perfprofd.rc
+/usr/libexec/droid-hybris/system/etc/init/vold.rc
+/usr/libexec/droid-hybris/system/etc/init/mediadrmserver.rc
+/usr/libexec/droid-hybris/system/etc/init/mediaextractor.rc
+/usr/libexec/droid-hybris/system/etc/init/mtpd.rc
+/usr/libexec/droid-hybris/system/etc/init/rild.rc
+/usr/libexec/droid-hybris/system/etc/init/bootstat.rc
+/usr/libexec/droid-hybris/system/etc/init/installd.rc
+/etc/gst-droid/gstdroidcamsrc-1.conf
+/etc/gst-droid/gstdroidcodec.conf
+/etc/gst-droid/gstdroidcamsrc-0.conf
+/etc/xdg/gstomx.conf
+/etc/ofono/ril_subscription.conf
+/lib/systemd/system/droid-hcismd-up.service
+/lib/systemd/system/droid-fm-permissions.service
+/lib/systemd/system/sensors-delay-hack.service
+/lib/systemd/system/droid-fm-up.service
+/lib/systemd/system/graphical.target.wants/sensors-delay-hack.service
+/lib/systemd/system/basic.target.wants/wlan-module-load.service
+/lib/systemd/system/ofono-delay-hack.service
+/lib/systemd/system/multi-user.target.wants/ofono-delay-hack.service
+/lib/systemd/system/bluetooth.service.wants/droid-hcismd-up.service
+/lib/systemd/system/bluetooth.service.wants/droid-fm-permissions.service
+/lib/systemd/system/bluetooth.service.wants/droid-fm-up.service
+/lib/systemd/system/wlan-module-load.service
+/lib/udev/rules.d/999-droid-fm.rules
+/var/lib/environment/compositor/droid-hal-device.conf
+/var/lib/environment/nemo/99-qtscenegraph.conf

tmp/flashing.files

@@ -0,0 +1 @@
+/usr/sbin/flash-partition

tmp/kickstart-configuration.files

@@ -0,0 +1,2 @@
+/usr/share/ssu/kickstart/attachment/kenzo
+/usr/share/ssu/kickstart/pack/kenzo/hybris

tmp/policy-settings.files

@@ -0,0 +1,6 @@
+/etc/ohm/dbus_signal_conf.ini
+/etc/ohm/modules.ini
+/etc/ohm/plugins.d/dbus_signal.ini
+/etc/ohm/ohmd.ini
+/etc/dbus-1/system.d/ohm-policy.conf
+/etc/ohm/plugins.d/accessories.ini

tmp/pulseaudio-settings.files

@@ -0,0 +1,31 @@
+/etc/pulse/x-maemo-route.table
+/etc/pulse/x-maemo-stream-restore.table
+/etc/pulse/x-maemo-sink-volume.table
+/etc/pulse/mainvolume-listening-time-notifier.conf
+/etc/pulse/xpolicy.conf
+/etc/pulse/x-maemo-match.table
+/etc/pulse/arm_droid_default.pa
+/etc/pulse/xpolicy.conf.d/earpiece.conf
+/etc/pulse/xpolicy.conf.d/fmradio.conf.disabled
+/etc/pulse/xpolicy.conf.d/usbaudio.conf.disabled
+/etc/sysconfig/pulseaudio
+/var/lib/nemo-pulseaudio-parameters/modes/hp/mainvolume
+/var/lib/nemo-pulseaudio-parameters/modes/ihfandheadset/mainvolume
+/var/lib/nemo-pulseaudio-parameters/modes/ihf/mainvolume
+/var/lib/nemo-pulseaudio-parameters/modes/btmono-hsp/mainvolume
+/var/lib/nemo-pulseaudio-parameters/modes/hs/mainvolume
+/var/lib/nemo-pulseaudio-parameters/modes/bta2dp/mainvolume
+/var/lib/nemo-pulseaudio-parameters/modes/usbaudio/mainvolume
+/var/lib/nemo-pulseaudio-parameters/modes/btmono/mainvolume
+/var/lib/nemo-pulseaudio-parameters/modes/ihfandbtmono/mainvolume
+/var/lib/nemo-pulseaudio-parameters/modes/ihfandlineout/mainvolume
+/var/lib/nemo-pulseaudio-parameters/modes/ihfandbtmono-hfp/mainvolume
+/var/lib/nemo-pulseaudio-parameters/modes/lineout/mainvolume
+/var/lib/nemo-pulseaudio-parameters/modes/btmono-hfp/mainvolume
+/var/lib/nemo-pulseaudio-parameters/modes/ihfandbtmono-hsp/mainvolume
+/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/hp
+/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/ihf
+/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/bta2dp
+/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/btmono
+/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/lineout
+/etc/pulse/xpolicy.conf.d/fmradio.conf

tmp/sailfish-settings.files

@@ -0,0 +1,5 @@
+/etc/dconf/db/vendor.d/screen-rotation.txt
+/etc/dconf/db/vendor.d/locks/screen-rotation.txt
+/etc/dconf/db/vendor.d/locks/silica-configs.txt
+/etc/dconf/db/vendor.d/silica-configs.txt
+/etc/dconf/db/vendor.d/jolla-camera-hw.txt

tmp/ssu-kickstarts.files

@@ -0,0 +1 @@
+/usr/share/kickstarts/Jolla-@RELEASE@-kenzo-@ARCH@.ks