mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Andreas Pretzsch <apr@cn-eng.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] squashfs-tools: remove old patches for v3.4 (version removed)
Date: Fri, 12 Oct 2018 20:42:22 +0200	[thread overview]
Message-ID: <1539369742-28229-1-git-send-email-apr@cn-eng.de> (raw)

In commit ccf3982 (part of ptxdist-2018.08.0), support for old
squashfs-tools 3.4 was dropped. Remove leftover patches.

Signed-off-by: Andreas Pretzsch <apr@cn-eng.de>
---
 patches/squashfs3.4/series             |  1 -
 patches/squashfs3.4/squashfs_libs.diff | 34 --------------------------
 2 files changed, 35 deletions(-)
 delete mode 100644 patches/squashfs3.4/series
 delete mode 100644 patches/squashfs3.4/squashfs_libs.diff

diff --git a/patches/squashfs3.4/series b/patches/squashfs3.4/series
deleted file mode 100644
index de458cdb8..000000000
--- a/patches/squashfs3.4/series
+++ /dev/null
@@ -1 +0,0 @@
-squashfs_libs.diff
diff --git a/patches/squashfs3.4/squashfs_libs.diff b/patches/squashfs3.4/squashfs_libs.diff
deleted file mode 100644
index b70a5088d..000000000
--- a/patches/squashfs3.4/squashfs_libs.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Subject: Add way to change linker settings
-From: Erwin Rol <erwin@erwinrol.com>
-
-When cross compiling the linker can not find libz, this patch
-adds a LIBS variable that makes it possible to pass the right
-linker flags.
-
-Signed-off-by: Erwin Rol <erwin@erwinrol.com>
-
---- squashfs3.4/squashfs-tools/Makefile.orig	2010-02-27 00:01:56.000000000 +0100
-+++ squashfs3.4/squashfs-tools/Makefile	2010-02-27 00:02:46.000000000 +0100
-@@ -4,10 +4,12 @@
- 
- CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2
- 
-+LIBS := -lz -lpthread -lm 
-+
- all: mksquashfs unsquashfs
- 
- mksquashfs: mksquashfs.o read_fs.o sort.o
--	$(CC) mksquashfs.o read_fs.o sort.o -lz -lpthread -lm -o $@
-+	$(CC) mksquashfs.o read_fs.o sort.o $(LIBS) $(LDFLAGS) -o $@
- 
- mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h
- 
-@@ -16,7 +18,7 @@
- sort.o: sort.c squashfs_fs.h global.h sort.h
- 
- unsquashfs: unsquashfs.o
--	$(CC) unsquashfs.o -lz -lpthread -lm -o $@
-+	$(CC) unsquashfs.o $(LIBS) $(LDFLAGS) -o $@
- 
- unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h
- 
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

                 reply	other threads:[~2018-10-12 18:42 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1539369742-28229-1-git-send-email-apr@cn-eng.de \
    --to=apr@cn-eng.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox