From 223788235bed1da932487bbdaefa5ce68955afce Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 17 Sep 2021 16:13:20 +0300 Subject: [PATCH] qttools: rename git submodule QtTools is using a git submodule within a submodule. Rename it so that the parent chain is recorded correctly for scripts to handle the update. Pick-to: 6.2 Change-Id: I7b8028da254be4e6bb1f523fe10947996563186e Reviewed-by: Daniel Smith Reviewed-by: Mikko Gronoff --- recipes-qt/qt6/qt6-git.inc | 2 +- recipes-qt/qt6/qttools_git.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index 4eba355..ee11ae1 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -46,7 +46,7 @@ SRCREV_qtspeech = "462c3384467cec55a31fde11afb959321063a0ce" SRCREV_qtsvg = "09abc1ad49e55e7b3fb8cd3587075428a0bffa06" SRCREV_qttools = "14e0af4e3ca03f13f8ae2f9c62e6dd62d277ea4b" SRCREV_qttools-qlitehtml = "908670c5b68d3bcf4712019a028079b8b2042dd4" -SRCREV_qttools-litehtml = "db7f59d5886fd50f84d48720c79dc2e6152efa83" +SRCREV_qttools-qlitehtml-litehtml = "db7f59d5886fd50f84d48720c79dc2e6152efa83" SRCREV_qttranslations = "dbcf76dc2f7173906eee6c6f83630a90ab80b4a4" SRCREV_qtvirtualkeyboard = "04be79feea84aa668a9f72ae41beafca7e9fd0a4" SRCREV_qtwayland = "cfd65d318546162c1f8fad48b43da8ab62d24369" diff --git a/recipes-qt/qt6/qttools_git.bb b/recipes-qt/qt6/qttools_git.bb index c095c49..df98586 100644 --- a/recipes-qt/qt6/qttools_git.bb +++ b/recipes-qt/qt6/qttools_git.bb @@ -14,7 +14,7 @@ include recipes-qt/qt6/qt6.inc SRC_URI += " \ ${QT_GIT}/playground/qlitehtml.git;name=qttools-qlitehtml;branch=master;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/assistant/qlitehtml \ - git://github.com/litehtml/litehtml.git;name=qttools-litehtml;branch=master;destsuffix=git/src/assistant/qlitehtml/src/3rdparty/litehtml \ + git://github.com/litehtml/litehtml.git;name=qttools-qlitehtml-litehtml;branch=master;destsuffix=git/src/assistant/qlitehtml/src/3rdparty/litehtml \ " DEPENDS += "qtbase qtdeclarative qttools-native" @@ -23,4 +23,4 @@ FILES:${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks" BBCLASSEXTEND = "native nativesdk" -SRCREV_FORMAT = "qttools_qttools-qlitehtml_qttools-litehtml" +SRCREV_FORMAT = "qttools_qttools-qlitehtml_qttools-qlitehtml-litehtml"