Signed-off-by: Ladislav Michl <[email protected]> --- .../0001-make-liblzo-optional.patch | 8 ++++---- patches/mtd-utils-20090701-1/series | 1 - rules/mtd-utils.make | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) rename patches/{mtd-utils-20090701-1 => mtd-utils-1.3.0}/0001-make-liblzo-optional.patch (92%) delete mode 100644 patches/mtd-utils-20090701-1/series
diff --git a/patches/mtd-utils-20090701-1/0001-make-liblzo-optional.patch b/patches/mtd-utils-1.3.0/0001-make-liblzo-optional.patch similarity index 92% rename from patches/mtd-utils-20090701-1/0001-make-liblzo-optional.patch rename to patches/mtd-utils-1.3.0/0001-make-liblzo-optional.patch index 37ce1de..8778956 100644 --- a/patches/mtd-utils-20090701-1/0001-make-liblzo-optional.patch +++ b/patches/mtd-utils-1.3.0/0001-make-liblzo-optional.patch @@ -63,19 +63,19 @@ diff --git a/mkfs.ubifs/Makefile b/mkfs.ubifs/Makefile index a678b0a..d4d897f 100644 --- a/mkfs.ubifs/Makefile +++ b/mkfs.ubifs/Makefile -@@ -5,7 +5,11 @@ ALL_SOURCES=*.[ch] hashtable/*.[ch] +@@ -6,7 +6,11 @@ TARGETS = mkfs.ubifs --LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid -L../ubi-utils/ -lubi +-LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi +ifneq ($(WITHOUT_LZO), 1) +mkfs.ubifs_LIBLZO = -llzo2 +endif + -+LDLIBS_mkfs.ubifs = -lz $(mkfs.ubifs_LIBLZO) -lm -luuid -L../ubi-utils/ -lubi ++LDLIBS_mkfs.ubifs = -lz $(mkfs.ubifs_LIBLZO) -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi + LDLIBS_mkfs.ubifs += $(ZLIBLDFLAGS) $(LZOLDFLAGS) include ../common.mk - diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c index e378c5d..55ed1b6 100644 --- a/mkfs.ubifs/compr.c diff --git a/patches/mtd-utils-20090701-1/series b/patches/mtd-utils-20090701-1/series deleted file mode 100644 index 66319ed..0000000 --- a/patches/mtd-utils-20090701-1/series +++ /dev/null @@ -1 +0,0 @@ -0001-make-liblzo-optional.patch diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make index 0680c34..113270d 100644 --- a/rules/mtd-utils.make +++ b/rules/mtd-utils.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_MTD_UTILS) += mtd-utils # # Paths and names # -MTD_UTILS_VERSION := 20090701-1 +MTD_UTILS_VERSION := 1.3.0 MTD_UTILS := mtd-utils-$(MTD_UTILS_VERSION) MTD_UTILS_SUFFIX := tar.bz2 MTD_UTILS_URL := ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS_SUFFIX) -- 1.5.3.8 -- ptxdist mailing list [email protected]
