diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..0965e57 --- /dev/null +++ b/.clang-format @@ -0,0 +1,36 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +--- +BasedOnStyle: WebKit + +AlignAfterOpenBracket: Align +AlignEscapedNewlines: DontAlign +AllowAllParametersOfDeclarationOnNextLine: "false" +AllowShortFunctionsOnASingleLine: Inline +AllowShortIfStatementsOnASingleLine: "false" +AllowShortLambdasOnASingleLine: All +AllowShortLoopsOnASingleLine: "false" +AlwaysBreakAfterReturnType: TopLevelDefinitions +AlwaysBreakTemplateDeclarations: Yes +BinPackArguments: "false" +BinPackParameters: "false" +BreakBeforeBraces: Allman +BreakBeforeTernaryOperators: "true" +BreakConstructorInitializers: BeforeComma +ColumnLimit: 120 +Cpp11BracedListStyle: "false" +FixNamespaceComments: "true" +IncludeBlocks: Preserve +IndentWidth: "4" +MaxEmptyLinesToKeep: "2" +NamespaceIndentation: None +PointerAlignment: Left +ReflowComments: "false" +SortIncludes: "true" +SpaceAfterCStyleCast: "false" +SpaceInEmptyBlock: "false" +SpacesBeforeTrailingComments: "2" +SpacesInAngles: "true" +SpacesInParentheses: "true" +SpacesInSquareBrackets: "true" +Standard: c++17 diff --git a/.gersemirc b/.gersemirc new file mode 100644 index 0000000..8459e68 --- /dev/null +++ b/.gersemirc @@ -0,0 +1,10 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Gersemi configuration +color: false +definitions: [ CMakeModules/CalamaresAddTest.cmake ] +line_length: 120 +quiet: false +unsafe: false + diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..9fc9f19 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,5 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +18fef8dfe5d926ec0bc979562553adf4db8db2e9 +874a0c1f38b0da4e5bc83083b13a63b1c7eed935 diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 0000000..cfd836c --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,90 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Calamares +Source: https://github.com/calamares/calamares.git + +### ACTUAL LICENSES +# +# Images in the locale module are a bit unclear; they were added +# by Teo in 2014 but I suspect they came from somewhere else. +# +Files: src/modules/locale/images/timezone*.png +License: GPL-3.0-or-later +Copyright: 2014 Teo Mrnjavac + +Files: man/calamares.8 +License: GPL-3.0-or-later +Copyright: 2017 Jonathan Carter + +### BUILD ARTIFACTS / NOT SOURCE +# +# QRC Files are basically build artifacts +# +FILES: src/modules/*/*.qrc +License: CC0-1.0 +Copyright: no + +# GitHub issue templates are not part of the source +# +Files: .github/ISSUE_TEMPLATE/* +License: CC0-1.0 +Copyright: no + +# GitHub actions are not part of the source +Files: .github/workflows/*.yml +License: CC0-1.0 +Copyright: no + +# Packaging information +# +Files: data/FreeBSD/distinfo data/FreeBSD/pkg-descr data/FreeBSD/pkg-plist +License: CC0-1.0 +Copyright: no + +# Example data for timezones, which is copied out of zoneinfo, +# which has this notice: +# +# This file is in the public domain, so clarified as of +# 2009-05-17 by Arthur David Olson. +# +Files: data/example-root/usr/share/zoneinfo/Zulu data/example-root/usr/share/zoneinfo/UTC data/example-root/usr/share/zoneinfo/America/New_York +License: CC0-1.0 +Copyright: no + +### TRANSLATIONS +# +# .desktop files and template change only with translation +# +FILES: calamares.desktop* +License: CC0-1.0 +Copyright: no + +# Transifex translations derive from the source, and have no +# embedded copyright information. +# +Files: lang/*.ts +License: GPL-3.0-or-later +Copyright: 2020 Calamares authors and translators + +# Translations of branding slideshow are the same +Files: src/branding/default/lang/*.ts +License: GPL-3.0-or-later +Copyright: 2020 Calamares authors and translators + +# Python translation files have some copyright information, but +# it's generally very sketchy. +# +Files: lang/python.pot +License: GPL-3.0-or-later +Copyright: 2020 Calamares authors and translators + +Files: lang/python/*/LC_MESSAGES/python.po +License: GPL-3.0-or-later +Copyright: 2020 Calamares authors and translators + +Files: src/modules/dummypythonqt/lang/dummypythonqt.pot +License: GPL-3.0-or-later +Copyright: 2020 Calamares authors and translators + +Files: src/modules/dummypythonqt/lang/*/LC_MESSAGES/dummypythonqt.po +License: GPL-3.0-or-later +Copyright: 2020 Calamares authors and translators diff --git a/debian/changelog b/debian/changelog index f774558..c222e57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares (3.3.0~git20220610-0ubuntu2) kinetic; urgency=medium + + * Fix UEFI installation bug https://github.com/calamares/calamares/issues/1990 + + -- Aaron Rainbolt Thu, 16 Jun 2022 14:06:23 -0500 + calamares (3.3.0~git20220610-0ubuntu1) kinetic; urgency=medium * New upstream snapshot. diff --git a/debian/patches/series b/debian/patches/series index 683ca99..f4189f8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0001-replace-pkexec-by-sudo.patch apport-package-hook.patch +uefi-bootloader-fix.patch diff --git a/debian/patches/uefi-bootloader-fix.patch b/debian/patches/uefi-bootloader-fix.patch new file mode 100644 index 0000000..d645ed7 --- /dev/null +++ b/debian/patches/uefi-bootloader-fix.patch @@ -0,0 +1,27 @@ +Description: Fix UEFI installation bug + A previous change in Calamares 3.3.0 caused the UEFI partition to not be + populated when installing Lubuntu on a UEFI system. This patch reverts the + change, allowing UEFI installations to work again. +Author: Aaron Rainbolt +Origin: upstream, https://github.com/calamares/calamares/blob/calamares/src/modules/bootloader/main.py +Bug: https://github.com/calamares/calamares/issues/1990 +Forwarded: not-needed +Applied-Upstream: https://github.com/calamares/calamares/pull/1991 +Last-Update: 2022-06-16 +--- a/src/modules/bootloader/main.py ++++ b/src/modules/bootloader/main.py +@@ -798,12 +798,8 @@ def run(): + + fw_type = libcalamares.globalstorage.value("firmwareType") + +- if libcalamares.globalstorage.value("bootLoader") is None: +- # Don't want a bootloader, but do log that this has an effect: +- if fw_type != "efi": +- libcalamares.utils.warning( "Non-EFI system, and no bootloader is set." ) +- else: +- libcalamares.utils.warning( "EFI system, and no bootloader is set." ) ++ if (libcalamares.globalstorage.value("bootLoader") is None and fw_type != "efi"): ++ libcalamares.utils.warning( "Non-EFI system, and no bootloader is set." ) + return None + + partitions = libcalamares.globalstorage.value("partitions")