mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] squashfs-tools: remove old patches for v3.4 (version removed)
@ 2018-10-12 18:42 Andreas Pretzsch
  0 siblings, 0 replies; only message in thread
From: Andreas Pretzsch @ 2018-10-12 18:42 UTC (permalink / raw)
  To: ptxdist

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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2018-10-12 18:42 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-12 18:42 [ptxdist] [PATCH] squashfs-tools: remove old patches for v3.4 (version removed) Andreas Pretzsch

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox