starlingx
/
integ
Code Issues Proposed changes

ostree: fix several building issues 

dh clean
make: dh: No such file or directory
make: *** [debian/rules:4: clean] Error 127

And clean up the Lintian issues, also update
the debian_pkg_dirs

Test Plan: verify initramfs

Pass: successfully build initramfs
Pass: successfully boot using initramfs

Story: 2009221
Task: 43324

Signed-off-by: Yue Tao <yue.tao@windriver.com>
Change-Id: Ifc5fa4e0d5f7273df2e6b0859bc7b3babbb0cf6e
This commit is contained in:
Yue Tao 2021-11-18 08:54:07 +08:00
parent 8834ecfadc
commit 1ba047c50b
10 changed files with 647 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian_pkg_dirs
View File

@ -45,6 +45,10 @@ kubernetes/runc
ldap/ldapscripts
ldap/openldap
networking/lldpd
ostree/initramfs-ostree
ostree/mttyexec
ostree/ostree
ostree/ostree-upgrade-mgr
security/keyrings.alt
security/python-keyring
storage-drivers/trident-installer

59
ostree/initramfs-ostree/debian/deb_patches/0001-Cleanup-package-depends-lists.patch Normal file
View File

@ -0,0 +1,59 @@
From 682c71d565d626eac52457f870595e0bb356d4ae Mon Sep 17 00:00:00 2001
From: Yue Tao <yue.tao@windriver.com>
Date: Fri, 19 Nov 2021 04:15:16 +0000
Subject: [PATCH] Cleanup package depends lists
to fix build issue:
dh clean
make: dh: No such file or directory
make: *** [debian/rules:4: clean] Error 127
And remove the dependence of essential packages of
coreutils and util-linux to fix Lintian issues:
E: initramfs-ostree source: build-depends-on-essential-package-without-using-version
Build-Depends: coreutils
E: initramfs-ostree: depends-on-essential-package-without-using-version
Depends: util-linux
Signed-off-by: Yue Tao <yue.tao@windriver.com>
---
debian/compat | 1 -
debian/control | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
delete mode 100644 debian/compat
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 82388cc..b003f99 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: initramfs-ostree
Section: utils
Priority: optional
Maintainer: root <root@3b917021b2df>
-Build-Depends: coreutils
+Build-Depends: debhelper-compat (= 13)
Standards-Version: 4.5.1
Homepage: https://github.com/WindRiver-Labs/wr-ostree
#Vcs-Browser: https://salsa.debian.org/debian/initramfs-ostree
@@ -11,7 +11,7 @@ Rules-Requires-Root: no
Package: initramfs-ostree
Architecture: all
-Depends: util-linux, gdisk, e2fsprogs, ${misc:Depends}
+Depends: gdisk, e2fsprogs, ${misc:Depends}, ${shlibs:Depends}
Multi-Arch: foreign
Description: Basic init for initramfs to mount ostree and pivot root
Basic init for initramfs to mount ostree and pivot root
--
2.25.1

167
ostree/initramfs-ostree/debian/deb_patches/0002-Update-Copyright-and-License.patch Normal file
View File

@ -0,0 +1,167 @@
From 052e435c58380c545096682113d3b92d1a2f49e0 Mon Sep 17 00:00:00 2001
From: Yue Tao <yue.tao@windriver.com>
Date: Fri, 19 Nov 2021 05:48:29 +0000
Subject: [PATCH 2/2] Update Copyright and License
Signed-off-by: Yue Tao <yue.tao@windriver.com>
---
debian/changelog | 4 ++--
debian/control | 26 ++++++++++++++++------
debian/copyright | 56 ++++++++++++++++++------------------------------
debian/rules | 19 +++++++++++++++-
4 files changed, 61 insertions(+), 44 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d5ff10f..f3582d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
initramfs-ostree (1.0-1) unstable; urgency=medium
- * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
+ * Initial release
- -- root <root@3b917021b2df> Wed, 07 Apr 2021 07:12:55 +0000
+ -- <> Wed, 07 Apr 2021 07:12:55 +0000
diff --git a/debian/control b/debian/control
index b003f99..002f25a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,31 @@
+# Copyright (c) 2021 Wind River Systems, Inc.
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. The ASF licenses this
+# file to you 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.
+
Source: initramfs-ostree
Section: utils
Priority: optional
-Maintainer: root <root@3b917021b2df>
+Maintainer: Hongxu Jia <hongxu.jia@windriver.com>
Build-Depends: debhelper-compat (= 13)
Standards-Version: 4.5.1
-Homepage: https://github.com/WindRiver-Labs/wr-ostree
-#Vcs-Browser: https://salsa.debian.org/debian/initramfs-ostree
-#Vcs-Git: https://salsa.debian.org/debian/initramfs-ostree.git
-Rules-Requires-Root: no
+Homepage: https://github.com/WindRiver-Labs/meta-lat
Package: initramfs-ostree
Architecture: all
Depends: gdisk, e2fsprogs, ${misc:Depends}, ${shlibs:Depends}
Multi-Arch: foreign
-Description: Basic init for initramfs to mount ostree and pivot root
+Description: Init for initramfs to mount ostree
Basic init for initramfs to mount ostree and pivot root
diff --git a/debian/copyright b/debian/copyright
index b5d3c86..65e5cf7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,43 +1,29 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: initramfs-ostree
-Upstream-Contact: <preferred name and address to reach the upstream project>
-Source: <url://example.com>
+Upstream-Contact: Hongxu Jia <hongxu.jia@windriver.com>
+Source: https://github.com/Wind-River/meta-lat
Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
+Copyright: Copyright (c) 2021 Wind River
+License: MIT-License
-# 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: 2021 root <root@3b917021b2df>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+License: MIT-License
+ Copyright (c) 2021 Wind River
.
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
.
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid picking licenses with terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
-#
-# If you need, there are some extra license texts available in two places:
-# /usr/share/debhelper/dh_make/licenses/
-# /usr/share/common-licenses/
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff --git a/debian/rules b/debian/rules
index 4b64bd3..305e70d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,22 @@
#!/usr/bin/make -f
-
+#
+# Copyright (c) 2021 Wind River Systems, Inc.
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. The ASF licenses this
+# file to you 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.
+#
%:
dh $@
--
2.30.2

2
ostree/initramfs-ostree/debian/deb_patches/series Normal file
View File

@ -0,0 +1,2 @@
0001-Cleanup-package-depends-lists.patch
0002-Update-Copyright-and-License.patch

49
ostree/mttyexec/debian/deb_patches/0001-Cleanup-package-depends-lists.patch Normal file
View File

@ -0,0 +1,49 @@
From 84dcdb4d15e533c335486df9ea15459c07019fc0 Mon Sep 17 00:00:00 2001
From: Yue Tao <yue.tao@windriver.com>
Date: Fri, 19 Nov 2021 03:59:08 +0000
Subject: [PATCH] Cleanup package depends lists
to fix build issue:
dh clean
make: dh: No such file or directory
make: *** [debian/rules:4: clean] Error 127
Signed-off-by: Yue Tao <yue.tao@windriver.com>
---
debian/compat | 1 -
debian/control | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
delete mode 100644 debian/compat
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 169d4a4..39f991a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: admin
Priority: optional
Maintainer: root <root@3b917021b2df>
Standards-Version: 4.5.1
+Build-Depends: debhelper-compat (= 13)
Homepage: https://github.com/WindRiver-Labs/wr-ostree
#Vcs-Browser: https://salsa.debian.org/debian/mttyexec
#Vcs-Git: https://salsa.debian.org/debian/mttyexec.git
@@ -10,7 +11,7 @@ Rules-Requires-Root: no
Package: mttyexec
Architecture: any
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Multi-Arch: foreign
Description: Multiplex serial ports and tty devices
Service funtion to multiplex one or more serial ports and
--
2.25.1

160
ostree/mttyexec/debian/deb_patches/0002-Update-Copyright-and-License.patch Normal file
View File

@ -0,0 +1,160 @@
From 1c0a29dab1f81bdcdeee7ee24a5415f95e39a1cd Mon Sep 17 00:00:00 2001
From: Yue Tao <yue.tao@windriver.com>
Date: Fri, 19 Nov 2021 04:38:51 +0000
Subject: [PATCH] Update Copyright and License
Signed-off-by: Yue Tao <yue.tao@windriver.com>
---
debian/changelog | 4 ++--
debian/control | 24 ++++++++++++++++-----
debian/copyright | 56 ++++++++++++++++++------------------------------
debian/rules | 17 +++++++++++++++
4 files changed, 59 insertions(+), 42 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8853129..7b188ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
mttyexec (0.1-1) unstable; urgency=medium
- * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
+ * Initial release
- -- root <root@3b917021b2df> Wed, 07 Apr 2021 06:51:07 +0000
+ -- <> Wed, 07 Apr 2021 06:51:07 +0000
diff --git a/debian/control b/debian/control
index 29b27bc..9f27a4e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,27 @@
+# Copyright (c) 2021 Wind River Systems, Inc.
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. The ASF licenses this
+# file to you 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.
+
Source: mttyexec
Section: admin
Priority: optional
-Maintainer: root <root@3b917021b2df>
+Maintainer: Hongxu Jia <hongxu.jia@windriver.com>
Standards-Version: 4.5.1
Build-Depends: debhelper-compat (= 13)
-Homepage: https://github.com/WindRiver-Labs/wr-ostree
-#Vcs-Browser: https://salsa.debian.org/debian/mttyexec
-#Vcs-Git: https://salsa.debian.org/debian/mttyexec.git
-Rules-Requires-Root: no
+Homepage: https://github.com/WindRiver-Labs/meta-lat
Package: mttyexec
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index bfb9db1..c08f477 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,43 +1,29 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: mttyexec
-Upstream-Contact: <preferred name and address to reach the upstream project>
-Source: <url://example.com>
+Upstream-Contact: Hongxu Jia <hongxu.jia@windriver.com>
+Source: https://github.com/Wind-River/meta-lat
Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
+Copyright: Copyright (c) 2021 Wind River
+License: MIT-License
-# 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: 2021 root <root@3b917021b2df>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+License: MIT-License
+ Copyright (c) 2021 Wind River
.
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
.
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid picking licenses with terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
-#
-# If you need, there are some extra license texts available in two places:
-# /usr/share/debhelper/dh_make/licenses/
-# /usr/share/common-licenses/
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff --git a/debian/rules b/debian/rules
index 3bc6ead..c6441d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,21 @@
#!/usr/bin/make -f
+#
+# Copyright (c) 2021 Wind River Systems, Inc.
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. The ASF licenses this
+# file to you 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.
%:
dh $@
--
2.30.2

2
ostree/mttyexec/debian/deb_patches/series Normal file
View File

@ -0,0 +1,2 @@
0001-Cleanup-package-depends-lists.patch
0002-Update-Copyright-and-License.patch

57
ostree/ostree-upgrade-mgr/debian/deb_patches/0001-Cleanup-package-depends-lists.patch Normal file
View File

@ -0,0 +1,57 @@
From 414d8dab9fa53230b650d06becfbf31f58f634d9 Mon Sep 17 00:00:00 2001
From: Yue Tao <yue.tao@windriver.com>
Date: Fri, 19 Nov 2021 06:28:36 +0000
Subject: [PATCH] Cleanup package depends lists
to fix build issue:
dh clean
make: dh: No such file or directory
make: *** [debian/rules:4: clean] Error 127
And remove the dependence of essential packages of
util-linux to fix Lintian issues:
E: initramfs-ostree: depends-on-essential-package-without-using-version
Depends: util-linux
Signed-off-by: Yue Tao <yue.tao@windriver.com>
---
debian/compat | 1 -
debian/control | 5 +++--
2 files changed, 3 insertions(+), 3 deletions(-)
delete mode 100644 debian/compat
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index adcf621..9bb4f7f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,16 @@ Priority: optional
Maintainer: root <root@3b917021b2df>
Standards-Version: 4.5.1
Homepage: https://github.com/WindRiver-Labs/wr-ostree
+Build-Depends: debhelper-compat (= 13)
Rules-Requires-Root: no
Package: ostree-upgrade-mgr
Architecture: all
Priority: standard
Depends:
- util-linux,
watchdog,
- ${misc:Depends}
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: wrlinux ostree upgrade config manager
Example of how to run some postinstall and postrm
operations to complete a wrlinux upgrade with ostree
--
2.25.1

145
ostree/ostree-upgrade-mgr/debian/deb_patches/0002-Update-Copyright-and-License.patch Normal file
View File

@ -0,0 +1,145 @@
From 1917b17c4251e3ecfb2618105c332bb5314e8ad0 Mon Sep 17 00:00:00 2001
From: Yue Tao <yue.tao@windriver.com>
Date: Fri, 19 Nov 2021 06:33:37 +0000
Subject: [PATCH 2/2] Update Copyright and License
Signed-off-by: Yue Tao <yue.tao@windriver.com>
---
debian/control | 22 ++++++++++++++++---
debian/copyright | 56 ++++++++++++++++++------------------------------
debian/rules | 17 +++++++++++++++
3 files changed, 57 insertions(+), 38 deletions(-)
diff --git a/debian/control b/debian/control
index 6c3dbdc..0646522 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,27 @@
+# Copyright (c) 2021 Wind River Systems, Inc.
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. The ASF licenses this
+# file to you 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.
+
Source: ostree-upgrade-mgr
Section: admin
Priority: optional
-Maintainer: root <root@3b917021b2df>
+Maintainer: Hongxu Jia <hongxu.jia@windriver.com>
Standards-Version: 4.5.1
-Homepage: https://github.com/WindRiver-Labs/wr-ostree
+Homepage: https://github.com/WindRiver-Labs/meta-lat
Build-Depends: debhelper-compat (= 13)
-Rules-Requires-Root: no
Package: ostree-upgrade-mgr
Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 70db8a4..62352e5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,43 +1,29 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ostree-upgrade-mgr
-Upstream-Contact: <preferred name and address to reach the upstream project>
-Source: <url://example.com>
+Upstream-Contact: Hongxu Jia <hongxu.jia@windriver.com>
+Source: https://github.com/Wind-River/meta-lat
Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
+Copyright: Copyright (c) 2021 Wind River
+License: MIT-License
-# 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: 2021 root <root@3b917021b2df>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+License: MIT-License
+ Copyright (c) 2021 Wind River
.
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
.
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid picking licenses with terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
-#
-# If you need, there are some extra license texts available in two places:
-# /usr/share/debhelper/dh_make/licenses/
-# /usr/share/common-licenses/
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff --git a/debian/rules b/debian/rules
index 9f9252e..e4cf8c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,21 @@
#!/usr/bin/make -f
+#
+# Copyright (c) 2021 Wind River Systems, Inc.
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. The ASF licenses this
+# file to you 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.
%:
dh $@
--
2.30.2

2
ostree/ostree-upgrade-mgr/debian/deb_patches/series Normal file
View File

@ -0,0 +1,2 @@
0001-Cleanup-package-depends-lists.patch
0002-Update-Copyright-and-License.patch