Merge remote-tracking branch 'origin/apertis/v2023dev3' into...

Merge remote-tracking branch 'origin/apertis/v2023dev3' into proposed-updates/debian/bookworm/2a3a155f

Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com>

debian/apertis/component

+non-free

debian/apertis/copyright

+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
+Files: *
+Copyright: no-info-found
+License: UNKNOWN
+
+Files: debian/*
+Copyright: 2015 Paolo Pisati <paolo.pisati@canonical.com>
+License: GPL-2+
+
+Files: debian/patches/*
+Copyright: or trademark notices from the Software. Licensee shall include
+License: GPL-2+
+
+Files: boot/bootcode.bin boot/start.elf boot/start4.elf boot/start4db.elf boot/start4x.elf boot/start_db.elf boot/start_x.elf boot/start.elf boot/start4.elf boot/start4db.elf boot/start4x.elf boot/start_db.elf boot/start_x.elf boot/start.elf boot/start4.elf boot/start4db.elf boot/start4x.elf boot/start_db.elf boot/start_x.elf boot/start.elf boot/start4.elf boot/start4db.elf boot/start4x.elf boot/start_db.elf boot/start_x.elf boot/start.elf boot/start4.elf boot/start4db.elf boot/start4x.elf boot/start_db.elf boot/start_x.elf boot/start.elf boot/start4.elf boot/start4db.elf boot/start4x.elf boot/start_db.elf boot/start_x.elf boot/start4cd.elf boot/start_cd.elf boot/start4cd.elf boot/start_cd.elf
+Copyright: 2006, Broadcom Corporation
+ 2015, Raspberry Pi (Trading) Ltd
+License: Proprietary_1
+ All rights reserved.
+ .
+ Redistribution.  Redistribution and use in binary form, without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ * This software may only be used for the purposes of developing for, 
+   running or using a Raspberry Pi device.
+ * Redistributions must reproduce the above copyright notice and the
+   following disclaimer in the documentation and/or other materials
+   provided with the distribution.
+ * Neither the name of Broadcom Corporation nor the names of its suppliers
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+ .
+ DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
+
+Files: brcm80211/*
+Copyright: 2015 Broadcom Corporation
+License: Proprietary_2
+ SOFTWARE LICENSE AGREEMENT
+ .
+ Unless you and Broadcom Corporation (“Broadcom”) execute a separate written
+ software license agreement governing use of the accompanying software, this
+ software is licensed to you under the terms of this Software License Agreement
+ (“Agreement”).
+ .
+ ANY USE, REPRODUCTION OR DISTRIBUTION OF THE SOFTWARE CONSTITUTES YOUR
+ ACCEPTANCE OF THIS AGREEMENT.
+ .
+ 1.  DEFINITIONS.
+ .
+ 1.1.  “Broadcom Product” means any of the proprietary integrated circuit
+ product(s) sold by Broadcom with which the Software was designed to be used, or
+ their successors.
+ .
+ 1.2.  “Licensee” means you or if you are accepting on behalf of an entity
+ then the entity and its affiliates exercising rights under, and complying with
+ all of the terms of this Agreement.
+ .
+ 1.3.  “Software” shall mean that software made available by Broadcom to
+ Licensee in binary code form with this Agreement.
+ .
+ 2.  LICENSE GRANT; OWNERSHIP
+ .
+ 2.1.  License Grants.  Subject to the terms and conditions of this Agreement,
+ Broadcom hereby grants to Licensee a non-exclusive, non-transferable,
+ royalty-free license (i) to use and integrate the Software in conjunction with
+ any other software; and (ii) to reproduce and distribute the Software complete,
+ unmodified and as provided by Broadcom, and only for use with a Broadcom
+ Product.
+ .
+ 2.2.  Restriction on Modification.  Licensee may not make any modifications
+ to the Software.
+ .
+ 2.3.  Restriction on Distribution.  Licensee shall only distribute the
+ Software under the terms of this Agreement and a copy of this Agreement
+ accompanies such distribution.
+ .
+ 2.4.  Proprietary Notices.  Licensee shall not remove, efface or obscure any
+ copyright or trademark notices from the Software.  Licensee shall include
+ reproductions of the Broadcom copyright notice with each copy of the Software,
+ except where such Software is embedded in a manner not readily accessible to
+ the end user.  Licensee acknowledges that any symbols, trademarks, tradenames,
+ and service marks adopted by Broadcom to identify the Software belong to
+ Broadcom and that Licensee shall have no rights therein.
+ .
+ 2.5.  Ownership.  Broadcom shall retain all right, title and interest,
+ including all intellectual property rights, in and to the Software.  Licensee
+ hereby covenants that it will not assert any claim that the Software created by
+ or for Broadcom infringe any intellectual property right owned or controlled by
+ Licensee; provided however, the foregoing shall not apply in case the Agreement
+ is terminated.
+ .
+ 2.6.  No Other Rights Granted; Restrictions.  Apart from the license rights
+ expressly set forth in this Agreement, Broadcom does not grant and Licensee
+ does not receive any ownership right, title or interest nor any security
+ interest or other interest in any intellectual property rights relating to the
+ Software, nor in any copy of any part of the foregoing.  No license is granted
+ to Licensee in any human readable code of the Software (source code). Licensee
+ shall not (i) use, license, sell or otherwise distribute the Software except as
+ provided in this Agreement, (ii) attempt to modify in any way, reverse
+ engineer, decompile or disassemble any portion of the Software; or (iii) use
+ the Software or other material in violation of any applicable law or
+ regulation, including but not limited to any regulatory agency, such as FCC,
+ rules.
+ .
+ 3.  NO WARRANTY OR SUPPORT
+ .
+ 3.1.  No Warranty. THE SOFTWARE IS OFFERED “AS IS,” AND BROADCOM GRANTS AND
+ LICENSEE RECEIVES NO WARRANTIES OF ANY KIND, EXPRESS OR IMPLIED, BY STATUTE,
+ COMMUNICATION OR CONDUCT WITH LICENSEE, OR OTHERWISE.  BROADCOM SPECIFICALLY
+ DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A SPECIFIC
+ PURPOSE OR NONINFRINGEMENT CONCERNING THE SOFTWARE OR ANY UPGRADES TO OR
+ DOCUMENTATION FOR THE SOFTWARE.  WITHOUT LIMITATION OF THE ABOVE, BROADCOM
+ GRANTS NO WARRANTY THAT THE SOFTWARE IS ERROR-FREE OR WILL OPERATE WITHOUT
+ INTERRUPTION, AND GRANTS NO WARRANTY REGARDING ITS USE OR THE RESULTS THEREFROM
+ INCLUDING, WITHOUT LIMITATION, ITS CORRECTNESS, ACCURACY OR RELIABILITY.
+ .
+ 3.2.  No Support.  Nothing in this agreement shall obligate Broadcom to
+ provide any support for the Software. Broadcom may, but shall be under no
+ obligation to, correct any defects in the Software and/or provide updates to
+ licensees of the Software.  Licensee shall make reasonable efforts to promptly
+ report to Broadcom any defects it finds in the Software, as an aid to creating
+ improved revisions of the Software.
+ .
+ 3.3.  Dangerous Applications.  The Software is not designed, intended, or
+ certified for use in components of systems intended for the operation of
+ weapons, weapons systems, nuclear installations, means of mass transportation,
+ aviation, life-support computers or equipment (including resuscitation
+ equipment and surgical implants), pollution control, hazardous substances
+ management, or for any other dangerous application in which the failure of the
+ Software could create a situation where personal injury or death may occur. 
+ Licensee understands that use of the Software in such applications is fully at
+ the risk of Licensee.
+ .
+ 4.  TERM AND TERMINATION
+ .
+ 4.1.  Termination.  This Agreement will automatically terminate if Licensee
+ fails to comply with any of the terms and conditions hereof. In such event,
+ Licensee must destroy all copies of the Software and all of its component
+ parts.
+ .
+ 4.2.  Effect Of Termination.  Upon any termination of this Agreement, the
+ rights and licenses granted to Licensee under this Agreement shall immediately
+ terminate.
+ .
+ 4.3.  Survival.  The rights and obligations under this Agreement which by
+ their nature should survive termination will remain in effect after expiration
+ or termination of this Agreement.
+ .
+ 5.  CONFIDENTIALITY
+ .
+ 5.1.  Obligations.  Licensee acknowledges and agrees that any documentation
+ relating to the Software, and any other information (if such other information
+ is identified as confidential or should be recognized as confidential under the
+ circumstances) provided to Licensee by Broadcom hereunder (collectively,
+ “Confidential Information”) constitute the confidential and proprietary
+ information of Broadcom, and that Licensee’s protection thereof is an essential
+ condition to Licensee’s use and possession of the Software.  Licensee shall
+ retain all Confidential Information in strict confidence and not disclose it to
+ any third party or use it in any way except under a written agreement with
+ terms and conditions at least as protective as the terms of this Section.
+ Licensee will exercise at least the same amount of diligence in preserving the
+ secrecy of the Confidential Information as it uses in preserving the secrecy of
+ its own most valuable confidential information, but in no event less than
+ reasonable diligence.  Information shall not be considered Confidential
+ Information if and to the extent that it: (i) was in the public domain at the
+ time it was disclosed or has entered the public domain through no fault of
+ Licensee; (ii) was known to Licensee, without restriction, at the time of
+ disclosure as proven by the files of Licensee in existence at the time of
+ disclosure; or (iii) becomes known to Licensee, without restriction, from a
+ source other than Broadcom without breach of this Agreement by Licensee and
+ otherwise not in violation of Broadcom’s rights.
+ .
+ 5.2.  Return of Confidential Information.  Notwithstanding the foregoing, all
+ documents and other tangible objects containing or representing Broadcom
+ Confidential Information and all copies thereof which are in the possession of
+ Licensee shall be and remain the property of Broadcom, and shall be promptly
+ returned to Broadcom upon written request by Broadcom or upon termination of
+ this Agreement.
+ .
+ 6.  LIMITATION OF LIABILITY TO THE MAXIMUM EXTENT PERMITTED BY LAW, IN NO
+ EVENT SHALL BROADCOM OR ANY OF BROADCOM’S LICENSORS HAVE ANY LIABILITY FOR ANY
+ INDIRECT, INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES, HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER FOR BREACH OF CONTRACT, TORT (INCLUDING
+ NEGLIGENCE) OR OTHERWISE, ARISING OUT OF THIS AGREEMENT, INCLUDING BUT NOT
+ LIMITED TO LOSS OF PROFITS, EVEN IF SUCH PARTY HAS BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGES. IN NO EVENT WILL BROADCOM’S LIABILITY WHETHER IN
+ CONTRACT, TORT (INCLUDING NEGLIGENCE), OR OTHERWISE, EXCEED THE AMOUNT PAID BY
+ LICENSEE FOR SOFTWARE UNDER THIS AGREEMENT.  THESE LIMITATIONS SHALL APPLY
+ NOTWITHSTANDING ANY FAILURE OF ESSENTIAL PURPOSE OF ANY LIMITED REMEDY.
+ .
+ 7.  MISCELLANEOUS
+ .
+ 7.1.  Export Regulations. YOU UNDERSTAND AND AGREE THAT THE SOFTWARE IS
+ SUBJECT TO UNITED STATES AND OTHER APPLICABLE EXPORT-RELATED LAWS AND
+ REGULATIONS AND THAT YOU MAY NOT EXPORT, RE-EXPORT OR TRANSFER THE SOFTWARE OR
+ ANY DIRECT PRODUCT OF THE SOFTWARE EXCEPT AS PERMITTED UNDER THOSE LAWS.
+ WITHOUT LIMITING THE FOREGOING, EXPORT, RE-EXPORT OR TRANSFER OF THE SOFTWARE
+ TO CUBA, IRAN, NORTH KOREA, SUDAN AND SYRIA IS PROHIBITED.
+ .
+ 7.2  Assignment. This Agreement shall be binding upon and inure to the
+ benefit of the parties and their respective successors and assigns, provided,
+ however that Licensee may not assign this Agreement or any rights or obligation
+ hereunder, directly or indirectly, by operation of law or otherwise, without
+ the prior written consent of Broadcom, and any such attempted assignment shall
+ be void.  Notwithstanding the foregoing, Licensee may assign this Agreement to
+ a successor to all or substantially all of its business or assets to which this
+ Agreement relates that is not a competitor of Broadcom.
+ .
+ 7.3.  Governing Law; Venue.  This Agreement shall be governed by the laws of
+ California without regard to any conflict-of-laws rules, and the United Nations
+ Convention on Contracts for the International Sale of Goods is hereby excluded.
+ The sole jurisdiction and venue for actions related to the subject matter
+ hereof shall be the state and federal courts located in the County of Orange,
+ California, and both parties hereby consent to such jurisdiction and venue.
+ .
+ 7.4.  Severability.  All terms and provisions of this Agreement shall, if
+ possible, be construed in a manner which makes them valid, but in the event any
+ term or provision of this Agreement is found by a court of competent
+ jurisdiction to be illegal or unenforceable, the validity or enforceability of
+ the remainder of this Agreement shall not be affected if the illegal or
+ unenforceable provision does not materially affect the intent of this
+ Agreement.  If the illegal or unenforceable provision materially affects the
+ intent of the parties to this Agreement, this Agreement shall become
+ terminated.
+ .
+ 7.5.  Equitable Relief.  Licensee hereby acknowledges that its breach of this
+ Agreement would cause irreparable harm and significant injury to Broadcom that
+ may be difficult to ascertain and that a remedy at law would be inadequate.
+ Accordingly, Licensee agrees that Broadcom shall have the right to seek and
+ obtain immediate injunctive relief to enforce obligations under the Agreement
+ in addition to any other rights and remedies it may have.
+ .
+ 7.6.  Waiver.  The waiver of, or failure to enforce, any breach or default
+ hereunder shall not constitute the waiver of any other or subsequent breach or
+ default.
+ .
+ 7.7.  Entire Agreement.  This Agreement sets forth the entire Agreement
+ between the parties and supersedes any and all prior proposals, agreements and
+ representations between them, whether written or oral concerning the Software.
+ This Agreement may be changed only by mutual agreement of the parties in
+ writing.

debian/changelog

@@ -49,6 +49,15 @@ raspi-firmware (1.20210805+ds-1) unstable; urgency=medium
 
  -- Gunnar Wolf <gwolf@debian.org>  Fri, 27 Aug 2021 09:53:57 -0500
 
+raspi-firmware (1.20210303+ds-2+apertis1) apertis; urgency=medium
+
+  * Sync updates from Debian Bullseye
+  * Remaining Apertis changes:
+    * Disable post-install/remove scripts for kernel and initramfs
+    * Remove `dosfstools` dependency
+
+ -- Apertis CI <devel@lists.apertis.org>  Thu, 29 Jul 2021 13:05:04 +0000
+
 raspi-firmware (1.20210303+ds-2) unstable; urgency=medium
 
   * Add a header to config.txt warning users it's an autogenerated file
@@ -61,6 +70,17 @@ raspi-firmware (1.20210303+ds-2) unstable; urgency=medium
 
  -- Gunnar Wolf <gwolf@debian.org>  Wed, 21 Apr 2021 00:52:21 -0500
 
+raspi-firmware (1.20210303+ds-1apertis1) apertis; urgency=medium
+
+  * Remaining Apertis changes:
+    * debian/apertis/component: Set to non-free
+    * Disable post-install/remove scripts for kernel and initramfs
+    * Remove `dosfstools` dependency
+  * debian/apertis/gitlab-ci.yml: Drop since we use an external definition
+  * Refresh the automatically detected licensing information
+
+ -- Denis Pynkin <denis.pynkin@collabora.com>  Thu, 29 Apr 2021 00:38:06 +0300
+
 raspi-firmware (1.20210303+ds-1) unstable; urgency=medium
 
   * New upstream release

debian/control

@@ -23,7 +23,7 @@ Description: transitional package
 Package: raspi-firmware
 Architecture: all
 Pre-Depends: dpkg (>= 1.17.14)
-Depends: ${shlibs:Depends}, ${misc:Depends}, dosfstools
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: linux-firmware-raspi3 (<< 1.20161123-2), raspi3-firmware (<< 1.20190718-1~)
 Replaces: linux-firmware-raspi3 (<< 1.20161123-2), raspi3-firmware (<< 1.20190718-1~)
 Description: Raspberry Pi family GPU firmware and bootloaders

debian/raspi-firmware.install

@@ -2,7 +2,3 @@ boot/* usr/lib/raspi-firmware
 brcm80211/brcmfmac43430-sdio.txt lib/firmware/brcm
 brcm80211/brcmfmac43455-sdio.txt lib/firmware/brcm
 brcm80211/brcmfmac43456-sdio.txt lib/firmware/brcm
-debian/kernel etc
-debian/default etc
-debian/initramfs etc
-debian/initramfs-tools usr/share

debian/raspi-firmware.maintscript

 rm_conffile /etc/kernel/postinst.d/linux-firmware-raspi3 1.20161123-2
 
 # raspi3-firmware package was renamed to raspi-firmware at 1.20190718-1
-mv_conffile /etc/kernel/postrm.d/50raspi3-firmware         /etc/kernel/postrm.d/z50-raspi-firmware          1.20190718-1~
-mv_conffile /etc/kernel/postinst.d/50raspi3-firmware       /etc/kernel/postinst.d/z50-raspi-firmware        1.20190718-1~
-mv_conffile /etc/initramfs/post-update.d/50raspi3-firmware /etc/initramfs/post-update.d/z50-raspi-firmware  1.20190718-1~
+#mv_conffile /etc/kernel/postrm.d/50raspi3-firmware         /etc/kernel/postrm.d/z50-raspi-firmware          1.20190718-1~
+#mv_conffile /etc/kernel/postinst.d/50raspi3-firmware       /etc/kernel/postinst.d/z50-raspi-firmware        1.20190718-1~
+#mv_conffile /etc/initramfs/post-update.d/50raspi3-firmware /etc/initramfs/post-update.d/z50-raspi-firmware  1.20190718-1~
 
-mv_conffile /etc/kernel/postrm.d/z50-raspi3-firmware         /etc/kernel/postrm.d/z50-raspi-firmware
-mv_conffile /etc/kernel/postinst.d/z50-raspi3-firmware       /etc/kernel/postinst.d/z50-raspi-firmware
-mv_conffile /etc/initramfs/post-update.d/z50-raspi3-firmware /etc/initramfs/post-update.d/z50-raspi-firmware
+#mv_conffile /etc/kernel/postrm.d/z50-raspi3-firmware         /etc/kernel/postrm.d/z50-raspi-firmware
+#mv_conffile /etc/kernel/postinst.d/z50-raspi3-firmware       /etc/kernel/postinst.d/z50-raspi-firmware
+#mv_conffile /etc/initramfs/post-update.d/z50-raspi3-firmware /etc/initramfs/post-update.d/z50-raspi-firmware
 

debian/raspi-firmware.postinst

@@ -30,7 +30,7 @@ case "$1" in
     # Manually trigger the kernel postinst hook when raspi-firmware is first
     # installed (or upgraded), as the kernel package might already be installed
     # (or not upgraded) and hence the hook would not get triggered otherwise.
-    DEB_MAINT_PARAMS="configure" /etc/kernel/postinst.d/z50-raspi-firmware
+    # DEB_MAINT_PARAMS="configure" /etc/kernel/postinst.d/z50-raspi-firmware
     ;;
 esac