Commit 74d5af03 authored by Lucas Kanashiro's avatar Lucas Kanashiro

Backport upstream udeb support

parent e5219a3a
From: Riku Voipio <riku.voipio@linaro.org>
Date: Fri, 25 Aug 2017 14:45:14 +0300
Subject: [backend] publish udebs in repo
Copy udebs into repository. These are not added into the Packages
index as dpkg-scanpackages searches for .deb files unless instructed
otherwise.
Origin: upstream, 2.9.0, commit:afb1c7c7205ea44298964f5e30ac83c4f5c5f022
Signed-off-by: Lucas Kanashiro <lucas.kanashiro@collabora.com>
---
src/backend/bs_publish | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/backend/bs_publish b/src/backend/bs_publish
index 77a06f1..b4235a4 100755
--- a/src/backend/bs_publish
+++ b/src/backend/bs_publish
@@ -66,7 +66,7 @@ my $extrepodb = "$BSConfig::bsdir/db/published";
my $myeventdir = "$eventdir/publish";
-my @binsufs = qw{rpm deb pkg.tar.gz pkg.tar.xz};
+my @binsufs = qw{rpm udeb deb pkg.tar.gz pkg.tar.xz};
my $binsufsre = join('|', map {"\Q$_\E"} @binsufs);
my @binsufsrsync = map {"--include=*.$_"} @binsufs;
@@ -123,7 +123,7 @@ sub fillpkgdescription {
$hit = $p;
last;
}
- if ($pn =~ /^\Q$name\E_([^_]+)_[^_]+\.deb$/) {
+ if ($pn =~ /^\Q$name\E_([^_]+)_[^_]+\.u?deb$/) {
$hit = $p;
last;
}
@@ -209,7 +209,7 @@ sub updatebinaryindex {
my $n;
if ($key =~ /(?:^|\/)([^\/]+)-[^-]+-[^-]+\.[a-zA-Z][^\/\.\-]*\.rpm$/) {
$n = $1;
- } elsif ($key =~ /(?:^|\/)([^\/]+)_([^\/]*)_[^\/]*\.deb$/) {
+ } elsif ($key =~ /(?:^|\/)([^\/]+)_([^\/]*)_[^\/]*\.u?deb$/) {
$n = $1;
} elsif ($key =~ /(?:^|\/)([^\/]+)-[^-]+-[^-]+-[a-zA-Z][^\/\.\-]*\.pkg\.tar\..z$/) {
$n = $1;
@@ -223,7 +223,7 @@ sub updatebinaryindex {
my $n;
if ($key =~ /(?:^|\/)([^\/]+)-[^-]+-[^-]+\.[a-zA-Z][^\/\.\-]*\.rpm$/) {
$n = $1;
- } elsif ($key =~ /(?:^|\/)([^\/]+)_([^\/]*)_[^\/]*\.deb$/) {
+ } elsif ($key =~ /(?:^|\/)([^\/]+)_([^\/]*)_[^\/]*\.u?deb$/) {
$n = $1;
} elsif ($key =~ /(?:^|\/)([^\/]+)-[^-]+-[^-]+-[a-zA-Z][^\/\.\-]*\.pkg\.tar\..z$/) {
$n = $1;
@@ -798,9 +798,9 @@ sub createrepo_staticlinks {
if (/^(.*)-([^-]*)-[^-]*\.rpm$/s) {
$link = "$1.rpm";
$link = "$1-$2.rpm" if $versioned;
- } elsif (/^(.*)_([^_]*)-[^_]*\.deb$/s) {
- $link = "$1.deb";
- $link = "${1}_$2.deb" if $versioned;
+ } elsif (/^(.*)_([^_]*)-[^_]*\.(u?deb)$/s) {
+ $link = "$1.$3";
+ $link = "${1}_$2.$3" if $versioned;
} elsif (/^(.*)-Build\d\d\d\d(-Media\d)(\.iso?(\.sha256)?)$/s) {
# product builds
$link = "$1$2$3"; # no support for versioned links
@@ -1438,7 +1438,7 @@ sub publish {
if ($bin =~ /^.+-[^-]+-[^-]+\.([a-zA-Z][^\/\.\-]*)\.d?rpm$/) {
$p = "$1/$bin";
$p = $1 eq 'src' || $1 eq 'nosrc' ? "SRPMS/$bin" : "RPMS/$bin" if $repotype{'resarchhack'};
- } elsif ($bin =~ /^.+_[^_]+_([^_\.]+)\.deb$/) {
+ } elsif ($bin =~ /^.+_[^_]+_([^_\.]+)\.u?deb$/) {
$p = "$1/$bin";
} elsif ($bin =~ /\.exe$/) {
$p = "$bin";
@@ -1448,7 +1448,7 @@ sub publish {
next unless $q;
$p = "$q->{'arch'}/$q->{'name'}-$q->{'version'}-$q->{'release'}.$q->{'arch'}.rpm";
} elsif ($bin =~ /\.deb$/) {
- # legacy format
+ # legacy format XXX no udeb handling
my $q = Build::query("$r/$rbin", 'evra' => 1);
$p = "$q->{'arch'}/$q->{'name'}_$q->{'version'}";
$p .= "-$q->{'release'}" if defined $q->{'release'};
......@@ -11,13 +11,13 @@ makes the changes file inconsistent
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/backend/bs_publish b/src/backend/bs_publish
index e4ad908..66d117a 100755
index 57ed0c6..83d91ac 100755
--- a/src/backend/bs_publish
+++ b/src/backend/bs_publish
@@ -1508,7 +1508,7 @@ sub publish {
$p = "$1/$bin";
$p = $1 eq 'src' || $1 eq 'nosrc' ? "SRPMS/$bin" : "RPMS/$bin" if $repotype{'resarchhack'};
} elsif ($bin =~ /^.+_[^_]+_([^_\.]+)\.u+deb$/) {
} elsif ($bin =~ /^.+_[^_]+_([^_\.]+)\.u?deb$/) {
- $p = "$1/$bin";
+ $p = "$arch/$bin";
} elsif ($bin =~ /\.exe$/) {
......@@ -25,7 +25,7 @@ index e4ad908..66d117a 100755
} elsif ($bin =~ /\.d?rpm$/) {
@@ -1519,7 +1519,7 @@ sub publish {
} elsif ($bin =~ /\.deb$/) {
# legacy format
# legacy format XXX no udeb handling
my $q = Build::query("$r/$rbin", 'evra' => 1);
- $p = "$q->{'arch'}/$q->{'name'}_$q->{'version'}";
+ $p = "$arch/$q->{'name'}_$q->{'version'}";
......
From c59be3deddd70f6a99eb803112aeb86b45396461 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Mon, 2 Dec 2013 15:15:50 +0100
Subject: Seperately include debs and udebs into reprepro
......@@ -6,14 +5,18 @@ Subject: Seperately include debs and udebs into reprepro
Split out the calls for including debs and udebs into reprepro. This
ensure the deb package still get properly included if the udeb isn't
available (mostly for older builds)
---
src/backend/bs_publish | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/backend/bs_publish b/src/backend/bs_publish
index 0d631df..52db29d 100755
--- a/src/backend/bs_publish
+++ b/src/backend/bs_publish
@@ -631,10 +631,21 @@
@@ -631,9 +631,21 @@ sub updaterepo_reprepro {
'--ignore=wrongdistribution',
'--ignore=updatedarchall',
'--ignore=unusedarch',
- '-T', 'deb|udeb',
+ '-T', 'deb',
'-C', $component,
'include', $codename,
......
......@@ -8,7 +8,7 @@ Last-Updated: 2019-03-21
if ($bin =~ /^.+-[^-]+-[^-]+\.([a-zA-Z][^\/\.\-]*)\.d?rpm$/) {
$p = "$1/$bin";
$p = $1 eq 'src' || $1 eq 'nosrc' ? "SRPMS/$bin" : "RPMS/$bin" if $repotype{'resarchhack'};
- } elsif ($bin =~ /^.+_[^_]+_([^_\.]+)\.u+deb$/) {
- } elsif ($bin =~ /^.+_[^_]+_([^_\.]+)\.u?deb$/) {
+ } elsif ($bin =~ /^.+_[^_]+_([^_\.]+)\.[ud]?deb$/) {
$p = "$arch/$bin";
} elsif ($bin =~ /\.exe$/) {
......
From 5c61a1a298e1febd6f605666469e229b349a8de2 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Mon, 21 Oct 2013 10:11:25 +0200
Subject: publish: Also accept udebs into reprepro repositories
--- a/src/backend/bs_publish
+++ b/src/backend/bs_publish
@@ -631,6 +631,7 @@
'--ignore=wrongdistribution',
'--ignore=updatedarchall',
'--ignore=unusedarch',
+ '-T', 'deb|udeb',
'-C', $component,
'include', $codename,
"$extrep/$f");
@@ -1466,7 +1467,7 @@
if ($bin =~ /^.+-[^-]+-[^-]+\.([a-zA-Z][^\/\.\-]*)\.d?rpm$/) {
$p = "$1/$bin";
$p = $1 eq 'src' || $1 eq 'nosrc' ? "SRPMS/$bin" : "RPMS/$bin" if $repotype{'resarchhack'};
- } elsif ($bin =~ /^.+_[^_]+_([^_\.]+)\.deb$/) {
+ } elsif ($bin =~ /^.+_[^_]+_([^_\.]+)\.u+deb$/) {
$p = "$1/$bin";
} elsif ($bin =~ /\.exe$/) {
$p = "$bin";
backend-publish-udebs-in-repo.patch
collabora/publish-asc-files.patch
database.yml-settings.patch
gemfile-tweaks.patch
......@@ -22,7 +23,6 @@ handle-links-properly.patch
dist-Use-2.7-packages-for-testing.patch
collabora/Add_global_configuration_for_a_shared_reprepro.patch
collabora/Add_--ignore=unusedarch_to_reprepro_params.patch
collabora/publish_Also_accept_udebs_into_reprepro_repository.patch
collabora/Seperately_include_debs_and_udebs_into_reprepro.patch
collabora/BSConfig.pm.template_include_a_skeleton_reprepro.patch
collabora/Include_ddebs_in_reprepro_too_and_fix_inclusion_of_udebs.patch
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment