From 0317276fdc59586d8e96633524e398bc9593d5c4 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 19 Feb 2020 13:38:08 +0100 Subject: [PATCH 1/4] Create LICENSE --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From ea5b4e0da2870f112eea154ee1811f0b62905f18 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 19 Feb 2020 13:39:28 +0100 Subject: [PATCH 2/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e9d642..bb47de7 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Let's put all the fancy features together, we developed in the last years: and build a Chromebook like Fedorabook, where you can install all software via Flatpak. -This is WIP. Please test and report issues, comments or missing components on https://pagure.io/Fedorabook/issues +This is WIP. Please test and report issues, comments or missing components on https://github.com/haraldh/VerityBook/issues ## Goals - secure boot to the login screen From 90ff0f5a21874ef5307beb63e790dac180a56c5d Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 13 Mar 2020 09:02:18 +0100 Subject: [PATCH 3/4] 10verity/verity-generator: --restart-on-corruption --- 10verity/verity-generator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/10verity/verity-generator b/10verity/verity-generator index bf9ff4a..0591ba4 100755 --- a/10verity/verity-generator +++ b/10verity/verity-generator @@ -68,7 +68,7 @@ if [[ -n "${root}" && -n "${roothash}" ]]; then [Service] Type=oneshot RemainAfterExit=yes - ExecStart=/bin/sh -c '/sbin/veritysetup create root ${hashoffset:+--hash-offset="${hashoffset}"} "${root}" "${root}" "${roothash}"' + ExecStart=/bin/sh -c '/sbin/veritysetup --restart-on-corruption create root ${hashoffset:+--hash-offset="${hashoffset}"} "${root}" "${root}" "${roothash}"' ExecStop=/sbin/veritysetup remove root EOF From c9ec1d1584d6f933e239a38e879a5e3a5de3edbc Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 13 Mar 2020 09:13:54 +0100 Subject: [PATCH 4/4] pkglist.txt: strip to common setup --- pkglist.txt | 109 +++------------------------------------------------- 1 file changed, 6 insertions(+), 103 deletions(-) diff --git a/pkglist.txt b/pkglist.txt index 3748daf..14f16ec 100644 --- a/pkglist.txt +++ b/pkglist.txt @@ -1,35 +1,9 @@ -musl-devel -musl-libc-static -musl-gcc -musl-clang -zlib-static -rlwrap -ibm-plex-mono-fonts -openssl-static -openssl-devel -kup -virt-install -qemu-system-ppc -qemu-system-arm -qemu-system-aarch64 -qemu-system-s390x -toolbox -sssd-kcm -podman -ImageMagick -exa -bat -fd-find -ripgrep adwaita-cursor-theme adwaita-gtk2-theme adwaita-icon-theme alsa-firmware alsa-tools-firmware.x86_64 -asciidoc -asciinema atmel-firmware -audit-libs-devel authselect autofs b43-openfwwf @@ -38,27 +12,14 @@ bfa-firmware bind-utils bzip2 ca-certificates -@c-development -clang-devel -cmake -container-selinux -cryptsetup-devel +crun cups cups-client cups-ipptool -@development-libs -@development-tools -dnf -docbook-dtds -docbook-style-xsl ebtables -elfutils-devel -f29-backgrounds-base -f29-backgrounds-gnome +emacs fedora-gpg-keys -fedora-packager fedora-release -fedpkg findutils firefox firewalld-filesystem @@ -66,31 +27,17 @@ flatpak @Fonts fwupd gawk -gcc -gcc-c++ GeoIP-GeoLite-data geolite2-city geolite2-country -gettext git -glib2-devel -glibc-static @GNOME gnome-initial-setup gnome-remote-desktop gnu-efi -gnu-efi-devel gnupg -gnutls-devel -gobject-introspection-devel -golang -gperf -gpgme-devel -gstreamer1-plugin-openh264 -gtk3-devel help2man iptables -iptables-devel iputils ipw2100-firmware ipw2200-firmware @@ -111,45 +58,16 @@ iwl6000g2a-firmware iwl6000g2b-firmware iwl6050-firmware iwl7260-firmware -java -keybase -kmod-devel -libacl-devel -libassuan-devel -libblkid-devel -libcap-devel -libcurl-devel libertas-sd8686-firmware libertas-sd8787-firmware libertas-usb8388-firmware -libgcrypt-devel -libgpg-error-devel -libidn2-devel -libmicrohttpd-devel -libmount-devel -libpng12 -libseccomp-devel -libselinux-devel -libvarlink-devel -libvarlink-util -libvirt-bash-completion -libvirt-client -libvirt-daemon-config-network -libvirt-daemon-kvm -libxkbcommon-devel -libxslt linux-firmware -lld lsof -lz4 -lz4-devel make man-db mc -meson midisport-firmware mosh -mozilla-openh264 nautilus net-tools NetworkManager @@ -166,36 +84,21 @@ nss-mdns nss-tools opensc openssh-server -ostree-devel -pam-devel -pam_yubico -perl-File-Slurp -pesign pigz -pkgconfig -procps-ng +podman psmisc -python3-devel -python3-future -python3-lxml -python3-wheel -qrencode-devel rpcbind rsync -crun screen -ruby -skopeo-containers -slirp4netns -systemd-devel -thunderbird +sssd-kcm tmux +toolbox tree usbutils vim-enhanced +virt-install virt-manager which xclip xz -xz-devel zd1211-firmware