Skip to content
Snippets Groups Projects
Commit 03cff3ea authored by Ritesh Raj Sarraf's avatar Ritesh Raj Sarraf
Browse files

Merge updates from debian/bookworm

parents bc164273 45ce55e8
No related branches found
No related tags found
1 merge request!16Update from debian/bookworm for apertis/v2024dev2
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 364 additions and 468 deletions
debian/Debian/DpkgCross.pm
+ 3
− 6
View file @ 03cff3ea
......@@ -90,10 +90,7 @@ $progname = basename($0);
$arch_dir = '/etc/dpkg-cross/archtable.d/';
%archtable = ();
opendir (ARCHDIR, $arch_dir)
or carp sprintf (_g("Unable to read %s: %s\n"), $arch_dir, $!);
my @pathfiles=grep(!/^\.\.?$/, readdir ARCHDIR);
closedir (ARCHDIR);
my @pathfiles=();
foreach my $file (@pathfiles) {
next if (-d "${arch_dir}$file");
my $conf = Config::Auto::parse("${arch_dir}$file", format => "colon");
......@@ -251,7 +248,7 @@ dpkg-cross scripts.
=cut
sub get_version {
my $query = `dpkg-query -W -f='\${Version}' dpkg-cross`;
my $query = "2.6.18";
(defined $query) ? return $query : return "2.5.5";
}
......@@ -395,7 +392,7 @@ sub setup {
$crosslib64 ||= $crosslib . "64";
$crosslib32 ||= $crosslib . "32";
$crosslibhf ||= $crosslib . "hf";
$crosslibn32 ||= $crosslib . "32";
$crosslibn32 ||= $crosslib . "n32";
$crosslibo32 ||= $crosslib . "o32";
$crosslibsf ||= $crosslib . "sf";
$crosslibx32 ||= $crosslib . "x32";
......
debian/changelog
+ 125
− 0
View file @ 03cff3ea
cross-toolchain-base (66) unstable; urgency=medium
* Build using glibc 2.36-8.
* Build using binutils 2.40-2.
* Build using linux 6.1.4.
* Build using gcc 12.2.0-14.
-- Matthias Klose <doko@debian.org> Sun, 15 Jan 2023 16:27:05 +0100
cross-toolchain-base (65) unstable; urgency=medium
* Build using glibc 2.36-7.
* Build using linux 6.0.12.
* Add new build dependencies for binutils.
* Add build dependency on dpkg (>= 1.21.17).
-- Matthias Klose <doko@debian.org> Fri, 06 Jan 2023 10:14:35 +0100
cross-toolchain-base (62) unstable; urgency=medium
* Build using glibc 2.36-3.
* Build using linux 6.0.5.
* Work around dpkg-cross misbehaving with glibc 2.35 to rewrite
.so files for non-default multilib packages. See #1018758.
* Remove glibc stage1 and gcc stage2 (Helmut Grohne). Closes: #956855.
* Remove the support to build ARM32 soft-float/hard-float multilibs.
* Update copyright years.
* Merge the support to build packages for arc-linux-gnu.
-- Matthias Klose <doko@debian.org> Tue, 01 Nov 2022 17:31:55 +0100
cross-toolchain-base (61) unstable; urgency=medium
* Build using glibc 2.35-1.
* Build using linux 5.19.6.
* Bump standards version.
* Update d/p/glibc/debian/no-libaudit.diff for glibc 2.34-5.
* Work around dpkg-cross handling the versioned ld.so symlinks.
-- Matthias Klose <doko@debian.org> Fri, 23 Sep 2022 14:02:02 +0200
cross-toolchain-base (60) unstable; urgency=medium
[ Debian Janitor ]
* Bump debhelper from deprecated 9 to 13.
* Set debhelper-compat version in Build-Depends.
* Remove unnecessary XS-Testsuite field in debian/control.
[ Bastien Roucariès ]
* Build using gcc 11.3.0-5
* Bug fix: "FTBFS: configure: error: cannot compute suffix of object
files: cannot compile", thanks to Lucas Nussbaum (Closes: #1017213).
[ Dimitri John Ledkov ]
* debian/tests/control: switch static build-depends list to @builddeps@
macro.
* Switch to exact linux-source-$VER dependency.
* Update ubuntu patches for glibc 2.36.
* Drop unused CROSS_* substitutions from debian/rules control target
that generating warnings and errors.
* Update package versions for Debian and Ubuntu. (Closes: #1016829).
* Build using glibc 2.34-3.
* Build using linux 5.18.16.
-- Dimitri John Ledkov <dimitri.ledkov@canonical.com> Tue, 16 Aug 2022 13:17:09 +0100
cross-toolchain-base (59) unstable; urgency=medium
* Build using glibc 2.33-1.
* Build using linux 5.15.5.
* Build using gcc 10.3.0-7.
* Build using binutils 2.37-10.
-- Matthias Klose <doko@debian.org> Mon, 13 Dec 2021 10:43:12 +0100
cross-toolchain-base (58) unstable; urgency=medium
* Build without libaudit.
-- Matthias Klose <doko@debian.org> Mon, 06 Sep 2021 18:19:01 +0200
cross-toolchain-base (57) unstable; urgency=medium
* Build using glibc 2.32-1.
-- Matthias Klose <doko@debian.org> Mon, 06 Sep 2021 10:41:57 +0200
cross-toolchain-base (56) unstable; urgency=medium
[ YunQiang Su ]
* Merge changes from c-t-b-mipsen.
* Embedded dpkg-cross: support ld-linux-mipsn8.so.1 for MIPS r6.
[ Matthias Klose ]
* Fix some warnings in the embedded dpkg-cross.
* Update comment for libc6-sparc64-cross:
Remove /usr/sparc64-linux-gnu/lib/ld-linux.so.2
* Build using gcc 10.3.0-7.
* Fix path to ld.so.1/ld-linux.so.2 for 32bit non-default multilib builds.
* Mark the autopkg test skippable on archs without cross compilers.
Closes: #992525.
-- Matthias Klose <doko@debian.org> Fri, 27 Aug 2021 20:45:05 +0200
cross-toolchain-base (55) unstable; urgency=medium
* Build using glibc 2.31-17.
-- Matthias Klose <doko@debian.org> Tue, 24 Aug 2021 11:00:20 +0200
cross-toolchain-base (54) unstable; urgency=medium
* Build using glibc 2.31-16.
* Build using binutils 2.37-4.
* Set the PATH env var explicitly when calling env -i.
* Fix building the sparc64 multilib compilers. Closes: #991897.
* Stop building the armel/armhf multilib packages for Ubuntu.
* Merge the dpkg-cross script, not enabling the fix_shlibs hunk.
* Refresh glibc patches.
* For the sparc64 32bit multilib, fix the AS_NEEDED section in the libc.so
linker file. Addresses: #991897.
* Tighten test depedencies.
-- Matthias Klose <doko@debian.org> Mon, 23 Aug 2021 14:53:10 +0200
cross-toolchain-base (53+apertis1) apertis; urgency=medium
* Merge from Debian bullseye. Remaining changes:
......
debian/compat deleted 100644 → 0
+ 0
− 1
View file @ bc164273
9
debian/control
+ 9
− 9
View file @ 03cff3ea
......@@ -5,15 +5,15 @@ Maintainer: Cross Toolchain Base Team <cross-toolchain-base-devs@lists.launchpad
Uploaders: Matthias Klose <doko@debian.org>, Dimitri John Ledkov <xnox@debian.org>
Vcs-Browser: https://salsa.debian.org/toolchain-team/cross-toolchain-base
Vcs-Git: https://salsa.debian.org/toolchain-team/cross-toolchain-base.git
Standards-Version: 4.5.1
Standards-Version: 4.6.1
Build-Depends: binutils-multiarch,
dpkg (>= 1.16.0~ubuntu6), rdfind, symlinks, lsb-release,
binutils-source (>= 2.35.2-2~),
glibc-source (>= 2.31-9~),
gcc-10-source (>= 10.2.1-6~),
linux-source (>= 5.10.13), linux-libc-dev (>= 5.10.13),
dpkg (>= 1.21.17), rdfind, symlinks, lsb-release,
binutils-source (>= 2.40-2~),
glibc-source (>= 2.36-8~),
gcc-12-source (>= 12.2.0-14~),
linux-source-6.1 (>= 6.1.4), linux-libc-dev (>= 6.1.4),
autoconf (>= 2.69), autoconf2.69, autogen,
automake, bison (>= 1:2.3), chrpath, debhelper (>= 9),
automake, bison (>= 1:2.3), chrpath, debhelper-compat (= 13),
dpkg-dev (>= 1.15.3.1), fakeroot, file, flex,
dwz, debugedit (>= 4.16), gawk, gettext, gperf (>= 3.0.1), kernel-wedge (>= 2.24),
libisl-dev, libmpc-dev, libelf-dev,
......@@ -23,12 +23,12 @@ Build-Depends: binutils-multiarch,
sed (>= 4.0.5-4), sharutils, tar (>= 1.22), xz-utils,
asciidoc, texinfo, cpio, python3, bc, time,
libconfig-auto-perl, libfile-temp-perl, libconfig-auto-perl,
libfile-homedir-perl, liblocale-gettext-perl, libunwind-dev [amd64 i386 x32]
libfile-homedir-perl, liblocale-gettext-perl, libunwind-dev [amd64 i386 x32],
libjansson-dev, pkg-config,
Build-Conflicts: dpkg-cross, libdebian-dpkgcross-perl,
binutils-x86-64-linux-gnu [!amd64], binutils-i686-linux-gnu [!i386], binutils-s390x-linux-gnu [!s390x], binutils-powerpc64le-linux-gnu [!ppc64el], binutils-aarch64-linux-gnu [!arm64], binutils-arm-linux-gnueabihf [!armhf], binutils-arm-linux-gnueabi [!armel],
libc6-amd64-cross, linux-libc-dev-amd64-cross, libc6-i386-cross, linux-libc-dev-i386-cross, libc6-s390x-cross, linux-libc-dev-s390x-cross, libc6-ppc64el-cross, linux-libc-dev-ppc64el-cross, libc6-arm64-cross, linux-libc-dev-arm64-cross, libc6-armhf-cross, linux-libc-dev-armhf-cross, libc6-armel-cross, linux-libc-dev-armel-cross,
libc6-amd64 [i386 x32], libc6-i386 [amd64 x32], libc6-x32 [amd64 i386]
XS-Testsuite: autopkgtest
Package: linux-libc-dev-amd64-cross
Architecture: all
......
debian/control.armel.in deleted 100644 → 0
+ 0
− 10
View file @ bc164273
Package: libc6-dev-armhf-armel-cross
Architecture: all
Depends: libc6-dev-armhf-cross
Description: Dummy package to get libc6-dev:armhf installed
Package: libc6-armhf-armel-cross
Architecture: all
Depends: libc6-armhf-cross
Description: Dummy package to get libc6:armhf installed
debian/control.armhf.in deleted 100644 → 0
+ 0
− 10
View file @ bc164273
Package: libc6-dev-armel-armhf-cross
Architecture: all
Depends: libc6-dev-armel-cross
Description: Dummy package to get libc6-dev:armel installed
Package: libc6-armel-armhf-cross
Architecture: all
Depends: libc6-armel-cross
Description: Dummy package to get libc6:armel installed
debian/control.source.in
+ 6
− 6
View file @ 03cff3ea
......@@ -5,15 +5,15 @@ Maintainer: Cross Toolchain Base Team <cross-toolchain-base-devs@lists.launchpad
Uploaders: Matthias Klose <doko@debian.org>, Dimitri John Ledkov <xnox@debian.org>
Vcs-Browser: https://salsa.debian.org/toolchain-team/cross-toolchain-base
Vcs-Git: https://salsa.debian.org/toolchain-team/cross-toolchain-base.git
Standards-Version: 4.5.1
Standards-Version: 4.6.1
Build-Depends: binutils-multiarch,
dpkg (>= 1.16.0~ubuntu6), rdfind, symlinks, lsb-release,
dpkg (>= 1.21.17), rdfind, symlinks, lsb-release,
binutils-source (>= MIN_VER_BINUTILS),
glibc-source (>= MIN_VER_GLIBC),
gcc-VER_GCC_BASE-source (>= MIN_VER_GCC),
linux-source (>= MIN_VER_LINUX), linux-libc-dev (>= MIN_VER_LINUX),
linux-source-VER_LINUX (>= MIN_VER_LINUX), linux-libc-dev (>= MIN_VER_LINUX),
autoconf (>= 2.69), autoconf2.69, autogen,
automake, bison (>= 1:2.3), chrpath, debhelper (>= 9),
automake, bison (>= 1:2.3), chrpath, debhelper-compat (= 13),
dpkg-dev (>= 1.15.3.1), fakeroot, file, flex,
dwz, debugedit (>= 4.16), gawk, gettext, gperf (>= 3.0.1), kernel-wedge (>= 2.24),
libisl-dev, libmpc-dev, libelf-dev,
......@@ -23,9 +23,9 @@ Build-Depends: binutils-multiarch,
sed (>= 4.0.5-4), sharutils, tar (>= 1.22), xz-utils,
asciidoc, texinfo, cpio, python3, bc, time,
libconfig-auto-perl, libfile-temp-perl, libconfig-auto-perl,
libfile-homedir-perl, liblocale-gettext-perl, libunwind-dev [amd64 i386 x32]
libfile-homedir-perl, liblocale-gettext-perl, libunwind-dev [amd64 i386 x32],
libjansson-dev, pkg-config,
Build-Conflicts: dpkg-cross, libdebian-dpkgcross-perl,
BINUTILS_BUILD_CONFLICTS
GLIBC_BUILD_CONFLICTS
libc6-amd64 [i386 x32], libc6-i386 [amd64 x32], libc6-x32 [amd64 i386]
XS-Testsuite: autopkgtest
debian/copyright
+ 2
− 2
View file @ 03cff3ea
......@@ -3,9 +3,9 @@ Reworked by Dimitri John Ledkov <xnox@debian.org> and
Matthias Klose <doko@debian.org> to build packages for multiple architectures.
(C) 2010 Linaro
(C) 2012-2015 Canonical Ltd.
(C) 2012-2022 Canonical Ltd.
(C) 2015 Dimitri John Ledkov
(C) 2015 Matthias Klose
(C) 2015-2022 Matthias Klose
These scripts are free software; you can redistribute it and/or modify it
under the terms of the Eclipse Public License v1.0.
......
debian/dpkg-cross
+ 64
− 32
View file @ 03cff3ea
......@@ -631,34 +631,33 @@ sub sub_build {
return 0;
}
while (<FROM>) {
if ($multiarch) {
if ($multiarch =~ m/mips(isa)?64.*-linux.*-gnuabi64.*/){
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld.so.1:$1$crosslib64/ld.so.1:g;
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld-linux-mipsn8.so.1:$1$crosslib64/ld-linux-mipsn8.so.1:g;
}elsif ($multiarch =~ m/^mips(isa)?64.*-linux.*-gnuabin32.*/){
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld.so.1:$1$crosslibn32/ld.so.1:g;
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld-linux-mipsn8.so.1:$1$crosslibn32/ld-linux-mipsn8.so.1:g;
}elsif ($multiarch =~ m/^mips(isa32)?.*-linux.*-gnu.*/){
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld.so.1:$1$crosslib/ld.so.1:g;
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld-linux-mipsn8.so.1:$1$crosslib/ld-linux-mipsn8.so.1:g;
}
s:(^|[^-\w/])(/usr)?/lib/$multiarch:$1$crosslib/:g;
s:(^|[^-\w/])(/usr)?/lib32/$multiarch:$1$crosslib32/:g;
s:(^|[^-\w/])(/usr)?/lib64/$multiarch:$1$crosslib64/:g;
s:(^|[^-\w/])(/usr)?/libhf/$multiarch:$1$crosslibhf/:g;
s:(^|[^-\w/])(/usr)?/libn32/$multiarch:$1$crosslibn32/:g;
s:(^|[^-\w/])(/usr)?/libo32/$multiarch:$1$crosslibo32/:g;
s:(^|[^-\w/])(/usr)?/libsf/$multiarch:$1$crosslibsf/:g;
s:(^|[^-\w/])(/usr)?/libx32/$multiarch:$1$crosslibx32/:g;
if ($multiarch =~ m/mips(isa)?64.*-linux.*-gnuabi64.*/) {
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld\.so\.1:$1$crosslib64/ld.so.1:g;
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld-linux-mipsn8\.so\.1:$1$crosslib64/ld-linux-mipsn8\.so\.1:g;
} elsif ($multiarch =~ m/^mips(isa)?64.*-linux.*-gnuabin32.*/) {
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld\.so\.1:$1$crosslibn32/ld.so.1:g;
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld-linux-mipsn8\.so\.1:$1$crosslibn32/ld-linux-mipsn8\.so\.1:g;
} elsif ($multiarch =~ m/^mips(isa32)?.*-linux.*-gnu.*/) {
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld\.so\.1:$1$crosslib/ld\.so\.1:g;
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld-linux-mipsn8\.so\.1:$1$crosslib/ld-linux-mipsn8\.so\.1:g;
} elsif ($multiarchtriplet eq "sparc64-linux-gnu") {
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld-linux\.so\.2:$1$crosslib64/ld-linux.so.2:g;
}
s:(^|[^-\w/])(/usr)?/lib/$multiarch:$1$crosslib/:g;
unless ($multiarch) {
s:(^|[^-\w/])(/usr)?/lib32/:$1$crosslib32/:g;
s:(^|[^-\w/])(/usr)?/lib64/:$1$crosslib64/:g;
s:(^|[^-\w/])(/usr)?/libhf/:$1$crosslibhf/:g;
s:(^|[^-\w/])(/usr)?/libn32/:$1$crosslibn32/:g;
s:(^|[^-\w/])(/usr)?/libo32/:$1$crosslibo32/:g;
s:(^|[^-\w/])(/usr)?/libsf/:$1$crosslibsf/:g;
s:(^|[^-\w/])(/usr)?/libx32/:$1$crosslibx32/:g;
}
s:(^|[^-\w/])(/usr)?/lib/:$1$crosslib/:g;
s:(^|[^-\w/])(/usr)?/lib32/:$1$crosslib32/:g;
s:(^|[^-\w/])(/usr)?/lib64/:$1$crosslib64/:g;
s:(^|[^-\w/])(/usr)?/libhf/:$1$crosslibhf/:g;
s:(^|[^-\w/])(/usr)?/libn32/:$1$crosslibn32/:g;
s:(^|[^-\w/])(/usr)?/libo32/:$1$crosslibo32/:g;
s:(^|[^-\w/])(/usr)?/libsf/:$1$crosslibsf/:g;
s:(^|[^-\w/])(/usr)?/libx32/:$1$crosslibx32/:g;
# Even though libc is multiarch, it ships non-multiarch loaders.
s:(^|[^-\w/])/lib(/ld[^/ ]*\.so):$1$crosslib$2:g;
s:(^|[^-\w/])/lib32(/ld[^/ ]*\.so):$1$crosslib32$2:g;
s:(^|[^-\w/])/lib64(/ld[^/ ]*\.so):$1$crosslib64$2:g;
s:(^|[^-\w/])/libx32(/ld[^/ ]*\.so):$1$crosslibx32$2:g;
print TO;
}
close(FROM);
......@@ -762,6 +761,35 @@ sub sub_build {
close(TO);
return 1;
}
# Helper: fix shlibs file
# - arch-qualify dependencies
sub fix_shlibs($$) {
my ($from, $to) = @_;
ensure_dir($to) or return 0;
if (! open(FROM, $from)) {
$msg = sprintf(_g("%s: failed to open %s: %s\n"), $progname, $from, $!);
warn ($msg);
return 0;
}
if (! open(TO, ">$to")) {
$msg = sprintf(_g("%s: failed to open %s for writing: %s\n"), $progname, $to, $!);
warn ($msg);
close(FROM);
return 0;
}
while (<FROM>) {
if (m/^#/) {
print TO;
} elsif (m/((?:\S+:\s*)?\S+\s+\S+\s+)(.*)/) {
print TO ($1 . join(",", map { s/\S+/$&:$arch/; $_; } split(/,/, $2)) . "\n");
} else {
print TO;
}
}
close(FROM);
close(TO);
return 1;
}
my $config = &get_config;
$crosstype = `CC="" dpkg-architecture -f -a$arch -qDEB_HOST_GNU_TYPE 2> /dev/null`;
chomp ($crosstype);
......@@ -1036,12 +1064,13 @@ sub sub_build {
# Skip links that are going to point to themselves
next if ($lv eq $_);
# skip /usr/$(multiarch)/lib/ld.so.1 for mips n32 and 64.
# their ld.so.1 should be in lib32 and lib64.
next if ($multiarch =~ m/^mips(isa)?64/ && $_ =~ m/lib\/ld.so.1$/);
next if ($multiarch =~ m/^mips(isa)?64/ && $_ =~ m/lib\/ld-linux-mipsn8.so.1$/);
# their ld.so.1 should be in lib32 and lib64.
next if ($multiarch =~ m/^mips(isa)?64/ && $_ =~ m:lib/ld\.so\.1$:);
next if ($multiarch =~ m/^mips(isa)?64/ && $_ =~ m:lib/ld-linux-mipsn8\.so\.1$:);
next if ($multiarchtriplet eq "sparc64-linux-gnu" && $_ =~ m:lib/ld-linux\.so\.2$:);
# skip links to private modules and plugins that are not
# useful or packaged in the -cross package, basically anything
# in a directory beneath /usr/lib/. See #499292
......@@ -1113,6 +1142,8 @@ sub sub_build {
if (-f "$src/DEBIAN/shlibs") {
print "Installing shlibs file\n" if $verbose >= 2;
link_file("$src/DEBIAN/shlibs", "$dst/DEBIAN/shlibs");
# FIXME: not enabling in this copy. needed?
#fix_shlibs("$src/DEBIAN/shlibs", "$dst/DEBIAN/shlibs");
}
# Create the control file.
......@@ -1128,6 +1159,7 @@ sub sub_build {
print CONTROL "Section: " . $control{"section"} . "\n";
print CONTROL "Priority: optional\n";
print CONTROL "Architecture: all\n";
print CONTROL "Multi-Arch: foreign\n";
if (defined($control{"maintainer"})) {
print CONTROL "Maintainer: " . $control{"maintainer"} . "\n";
......
debian/kernelarch.make
+ 1
− 2
View file @ 03cff3ea
KERNEL_ARCH_alpha:=alpha
KERNEL_ARCH_arc:=arc
KERNEL_ARCH_arm64:=arm64
KERNEL_ARCH_armhf:=arm
KERNEL_ARCH_armel:=arm
......@@ -30,7 +31,5 @@ KERNEL_ARCH_i386:=x86
KERNEL_ARCH_amd64:=x86
KERNEL_ARCH_x32:=x86
CROSS_BIARCH_armhf:=armel
CROSS_BIARCH_armel:=armhf
CROSS_BIARCH_powerpc:=ppc64
CROSS_BIARCH_s390x:=s390
debian/libc6-armel-cross.preinst deleted 100644 → 0
+ 0
− 14
View file @ bc164273
#! /bin/sh
set -e
case "$1" in
upgrade)
if dpkg --compare-versions "$2" lt 2.27-3ubuntu1.1; then
if [ -h /usr/arm-linux-gnueabihf/libsf ]; then
rm -f /usr/arm-linux-gnueabihf/libsf
fi
fi
esac
exit 0
debian/libc6-armhf-cross.preinst deleted 100644 → 0
+ 0
− 14
View file @ bc164273
#! /bin/sh
set -e
case "$1" in
upgrade)
if dpkg --compare-versions "$2" lt 2.27-3ubuntu1.1; then
if [ -h /usr/arm-linux-gnueabi/libhf ]; then
rm -f /usr/arm-linux-gnueabi/libhf
fi
fi
esac
exit 0
debian/patches/glibc/debian/dpkg-shlibs.patch
+ 3
− 5
View file @ 03cff3ea
......@@ -2,16 +2,14 @@
debian/rules.d/debhelper.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: b/debian/rules.d/debhelper.mk
===================================================================
--- a/debian/rules.d/debhelper.mk
+++ b/debian/rules.d/debhelper.mk
@@ -80,7 +80,7 @@ endif
@@ -82,7 +82,7 @@ endif
sh ./debian/shlibs-add-udebs $(curpass)
dh_installdeb -p$(curpass)
- dh_shlibdeps -p$(curpass)
+ #dh_shlibdeps -p$(curpass)
dh_gencontrol -p$(curpass)
if [ $(curpass) = nscd ] ; then \
sed -i -e "s/\(Depends:.*libc[0-9.]\+\)-[a-z0-9]\+/\1/" debian/nscd/DEBIAN/control ; \
dh_md5sums -p$(curpass)
debian/patches/glibc/debian/glibc-build-tools.diff
+ 1
− 1
View file @ 03cff3ea
--- a/debian/rules
+++ b/debian/rules
@@ -104,8 +104,8 @@ TIMEOUTFACTOR = 25
@@ -103,8 +103,8 @@ TIMEOUTFACTOR = 25
CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION)
CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)$(DEB_GCC_VERSION)
MIG = $(DEB_HOST_GNU_TYPE)-$(BASE_MIG)
......
debian/patches/glibc/debian/local-kill-locales.patch
+ 6
− 2
View file @ 03cff3ea
--- a/debian/rules
+++ b/debian/rules
@@ -142,10 +142,12 @@ else
@@ -146,10 +146,12 @@ else
else
DEB_UDEB_PACKAGES = $(libc)-udeb
endif
......@@ -15,7 +15,7 @@
# Generic kernel version check
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -1,499 +1,3 @@
@@ -1,503 +1,3 @@
# This file names the currently supported and somewhat tested locales.
# If you have any additions please file a glibc bug report.
SUPPORTED-LOCALES=\
......@@ -97,6 +97,7 @@
-bs_BA.UTF-8/UTF-8 \
-bs_BA/ISO-8859-2 \
-byn_ER/UTF-8 \
-C.UTF-8/UTF-8 \
-ca_AD.UTF-8/UTF-8 \
-ca_AD/ISO-8859-15 \
-ca_ES.UTF-8/UTF-8 \
......@@ -109,6 +110,7 @@
-ca_IT/ISO-8859-15 \
-ce_RU/UTF-8 \
-chr_US/UTF-8 \
-ckb_IQ/UTF-8 \
-cmn_TW/UTF-8 \
-crh_UA/UTF-8 \
-cs_CZ.UTF-8/UTF-8 \
......@@ -401,6 +403,7 @@
-pt_PT@euro/ISO-8859-15 \
-quz_PE/UTF-8 \
-raj_IN/UTF-8 \
-rif_MA/UTF-8 \
-ro_RO.UTF-8/UTF-8 \
-ro_RO/ISO-8859-2 \
-ru_RU.UTF-8/UTF-8 \
......@@ -451,6 +454,7 @@
-sv_SE.ISO-8859-15/ISO-8859-15 \
-sw_KE/UTF-8 \
-sw_TZ/UTF-8 \
-syr/UTF-8 \
-szl_PL/UTF-8 \
-ta_IN/UTF-8 \
-ta_LK/UTF-8 \
......
debian/patches/glibc/debian/no-libaudit.diff 0 → 100644
+ 10
− 0
View file @ 03cff3ea
--- a/debian/debhelper.in/libc-dev.install
+++ b/debian/debhelper.in/libc-dev.install
@@ -1,7 +1,6 @@
usr/include
usr/lib/*/*.o
usr/lib/*/*.so
-usr/lib/*/audit
usr/lib/*/libBrokenLocale.a
usr/lib/*/libanl.a
usr/lib/*/libc.a
debian/patches/glibc/debian/series
+ 1
− 0
View file @ 03cff3ea
dpkg-shlibs.patch
local-kill-locales.patch
glibc-build-tools.diff
no-libaudit.diff
debian/patches/glibc/ubuntu/local-kill-locales.patch
+ 5
− 2
View file @ 03cff3ea
--- a/debian/rules
+++ b/debian/rules
@@ -142,10 +142,12 @@ else
@@ -145,10 +145,12 @@ else
else
DEB_UDEB_PACKAGES = $(libc)-udeb
endif
......@@ -15,7 +15,7 @@
# Generic kernel version check
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -1,503 +1,3 @@
@@ -1,506 +1,4 @@
# This file names the currently supported and somewhat tested locales.
# If you have any additions please file a glibc bug report.
SUPPORTED-LOCALES=\
......@@ -97,6 +97,7 @@
-bs_BA.UTF-8/UTF-8 \
-bs_BA/ISO-8859-2 \
-byn_ER/UTF-8 \
C.UTF-8/UTF-8 \
-ca_AD.UTF-8/UTF-8 \
-ca_AD/ISO-8859-15 \
-ca_ES.UTF-8/UTF-8 \
......@@ -403,6 +404,7 @@
-pt_PT@euro/ISO-8859-15 \
-quz_PE/UTF-8 \
-raj_IN/UTF-8 \
-rif_MA/UTF-8 \
-ro_RO.UTF-8/UTF-8 \
-ro_RO/ISO-8859-2 \
-ru_RU.UTF-8/UTF-8 \
......@@ -454,6 +456,7 @@
-sv_SE.ISO-8859-15/ISO-8859-15 \
-sw_KE/UTF-8 \
-sw_TZ/UTF-8 \
-syr/UTF-8 \
-szl_PL/UTF-8 \
-ta_IN/UTF-8 \
-ta_LK/UTF-8 \
......
debian/rules
+ 127
− 351
View file @ 03cff3ea
This diff is collapsed.
debian/tests/build
+ 1
− 1
View file @ 03cff3ea
......@@ -23,7 +23,7 @@ case "$arch" in
CROSS_ARCHS="armhf";;
*)
echo "Skipping cross builds on $arch"
exit 0;;
exit 77;;
esac
set -x
......
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
Apertis Website Terms of Use Privacy Policy