move most recipes to whinlatter

conf/distro/asteroid.conf

@@ -18,7 +18,7 @@ MAINTAINER = "Florent Revest <revestflo@gmail.com>"
 # Distro setup
 DISTRO = "asteroid"
 DISTRO_NAME = "AsteroidOS"
-DISTRO_VERSION ?= "1.1-nightly"
+DISTRO_VERSION ?= "2.1"
 
 DISTRO_FEATURES = "alsa bluetooth bluez5 opengl pam polkit pulseaudio systemd usbhost usbgadget usrmerge wayland wifi xattr ${DISTRO_FEATURES_LIBC}"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
@@ -37,7 +37,7 @@ ANDROID_EXTRA_INITRAMFS_IMAGE_INSTALL ?= ""
 
 FILESYSTEM_PERMS_TABLES = "files/fs-perms.txt files/asteroidos-fs-perms.txt"
 
-PACKAGE_FEED_URIS = "https://release.asteroidos.org/nightlies/"
+PACKAGE_FEED_URIS = "https://release.asteroidos.org/2.0/"
 PACKAGE_FEED_BASE_PATHS = "ipk"
 PACKAGE_FEED_ARCHS = "all anthias armv7vehf-neon bass beluga catfish core2-32 dory emulator firefish harmony hoki inharmony koi lenok minnow mooneye narwhal nemo pike ray skipjack smelt sparrow sprat sturgeon swift tetra triggerfish wren"
 

conf/layer.conf

@@ -8,6 +8,6 @@ BBFILE_COLLECTIONS += "asteroid-layer"
 BBFILE_PATTERN_asteroid-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_asteroid-layer = "7"
 
-LAYERSERIES_COMPAT_asteroid-layer = "walnascar"
+LAYERSERIES_COMPAT_asteroid-layer = "whinlatter"
 
 PACKAGE_FEED += "gdb strace"

conf/machine/include/hybris-watch.inc

@@ -14,6 +14,6 @@ PREFERRED_PROVIDER_virtual/android-system-image = "android"
 
 KERNEL_IMAGETYPE = "zImage-dtb"
 IMAGE_FSTYPES += "ext4"
-IMAGE_ROOTFS_ALIGNMENT="4"
+IMAGE_ROOTFS_ALIGNMENT = "4"
 
 IMAGE_INSTALL += "android-init android-tools-adbd android-system firmwared"

recipes-android/android-init/android-init_1.0.bb

@@ -5,8 +5,7 @@ SRC_URI = "file://init.rc \
     file://android-boot-completed.service"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 

recipes-android/android/android.inc

@@ -5,8 +5,7 @@ inherit gettext
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 INHIBIT_PACKAGE_STRIP = "1"
 INSANE_SKIP:${PN} = "already-stripped"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 B = "${S}"
 
 PROVIDES += "virtual/android-system-image"

recipes-android/droidmedia/droidmedia_git.bb

@@ -9,4 +9,3 @@ SRC_URI = "git://github.com/sailfishos/droidmedia.git;protocol=https;branch=mast
 SRCREV = "8829b9dcd3b67ea6ea75a5fe17c408d79fb17bc5"
 PR = "r1"
 PV = "+git${SRCPV}"
-S = "${WORKDIR}/git"

recipes-android/msm-wifi-enabler/msm-wifi-enabler_1.0.bb

@@ -3,8 +3,6 @@ PR = "r0"
 SRC_URI = "file://msm-wifi-enabler.service"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
 
 inherit systemd
 

recipes-android/swclock-offset/swclock-offset_git.bb

@@ -7,7 +7,6 @@ SRC_URI = "git://gitlab.com/postmarketOS/swclock-offset.git;protocol=https;branc
 SRCREV = "6a4e4dcee814c7cfc22e0f69a6dc510086cb7abf"
 PR = "r1"
 PV = "+git${SRCPV}"
-S = "${WORKDIR}/git"
 
 SYSTEMD_SERVICE:${PN} = "swclock-offset-boot.service swclock-offset-shutdown.service"
 

recipes-android/tls-padding/tls-padding.bb

@@ -6,7 +6,6 @@ SRC_URI = "git://gitlab.com/ubports/development/core/hybris-support/tls-padding.
 SRCREV = "c85ac0910effbf0197e43ba803536f2c7e289564"
 PR = "r1"
 PV = "+git${SRCPV}"
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 

recipes-android/udev-droid-system/udev-droid-system_1.0.bb

@@ -4,12 +4,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-3.0-only;md5=c79ff39f19dfec
 
 SRC_URI = "file://998-droid-system.rules"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
-B = "${S}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-do_install:append() {
+do_install() {
     install -d ${D}${nonarch_base_libdir}/udev/rules.d
     install -m 644 ${UNPACKDIR}/998-droid-system.rules ${D}${nonarch_base_libdir}/udev/rules.d/
 }

recipes-asteroid/asteroid-apps/asteroid-alarmclock_git.bb → recipes-asteroid/asteroid-apps/asteroid-alarmclock_2.1.bb

@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/AsteroidOS/asteroid-alarmclock.git"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-alarmclock.git;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/asteroid-alarmclock.git;protocol=https;branch=2.0"
+SRCREV = "9f085c0afca5a086b3e367ba5b08469337e616ac"
 
 require asteroid-app.inc
 

recipes-asteroid/asteroid-apps/asteroid-app.inc

@@ -2,7 +2,6 @@ SUMMARY = "AsteroidOS apps base recipe"
 
 PR = "r1"
 PV = "+git${SRCPV}"
-S = "${WORKDIR}/git"
 inherit cmake_qt5
 
 DEPENDS += "qml-asteroid asteroid-generate-desktop-native qttools-native qtdeclarative-native"

recipes-asteroid/asteroid-apps/asteroid-calculator_git.bb → recipes-asteroid/asteroid-apps/asteroid-calculator_2.1.bb

@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/AsteroidOS/asteroid-calculator.git"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-calculator.git;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/asteroid-calculator.git;protocol=https;branch=2.0"
+SRCREV = "dd2b9b93afc153c617e81e6ad77caca9162392fb"
 
 REMOVE_TRANSLATIONS = "1"
 

recipes-asteroid/asteroid-apps/asteroid-calendar_git.bb → recipes-asteroid/asteroid-apps/asteroid-calendar_2.1.bb

@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/AsteroidOS/asteroid-calendar.git"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-calendar.git;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/asteroid-calendar.git;protocol=https;branch=2.0"
+SRCREV = "f3c6a437bfeff71f457777f6e8f1d6e5674608dc"
 
 require asteroid-app.inc
 

recipes-asteroid/asteroid-apps/asteroid-camera_git.bb → recipes-asteroid/asteroid-apps/asteroid-camera_2.1.bb

@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/AsteroidOS/asteroid-camera.git"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-camera.git;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/asteroid-camera.git;protocol=https;branch=2.0"
+SRCREV = "8ed63c0abb38a792582d9fc49c20f470f2369fd0"
 
 REMOVE_TRANSLATIONS = "1"
 

recipes-asteroid/asteroid-apps/asteroid-compass_git.bb → recipes-asteroid/asteroid-apps/asteroid-compass_2.1.bb

@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/AsteroidOS/asteroid-compass.git"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-compass.git;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/asteroid-compass.git;protocol=https;branch=2.0"
+SRCREV = "26efd5efdb524f3ff8083f0b39ef23de57bc5805"
 
 require asteroid-app.inc
 

recipes-asteroid/asteroid-apps/asteroid-diamonds_git.bb → recipes-asteroid/asteroid-apps/asteroid-diamonds_2.1.bb

@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/AsteroidOS/asteroid-diamonds.git"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-diamonds.git;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/asteroid-diamonds.git;protocol=https;branch=2.0"
+SRCREV = "af2e8d84617df5b1cee277d6250f96d05d7d58a6"
 
 require asteroid-app.inc
 

recipes-asteroid/asteroid-apps/asteroid-flashlight_git.bb → recipes-asteroid/asteroid-apps/asteroid-flashlight_2.1.bb

@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/AsteroidOS/asteroid-flashlight.git"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-flashlight.git;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/asteroid-flashlight.git;protocol=https;branch=2.0"
+SRCREV = "cd106ae07b9afadca712ae34a3ba8edd1a8f5148"
 
 require asteroid-app.inc

recipes-asteroid/asteroid-apps/asteroid-gps-test_git.bb → recipes-asteroid/asteroid-apps/asteroid-gps-test_2.1.bb

@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/AsteroidOS/asteroid-gps-test.git"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-gps-test.git;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/asteroid-gps-test.git;protocol=https;branch=2.0"
+SRCREV = "5ddfedf2ab093a9986806838829bc37b8080e9f3"
 
 REMOVE_TRANSLATIONS = "1"
 

recipes-asteroid/asteroid-apps/asteroid-helloworld_git.bb → recipes-asteroid/asteroid-apps/asteroid-helloworld_2.1.bb

@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/AsteroidOS/asteroid-helloworld.git"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-helloworld.git;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/asteroid-helloworld.git;protocol=https;branch=2.0"
+SRCREV = "a3908a7c7d13491b189ca4c0767c43ed24ce0271"
 
 REMOVE_TRANSLATIONS = "1"
 

recipes-asteroid/asteroid-apps/asteroid-hrm_git.bb → recipes-asteroid/asteroid-apps/asteroid-hrm_2.1.bb

@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/AsteroidOS/asteroid-hrm.git"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-hrm.git;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/asteroid-hrm.git;protocol=https;branch=2.0"
+SRCREV = "bd973a132c8ceb5a7d4d6067f42b57459f63331e"
 
 require asteroid-app.inc
 

recipes-asteroid/asteroid-apps/asteroid-music_git.bb → recipes-asteroid/asteroid-apps/asteroid-music_2.1.bb

@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/AsteroidOS/asteroid-music.git"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-music.git;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/asteroid-music.git;protocol=https;branch=2.0"
+SRCREV = "a060d5dc3718ee01fdb70782a7272fce2a39e53a"
 
 require asteroid-app.inc
 

recipes-asteroid/asteroid-apps/asteroid-settings_git.bb → recipes-asteroid/asteroid-apps/asteroid-settings_2.1.bb

@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/AsteroidOS/asteroid-settings.git"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-settings.git;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/asteroid-settings.git;protocol=https;branch=2.0"
+SRCREV = "2a298307e6424b1c026000ddbd391e0d64a4a226"
 
 require asteroid-app.inc
 

recipes-asteroid/asteroid-apps/asteroid-stopwatch_git.bb → recipes-asteroid/asteroid-apps/asteroid-stopwatch_2.1.bb

@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/AsteroidOS/asteroid-stopwatch.git"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-stopwatch.git;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/asteroid-stopwatch.git;protocol=https;branch=2.0"
+SRCREV = "6f366ee3629832dae2bcbe8dddd3af7668bb5165"
 
 REMOVE_TRANSLATIONS = "1"
 

recipes-asteroid/asteroid-apps/asteroid-timer_git.bb → recipes-asteroid/asteroid-apps/asteroid-timer_2.1.bb

@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/AsteroidOS/asteroid-timer.git"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-timer.git;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/asteroid-timer.git;protocol=https;branch=2.0"
+SRCREV = "f04baa1e99fd867fab9c83b84412def455a1266f"
 
 REMOVE_TRANSLATIONS = "1"
 

recipes-asteroid/asteroid-apps/asteroid-weather_git.bb → recipes-asteroid/asteroid-apps/asteroid-weather_2.1.bb

@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/AsteroidOS/asteroid-weather.git"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-weather.git;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/asteroid-weather.git;protocol=https;branch=2.0"
+SRCREV = "32f886f1ea0a9e26121d1c728cae5257fa98fa17"
 
 require asteroid-app.inc
 

recipes-asteroid/asteroid-btsyncd/asteroid-btsyncd_git.bb → recipes-asteroid/asteroid-btsyncd/asteroid-btsyncd_2.1.bb

@@ -3,16 +3,15 @@ HOMEPAGE = "https://github.com/AsteroidOS/asteroid-btsyncd"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-btsyncd.git;protocol=https;branch=master \
+SRC_URI = "git://github.com/AsteroidOS/asteroid-btsyncd.git;protocol=https;branch=2.0 \
     file://asteroid-btsyncd.service"
-SRCREV = "${AUTOREV}"
+SRCREV = "4d261a724efbbcfce2750dc349b3d2ff9f565a18"
 PR = "r1"
 PV = "+git${SRCPV}"
-S = "${WORKDIR}/git"
 inherit cmake_qt5 gsettings pkgconfig
 
-DEPENDS += "qml-asteroid qtbase glibmm qtmpris timed qttools-native nemo-qml-plugin-systemsettings"
-RDEPENDS:${PN} += "glibmm qtmpris"
+DEPENDS += "qml-asteroid qtbase glibmm qtmpris qttools-native nemo-qml-plugin-systemsettings"
+RDEPENDS:${PN} += "glibmm qtmpris systemd"
 
 FILES:${PN} += "/usr/bin/ /usr/lib/systemd/user/ /usr/share/glib-2.0/schemas /usr/share/translations/ /usr/lib/systemd/user/default.target.wants/"
 

recipes-asteroid/asteroid-icons/asteroid-icons-ion_git.bb → recipes-asteroid/asteroid-icons/asteroid-icons-ion_2.1.bb

@@ -4,10 +4,9 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=92e02b7236a0635eaf1478f8041b0602"
 
 SRC_URI = "git://github.com/AsteroidOS/asteroid-icons-ion;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRCREV = "7941cd491296b79941cbdad0d4b72bd34810c5dc"
 PR = "r1"
 PV = "+git${SRCPV}"
-S = "${WORKDIR}/git"
 
 do_install() {
     install -d ${D}/usr/share/icons/asteroid/

recipes-asteroid/asteroid-launcher/asteroid-launcher-configs_git.bb

@@ -4,8 +4,7 @@ SRC_URI = "file://default.conf \
     file://keys.kmap"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}/sources"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 

recipes-asteroid/asteroid-launcher/asteroid-launcher_git.bb → recipes-asteroid/asteroid-launcher/asteroid-launcher_2.1.bb

@@ -1,16 +1,15 @@
 SUMMARY = "Asteroid's launcher based on lipstick"
 HOMEPAGE = "https://github.com/AsteroidOS/asteroid-launcher"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://src/qml/MainScreen.qml;beginline=1;endline=29;md5=3d250dd089f5d6221d9054029963e332"
+LIC_FILES_CHKSUM = "file://src/qml/MainScreen.qml;beginline=1;endline=29;md5=dc9980ea8441655e2d7b323a30b7172d"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-launcher.git;protocol=https;branch=master \
+SRC_URI = "git://github.com/AsteroidOS/asteroid-launcher.git;protocol=https;branch=2.0 \
     file://asteroid-launcher.service \
     file://asteroid-launcher-precondition"
 SRC_URI:append:hybris-machine = " file://asteroid-launcher-precondition-hybris "
-SRCREV = "${AUTOREV}"
+SRCREV = "4d123865d0c91599fbd6caacad714f1443b0a57d"
 PR = "r1"
 PV = "+git${SRCPV}"
-S = "${WORKDIR}/git"
 inherit cmake_qt5 pkgconfig
 
 DEPENDS += "qml-asteroid lipstick qttools-native timed"

recipes-asteroid/asteroid-sounds/asteroid-sounds_git.bb → recipes-asteroid/asteroid-sounds/asteroid-sounds_2.1.bb

@@ -3,11 +3,10 @@ HOMEPAGE = "https://github.com/AsteroidOS/asteroid-sounds"
 LICENSE = "CC0-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=65d3616852dbf7b1a6d4b53b00626032"
 
-SRC_URI = "git://github.com/AsteroidOS/asteroid-sounds.git;protocol=https;branch=main"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/asteroid-sounds.git;protocol=https;branch=2.0"
+SRCREV = "8d582d135b9486e9add714cc44f0f28c7aeaa0e9"
 PR = "r1"
 PV = "+git${SRCPV}"
-S = "${WORKDIR}/git"
 
 do_install() {
     install -d ${D}/usr/share/sounds/

recipes-asteroid/asteroid-virtualkeyboard/asteroid-virtualkeyboard_git.bb

@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
 SRC_URI = "git://github.com/AsteroidOS/asteroid-virtualkeyboard.git;protocol=https;branch=main"
 SRCREV = "85b266f561dc6ac78bf58cb52b0b89f10bc79227"
 PV = "1.0+git${SRCPV}"
-S = "${WORKDIR}/git"
 
 inherit cmake_qt5 
 

recipes-asteroid/asteroid-wallpapers/asteroid-wallpapers_git.bb → recipes-asteroid/asteroid-wallpapers/asteroid-wallpapers_2.1.bb

@@ -4,10 +4,9 @@ LICENSE = "CC-BY-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE_CCBY;md5=e5ae8a8ac3605e6baffcd72982f4703b"
 
 SRC_URI = "git://github.com/AsteroidOS/asteroid-wallpapers;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRCREV = "3cd501b96343f97de4e26f847351ea0555ccce55"
 PR = "r1"
 PV = "+git${SRCPV}"
-S = "${WORKDIR}/git"
 
 do_install() {
     install -d ${D}/usr/share/asteroid-launcher/wallpapers/

recipes-asteroid/qml-asteroid/asteroid-generate-desktop-native_git.bb → recipes-asteroid/qml-asteroid/asteroid-generate-desktop-native_2.1.bb

@@ -3,11 +3,10 @@ HOMEPAGE = "https://github.com/AsteroidOS/qml-asteroid.git"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1702a92c723f09e3fab3583b165a8d90"
 
-SRC_URI = "git://github.com/AsteroidOS/qml-asteroid.git;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/qml-asteroid.git;protocol=https;branch=2.0"
+SRCREV = "bbd14a66047627fe39943307ce303a2fc893ba5f"
 PR = "r1"
 PV = "+git${SRCPV}"
-S = "${WORKDIR}/git"
 
 inherit native
 

recipes-asteroid/qml-asteroid/qml-asteroid_git.bb → recipes-asteroid/qml-asteroid/qml-asteroid_2.1.bb

@@ -3,11 +3,10 @@ HOMEPAGE = "https://github.com/AsteroidOS/qml-asteroid.git"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1702a92c723f09e3fab3583b165a8d90"
 
-SRC_URI = "git://github.com/AsteroidOS/qml-asteroid.git;protocol=https;branch=master"
-SRCREV = "${AUTOREV}"
+SRC_URI = "git://github.com/AsteroidOS/qml-asteroid.git;protocol=https;branch=2.0"
+SRCREV = "bbd14a66047627fe39943307ce303a2fc893ba5f"
 PR = "r1"
 PV = "+git${SRCPV}"
-S = "${WORKDIR}/git"
 inherit cmake_qt5 pkgconfig
 
 DEPENDS += "extra-cmake-modules qtdeclarative qtsvg qtvirtualkeyboard mlite mapplauncherd-booster-qtcomponents qtdeclarative-native"