From 1ed6313c4ee2fa7cf840205cb684c34343784441 Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Mon, 17 Feb 2014 15:08:55 +0200 Subject: Fix mksrc.sh Packaging the super repo (qt5.git) itself was broken when creating split packages. Make the script produce the "split package" also from the super repo itself. Change-Id: I5f59398a2f41f0c85349dc669a9eafc03f98e52c Reviewed-by: Samuli Piippo Reviewed-by: Kalle Viironen Reviewed-by: Antti Kokko --- packaging-tools/mksrc.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'packaging-tools/mksrc.sh') diff --git a/packaging-tools/mksrc.sh b/packaging-tools/mksrc.sh index b50e8c5de..8e881e74e 100755 --- a/packaging-tools/mksrc.sh +++ b/packaging-tools/mksrc.sh @@ -124,6 +124,7 @@ function create_and_delete_submodule() echo " - Done zipping $_file -" ) & wait + rm -rf $_file done < $MODULES cd .. } @@ -411,6 +412,17 @@ if [ $MULTIPACK = yes -a $SINGLEMODULE = no ]; then mv $PACKAGE_NAME.* single/ echo " -- Creating archives per submodule -- " create_and_delete_submodule + echo " -- Creating archive from super repository" + create_main_file + for POSTFIX in "7z" "zip" "tar.gz" "tar.xz"; do + if [ -f $PACKAGE_NAME.$POSTFIX ]; then + if [[ $POSTFIX == *"tar"* ]]; then + mv $PACKAGE_NAME.$POSTFIX submodules_tar/$REPO_NAME-$LICENSE-src-$QTVER.$POSTFIX + else + mv $PACKAGE_NAME.$POSTFIX submodules_zip/$REPO_NAME-$LICENSE-src-$QTVER.$POSTFIX + fi + fi + done fi cleanup -- cgit v1.2.3