Skip to contentSkip to conversation

package/cups-filters: fix broken symlink in installation

PATCH New unixmania at gmail.com 1 participant 1 message Sep 19, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 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/driverless

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/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
deleted file mode 100644
index e4b35cda39..0000000000
@@ -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
index 784cedfc1e..5355fc019e 100644
@@ -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