Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-11 00:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for the non-free-firmware components in all tools already referencing non-free.

Browse Source
This commit is contained in:
Simon Quigley 2023-07-26 13:04:12 -05:00
parent 414bc76b50
commit bed2dc470d
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
ubuntu-dev-tools (0.195) unstable; urgency=medium
* Add support for the non-free-firmware components in all tools already
referencing non-free.
-- Simon Quigley <tsimonq2@debian.org> Wed, 26 Jul 2023 13:03:31 -0500
ubuntu-dev-tools (0.194) unstable; urgency=medium ubuntu-dev-tools (0.194) unstable; urgency=medium
[ Gianfranco Costamagna ] [ Gianfranco Costamagna ]

2
mk-sbuild
View File

@ -667,7 +667,7 @@ debian)
DEBOOTSTRAP_MIRROR="http://deb.debian.org/debian" DEBOOTSTRAP_MIRROR="http://deb.debian.org/debian"
fi fi
if [ -z "$COMPONENTS" ]; then if [ -z "$COMPONENTS" ]; then
COMPONENTS="main non-free contrib" COMPONENTS="main non-free non-free-firmware contrib"
fi fi
if [ -z "$SOURCES_PROPOSED_SUITE" ]; then if [ -z "$SOURCES_PROPOSED_SUITE" ]; then
SOURCES_PROPOSED_SUITE="RELEASE-proposed-updates" SOURCES_PROPOSED_SUITE="RELEASE-proposed-updates"

2
pbuilder-dist
View File

@ -270,7 +270,7 @@ class PbuilderDist:
mirror = os.environ.get("MIRRORSITE", config.get_value("DEBIAN_MIRROR")) mirror = os.environ.get("MIRRORSITE", config.get_value("DEBIAN_MIRROR"))
components = "main" components = "main"
if self.extra_components: if self.extra_components:
components += " contrib non-free" components += " contrib non-free non-free-firmware"
else: else:
mirror = os.environ.get("MIRRORSITE", config.get_value("UBUNTU_MIRROR")) mirror = os.environ.get("MIRRORSITE", config.get_value("UBUNTU_MIRROR"))
if self.build_architecture not in ("amd64", "i386"): if self.build_architecture not in ("amd64", "i386"):

6
syncpackage
View File

@ -324,7 +324,7 @@ def fetch_source_pkg(package, dist, version, component, ubuntu_release, mirror):
if component is None: if component is None:
component = debian_srcpkg.getComponent() component = debian_srcpkg.getComponent()
assert component in ("main", "contrib", "non-free") assert component in ("main", "contrib", "non-free", "non-free-firmware")
return DebianSourcePackage(package, version.full_version, component, mirrors=mirrors) return DebianSourcePackage(package, version.full_version, component, mirrors=mirrors)
@ -613,10 +613,10 @@ def parse():
except TypeError: except TypeError:
parser.error("Invalid bug number(s) specified.") parser.error("Invalid bug number(s) specified.")
if args.component not in (None, "main", "contrib", "non-free"): if args.component not in (None, "main", "contrib", "non-free", "non-free-firmware"):
parser.error( parser.error(
f"{args.component} is not a valid Debian component. " f"{args.component} is not a valid Debian component. "
f"It should be one of main, contrib, or non-free." f"It should be one of main, contrib, non-free, or non-free-firmware."
) )
if args.lp and args.uploader_name: if args.lp and args.uploader_name:

2
ubuntutools/archive.py
View File

@ -976,7 +976,7 @@ class Madison(_WebJSON):
# Snapshot API # Snapshot API
# https://anonscm.debian.org/cgit/mirror/snapshot.debian.org.git/plain/API # https://anonscm.debian.org/cgit/mirror/snapshot.debian.org.git/plain/API
class _Snapshot(_WebJSON): class _Snapshot(_WebJSON):
DEBIAN_COMPONENTS = ["main", "contrib", "non-free"] DEBIAN_COMPONENTS = ["main", "contrib", "non-free", "non-free-firmware"]
def getHostUrl(self): def getHostUrl(self):
return "http://snapshot.debian.org" return "http://snapshot.debian.org"