package/cups-filters: fix broken symlink in installation
PATCH 1/1 package/cups-filters: fix broken symlink in installation
From: Carlos Santos <[email protected]>
The patch used previously to support versions of ln lacking the '-r' option generated broken links:
$ file target/usr/lib/cups/backend/driverless
target/usr/lib/cups/backend/driverless: broken symbolic link to ../../usr/lib/cups/driver/driverlessAdd a squashing of two patches already sent upstream that provide a better solution:
https://github.com/OpenPrinting/cups-filters/pull/154
https://github.com/OpenPrinting/cups-filters/pull/157
--- ...lative-linking-with-absolute-linking.patch | 46 ---- ...old-ln-versions-without-the-r-option.patch | 214 ++++++++++++++++++ package/cups-filters/cups-filters.mk | 2 +- 3 files changed, 215 insertions(+), 47 deletions(-) delete mode 100644 package/cups-filters/0001-Replace-relative-linking-with-absolute-linking.patch create mode 100644 package/cups-filters/0001-install-support-old-ln-versions-without-the-r-option.patch
package/cups-filters/0001-Replace-relative-linking-with-absolute-linking.patch deleted +0 -46
@@ -1,46 +0,0 @@ -From c26b4c3550557442890f2f790d4f8b61a3734c1f Mon Sep 17 00:00:00 2001 -From: Olivier Schonken <[email protected]> -Date: Thu, 8 Mar 2018 12:32:23 +0200 -Subject: [PATCH] install: don't use ln -r - -Oldish enterprise-class distributions have too old versions of -coreutils, with ln not supporting -r. - -So we fake it. - -ln -r would create minimalist relative paths, but they are not -trivial to generate. Instead, we always create paths relative to the -root, i.e.: - - ln -s -r /usr/bin/foo /usr/sbin/foo - -would create: /usr/sbin/foo -> ../bin/foo -while we do : /usr/sbin/foo -> ../../usr/bin/foo - -Signed-off-by: Olivier Schonken <[email protected]> ---- - Makefile.am | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index d959227..b49914a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -998,11 +998,11 @@ install-exec-hook: - $(INSTALL) -d -m 755 $(DESTDIR)$(pkgfilterdir) - $(INSTALL) -d -m 755 $(DESTDIR)$(pkgbackenddir) - if ENABLE_FOOMATIC -- $(LN_S) -r -f $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir) -+ $(LN_S) -f ../..$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir) - endif - if ENABLE_DRIVERLESS -- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir) -- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir) -+ $(LN_S) -f ../..$(pkgppdgendir)/driverless $(DESTDIR)$(bindir) -+ $(LN_S) -f ../..$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir) - endif - if ENABLE_BRAILLE - $(LN_S) -f imagetobrf $(DESTDIR)$(pkgfilterdir)/imagetoubrl --- -2.14.1 -
package/cups-filters/0001-install-support-old-ln-versions-without-the-r-option.patch new file +214 -0
214 lines not on this page · raw message
package/cups-filters/cups-filters.mk +1 -1
@@ -8,7 +8,7 @@ CUPS_FILTERS_VERSION = 1.25.4 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING -# 0001-Replace-relative-linking-with-absolute-linking.patch +# 0001-install-support-old-ln-versions-without-the-r-option.patch CUPS_FILTERS_AUTORECONF = YES CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg
Signature · 1 line
2.18.1
PATCH 1/1 package/cups-filters: fix broken symlink in installation
Quoted 5 lines · unixmania at gmail.com
From: Carlos Santos <[email protected]>
The patch used previously to support versions of ln lacking the '-r' option generated broken links:
Quoted 8 lines
$ file target/usr/lib/cups/backend/driverless target/usr/lib/cups/backend/driverless: broken symbolic link to ../../usr/lib/cups/driver/driverlessAdd a squashing of two patches already sent upstream that provide a better solution:
https://github.com/OpenPrinting/cups-filters/pull/154
https://github.com/OpenPrinting/cups-filters/pull/157
We prefer upstream patches to be taken as-is if possible, so no squashing. This
makes it easier to verify that the patch has been applied upstream when bumping. However, it's not that important, so I've applied to master as is, thanks.
Regards,
Arnout
Quoted 2 lines
Signed-off-by Carlos Santos <[email protected]>
PATCH 1/1 package/cups-filters: fix broken symlink in installation
In reply to unixmania at gmail.comQuoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"unixmania" == unixmania <[email protected]> writes:
From: Carlos Santos <[email protected]>
The patch used previously to support versions of ln lacking the '-r' option generated broken links:$ file target/usr/lib/cups/backend/driverless target/usr/lib/cups/backend/driverless: broken symbolic link to ../../usr/lib/cups/driver/driverless
Quoted 7 lines
Add a squashing of two patches already sent upstream that provide a better solution:
https://github.com/OpenPrinting/cups-filters/pull/154
https://github.com/OpenPrinting/cups-filters/pull/157Signed-off-by Carlos Santos <[email protected]>
Committed to 2019.02.x, 2019.05.x and 2019.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard