From f160961d4c3717f9a205f8a1ed7995d2619a0b02 Mon Sep 17 00:00:00 2001 From: Joao Paulo Tavares Musico Date: Wed, 20 Apr 2022 00:15:53 +0000 Subject: [PATCH] Migrate tuned-config package to Debian Modified tuned-config package to add support to Debian packaging. Test Plan: PASS: built image successfully PASS: Installed image successfully (with tuned-config) PASS: build updated latest image (fresh env) PASS: check tuned service is loaded and active PASS: bootstrap and unlock successful PASS: check tuned service is loaded and active Story: 2009256 Task: 45109 Depends-On: https://review.opendev.org/c/starlingx/tools/+/838798 New change, adding updates from centos package from following review: https://review.opendev.org/c/starlingx/config-files/+/835665 Signed-off-by: Joao Paulo Tavares Musico Change-Id: I4447016bd5a9ff9b2518a7eb61ac4050e016184e --- debian_pkg_dirs | 1 + tuned-config/debian/deb_folder/LICENSE | 170 ++++++++++++++++++ tuned-config/debian/deb_folder/changelog | 5 + tuned-config/debian/deb_folder/control | 15 ++ tuned-config/debian/deb_folder/copyright | 26 +++ tuned-config/debian/deb_folder/postinst | 7 + tuned-config/debian/deb_folder/rules | 14 ++ tuned-config/debian/deb_folder/source/format | 1 + .../debian/deb_folder/tuned-config.dirs | 3 + .../debian/deb_folder/tuned-config.install | 5 + tuned-config/debian/meta_data.yaml | 7 + tuned-config/source-debian/recommend.conf | 1 + .../systemd/00-tuned-config.preset | 1 + .../source-debian/tuned-realtime.conf | 19 ++ .../source-debian/tuned-stx-override.conf | 2 + tuned-config/source-debian/tuned.conf | 29 +++ 16 files changed, 306 insertions(+) create mode 100644 tuned-config/debian/deb_folder/LICENSE create mode 100644 tuned-config/debian/deb_folder/changelog create mode 100644 tuned-config/debian/deb_folder/control create mode 100644 tuned-config/debian/deb_folder/copyright create mode 100644 tuned-config/debian/deb_folder/postinst create mode 100644 tuned-config/debian/deb_folder/rules create mode 100644 tuned-config/debian/deb_folder/source/format create mode 100644 tuned-config/debian/deb_folder/tuned-config.dirs create mode 100644 tuned-config/debian/deb_folder/tuned-config.install create mode 100644 tuned-config/debian/meta_data.yaml create mode 100644 tuned-config/source-debian/recommend.conf create mode 100644 tuned-config/source-debian/systemd/00-tuned-config.preset create mode 100644 tuned-config/source-debian/tuned-realtime.conf create mode 100644 tuned-config/source-debian/tuned-stx-override.conf create mode 100644 tuned-config/source-debian/tuned.conf diff --git a/debian_pkg_dirs b/debian_pkg_dirs index ad27836..e21e0dd 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -22,4 +22,5 @@ shadow-utils-config sudo-config syslog-ng-config systemd-config +tuned-config util-linux-config diff --git a/tuned-config/debian/deb_folder/LICENSE b/tuned-config/debian/deb_folder/LICENSE new file mode 100644 index 0000000..ea6547e --- /dev/null +++ b/tuned-config/debian/deb_folder/LICENSE @@ -0,0 +1,170 @@ + + 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. diff --git a/tuned-config/debian/deb_folder/changelog b/tuned-config/debian/deb_folder/changelog new file mode 100644 index 0000000..fa611bd --- /dev/null +++ b/tuned-config/debian/deb_folder/changelog @@ -0,0 +1,5 @@ +tuned-config (1.0-1) unstable; urgency=medium + + * Initial release. + + -- Joao Paulo Tavares Musico Tue, 12 Apr 2022 23:02:10 +0000 diff --git a/tuned-config/debian/deb_folder/control b/tuned-config/debian/deb_folder/control new file mode 100644 index 0000000..39b8da3 --- /dev/null +++ b/tuned-config/debian/deb_folder/control @@ -0,0 +1,15 @@ +Source: tuned-config +Section: admin +Priority: optional +Maintainer: StarlingX Developers +Build-Depends: debhelper-compat (= 13) +Standards-Version: 4.5.1 +Homepage: https://www.starlingx.io + +Package: tuned-config +Architecture: any +Depends: + ${misc:Depends}, + tuned +Description: StarlingX tuned configuration files + StarlingX configuration files of tuned to system folder. diff --git a/tuned-config/debian/deb_folder/copyright b/tuned-config/debian/deb_folder/copyright new file mode 100644 index 0000000..0946d1b --- /dev/null +++ b/tuned-config/debian/deb_folder/copyright @@ -0,0 +1,26 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: tuned-config +Source: https://opendev.org/starlingx/config-files +Files: * + +Copyright: (c) 2013-2022 Wind River Systems, Inc +License: Apache-2 +Files: debian/* + +Copyright: 2022 Wind River Systems, Inc +License: Apache-2 + + 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 + . + https://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. + . + On Debian-based systems the full text of the Apache version 2.0 license + can be found in `/usr/share/common-licenses/Apache-2.0'. diff --git a/tuned-config/debian/deb_folder/postinst b/tuned-config/debian/deb_folder/postinst new file mode 100644 index 0000000..d389825 --- /dev/null +++ b/tuned-config/debian/deb_folder/postinst @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +systemctl enable tuned.service > /dev/null 2>&1 ||: + +#DEBHELPER# diff --git a/tuned-config/debian/deb_folder/rules b/tuned-config/debian/deb_folder/rules new file mode 100644 index 0000000..9babf88 --- /dev/null +++ b/tuned-config/debian/deb_folder/rules @@ -0,0 +1,14 @@ +#!/usr/bin/make -f +#export DH_VERBOSE = 1 + +ROOT := $(CURDIR)/debian/tmp + +%: + dh $@ + +override_dh_install: + install -p -D -m 644 tuned-stx-override.conf ${ROOT}/etc/systemd/system/tuned.service.d/tuned-stx-override.conf + install -p -D -m 644 tuned.conf ${ROOT}/etc/tuned/starlingx/tuned.conf + install -p -D -m 644 tuned-realtime.conf ${ROOT}/etc/tuned/starlingx-realtime/tuned.conf + install -p -D -m 644 recommend.conf ${ROOT}/etc/tuned/recommend.conf + dh_install diff --git a/tuned-config/debian/deb_folder/source/format b/tuned-config/debian/deb_folder/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/tuned-config/debian/deb_folder/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/tuned-config/debian/deb_folder/tuned-config.dirs b/tuned-config/debian/deb_folder/tuned-config.dirs new file mode 100644 index 0000000..113d816 --- /dev/null +++ b/tuned-config/debian/deb_folder/tuned-config.dirs @@ -0,0 +1,3 @@ +etc/systemd/system/tuned.service.d +etc/tuned/starlingx +etc/tuned/starlingx-realtime diff --git a/tuned-config/debian/deb_folder/tuned-config.install b/tuned-config/debian/deb_folder/tuned-config.install new file mode 100644 index 0000000..38d1dc6 --- /dev/null +++ b/tuned-config/debian/deb_folder/tuned-config.install @@ -0,0 +1,5 @@ +etc/systemd/system/tuned.service.d/tuned-stx-override.conf +etc/tuned/recommend.conf +etc/tuned/starlingx/tuned.conf +etc/tuned/starlingx-realtime/tuned.conf +systemd/00-tuned-config.preset etc/systemd/system-preset diff --git a/tuned-config/debian/meta_data.yaml b/tuned-config/debian/meta_data.yaml new file mode 100644 index 0000000..01737fc --- /dev/null +++ b/tuned-config/debian/meta_data.yaml @@ -0,0 +1,7 @@ +--- +debname: tuned-config +debver: 1.0-1 +src_path: source-debian +revision: + dist: $STX_DIST + PKG_GITREVCOUNT: true diff --git a/tuned-config/source-debian/recommend.conf b/tuned-config/source-debian/recommend.conf new file mode 100644 index 0000000..86398e4 --- /dev/null +++ b/tuned-config/source-debian/recommend.conf @@ -0,0 +1 @@ +[starlingx] diff --git a/tuned-config/source-debian/systemd/00-tuned-config.preset b/tuned-config/source-debian/systemd/00-tuned-config.preset new file mode 100644 index 0000000..565652e --- /dev/null +++ b/tuned-config/source-debian/systemd/00-tuned-config.preset @@ -0,0 +1 @@ +enable tuned.service diff --git a/tuned-config/source-debian/tuned-realtime.conf b/tuned-config/source-debian/tuned-realtime.conf new file mode 100644 index 0000000..5bbbfbc --- /dev/null +++ b/tuned-config/source-debian/tuned-realtime.conf @@ -0,0 +1,19 @@ +# +# tuned configuration for StarlingX +# +# Local changes to this profile are not guaranteed to +# be preserved across upgrades. If you need to change +# these settings then either use another existing +# profile that has what you need or create your own. +# Also be mindful that puppet may change sysctl variables +# during host unlock. + +[main] +summary=StarlingX realtime tuned profile, mostly favors performance over power +include=starlingx + +[cpu] +governor=performance +force_latency=-1 +energy_perf_bias=performance +min_perf_pct=100 \ No newline at end of file diff --git a/tuned-config/source-debian/tuned-stx-override.conf b/tuned-config/source-debian/tuned-stx-override.conf new file mode 100644 index 0000000..0b9a6b4 --- /dev/null +++ b/tuned-config/source-debian/tuned-stx-override.conf @@ -0,0 +1,2 @@ +[Service] +UMask=0077 \ No newline at end of file diff --git a/tuned-config/source-debian/tuned.conf b/tuned-config/source-debian/tuned.conf new file mode 100644 index 0000000..4861f8e --- /dev/null +++ b/tuned-config/source-debian/tuned.conf @@ -0,0 +1,29 @@ +# +# tuned configuration for StarlingX +# +# Local changes to this profile are not guaranteed to +# be preserved across upgrades. If you need to change +# these settings then either use another existing +# profile that has what you need or create your own. +# Also be mindful that puppet may change sysctl variables +# during host unlock. + +[main] +summary=StarlingX tuned profile, mostly favors performance over power + +[cpu] +governor=performance +energy_perf_bias=normal + +[audio] +timeout=10 + +[video] +radeon_powersave=auto + +[disk] +# Comma separated list of devices, all devices if commented out. +# devices=sda + +[scsi_host] +alpm=medium_power