From d6e0e22496a9f664df597120777d7e6e84f7dbe8 Mon Sep 17 00:00:00 2001 From: Bin Qian Date: Tue, 19 Jul 2022 14:28:46 +0000 Subject: [PATCH] Include upgrades meta files to Debian ISO Add upgrades meta files to /upgrades directory in Debian ISO. Files include: version Version file to indicate the ISO release version metadata.xml Supportted upgrade path, and required patch import.sh Shell script to import the ISO load into StarlingX system pxeboot-update-.sh Shell script to update pxeboot config file for new release Test cases: Build Debian ISO and visually inspect the existance of files list above in /upgrades directory of Debian ISO. Build Centos ISO with no changes. Story: 2009303 Task: 45830 Change-Id: I1f0b42c6c37943b19bdf5dd7baaf81da5d1eef7a Signed-off-by: Bin Qian --- bsp-files/upgrades/LICENSE | 202 ++++++++++++++++++ bsp-files/upgrades/PKG-INFO | 12 ++ .../upgrades/debian/deb_folder/changelog | 6 + bsp-files/upgrades/debian/deb_folder/control | 15 ++ .../upgrades/debian/deb_folder/copyright | 41 ++++ .../deb_folder/platform-upgrades.install | 2 + bsp-files/upgrades/debian/deb_folder/rules | 15 ++ .../upgrades/debian/deb_folder/source/format | 2 + bsp-files/upgrades/debian/meta_data.yaml | 7 + bsp-files/upgrades/metadata.xml | 3 +- debian_iso_image.inc | 2 + debian_pkg_dirs | 1 + .../debian/deb_folder/rules | 1 + 13 files changed, 307 insertions(+), 2 deletions(-) create mode 100644 bsp-files/upgrades/LICENSE create mode 100644 bsp-files/upgrades/PKG-INFO create mode 100644 bsp-files/upgrades/debian/deb_folder/changelog create mode 100644 bsp-files/upgrades/debian/deb_folder/control create mode 100755 bsp-files/upgrades/debian/deb_folder/copyright create mode 100644 bsp-files/upgrades/debian/deb_folder/platform-upgrades.install create mode 100644 bsp-files/upgrades/debian/deb_folder/rules create mode 100644 bsp-files/upgrades/debian/deb_folder/source/format create mode 100644 bsp-files/upgrades/debian/meta_data.yaml create mode 100644 debian_iso_image.inc diff --git a/bsp-files/upgrades/LICENSE b/bsp-files/upgrades/LICENSE new file mode 100644 index 00000000..d6456956 --- /dev/null +++ b/bsp-files/upgrades/LICENSE @@ -0,0 +1,202 @@ + + 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/bsp-files/upgrades/PKG-INFO b/bsp-files/upgrades/PKG-INFO new file mode 100644 index 00000000..e1a360ab --- /dev/null +++ b/bsp-files/upgrades/PKG-INFO @@ -0,0 +1,12 @@ +Metadata-Version: 1.1 +Name: platform-upgrades +Version: 1.0 +Summary: StarlingX upgrades Package +Home-page: +Author: Windriver +Author-email: info@windriver.com +License: Apache-2.0 + +Description: Platform upgrades package + +Platform: UNKNOWN diff --git a/bsp-files/upgrades/debian/deb_folder/changelog b/bsp-files/upgrades/debian/deb_folder/changelog new file mode 100644 index 00000000..0065a3fe --- /dev/null +++ b/bsp-files/upgrades/debian/deb_folder/changelog @@ -0,0 +1,6 @@ +platform-upgrades (1.0-1) unstable; urgency=medium + + * Initial release. + + -- Bin Qian Mon, 18 Jul 2022 16:18:12 +0000 + diff --git a/bsp-files/upgrades/debian/deb_folder/control b/bsp-files/upgrades/debian/deb_folder/control new file mode 100644 index 00000000..b356791a --- /dev/null +++ b/bsp-files/upgrades/debian/deb_folder/control @@ -0,0 +1,15 @@ +Source: platform-upgrades +Section: admin +Priority: optional +Maintainer: StarlingX Developers +Build-Depends: debhelper-compat (= 13), + expect, +Standards-Version: 4.5.1 +Homepage: https://www.starlingx.io + +Package: platform-upgrades +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: StarlingX Platform Upgrades Package + The StarlingX platform upgrades package contains upgrade metadata files and utility scripts. + diff --git a/bsp-files/upgrades/debian/deb_folder/copyright b/bsp-files/upgrades/debian/deb_folder/copyright new file mode 100755 index 00000000..e224239d --- /dev/null +++ b/bsp-files/upgrades/debian/deb_folder/copyright @@ -0,0 +1,41 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: platform-upgrades +Source: https://opendev.org/starlingx/metal + +Files: * +Copyright: (c) 2013-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'. + +# If you want to use GPL v2 or later for the /debian/* files use +# the following clauses, or change it to suit. Delete these two lines +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/bsp-files/upgrades/debian/deb_folder/platform-upgrades.install b/bsp-files/upgrades/debian/deb_folder/platform-upgrades.install new file mode 100644 index 00000000..48121166 --- /dev/null +++ b/bsp-files/upgrades/debian/deb_folder/platform-upgrades.install @@ -0,0 +1,2 @@ +opt/upgrades/* + diff --git a/bsp-files/upgrades/debian/deb_folder/rules b/bsp-files/upgrades/debian/deb_folder/rules new file mode 100644 index 00000000..80ff8423 --- /dev/null +++ b/bsp-files/upgrades/debian/deb_folder/rules @@ -0,0 +1,15 @@ +#!/usr/bin/make -f + +# export DH_VERBOSE = 1 +export ROOT=$(CURDIR)/debian/tmp + +%: + dh $@ + +override_dh_install: + install -v -d -m 755 $(ROOT)/opt/upgrades + + install -p -D -m 700 import.sh $(ROOT)/opt/upgrades/import.sh + install -p -D -m 600 metadata.xml $(ROOT)/opt/upgrades/metadata.xml + + dh_install diff --git a/bsp-files/upgrades/debian/deb_folder/source/format b/bsp-files/upgrades/debian/deb_folder/source/format new file mode 100644 index 00000000..c3d9f240 --- /dev/null +++ b/bsp-files/upgrades/debian/deb_folder/source/format @@ -0,0 +1,2 @@ +3.0 (quilt) + diff --git a/bsp-files/upgrades/debian/meta_data.yaml b/bsp-files/upgrades/debian/meta_data.yaml new file mode 100644 index 00000000..b9848978 --- /dev/null +++ b/bsp-files/upgrades/debian/meta_data.yaml @@ -0,0 +1,7 @@ +--- +debname: platform-upgrades +debver: 1.0 +src_path: . +revision: + dist: $STX_DIST + PKG_GITREVCOUNT: true diff --git a/bsp-files/upgrades/metadata.xml b/bsp-files/upgrades/metadata.xml index b4d57c39..99a0b455 100644 --- a/bsp-files/upgrades/metadata.xml +++ b/bsp-files/upgrades/metadata.xml @@ -3,8 +3,7 @@ xxxSW_VERSIONxxx - 22.06 diff --git a/debian_iso_image.inc b/debian_iso_image.inc new file mode 100644 index 00000000..382e66a6 --- /dev/null +++ b/debian_iso_image.inc @@ -0,0 +1,2 @@ +# platform-upgrades +platform-upgrades diff --git a/debian_pkg_dirs b/debian_pkg_dirs index b8d6cd07..50183889 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -5,3 +5,4 @@ mtce-common mtce-compute mtce-control mtce-storage +bsp-files/upgrades diff --git a/installer/pxe-network-installer/debian/deb_folder/rules b/installer/pxe-network-installer/debian/deb_folder/rules index 776cdf26..3e4345ac 100644 --- a/installer/pxe-network-installer/debian/deb_folder/rules +++ b/installer/pxe-network-installer/debian/deb_folder/rules @@ -28,6 +28,7 @@ override_dh_install: install -p -D -m 644 pxeboot.cfg.debian $(ROOT)/var/pxeboot/pxelinux.cfg.files/pxeboot.cfg.debian install -p -D -m 644 efi-pxeboot.cfg.debian $(ROOT)/var/pxeboot/pxelinux.cfg.files/efi-pxeboot.cfg.debian install -p -D -m 755 pxeboot_setup.sh $(ROOT)/usr/sbin/pxeboot_setup.sh + install -p -D -m 755 pxeboot-update.sh %{ROOT}/usr/sbin/pxeboot-update-%{platform_release}.sh # Legacy BIOS System Node Install grub menus install -p -D -m 700 debian-pxe-controller-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/pxe-controller-install-${platform_release}