[oe-commits] org.oe.dev squashfs-tools: Added release 3.3.

[likewise commit]

squashfs-tools: Added release 3.3.

Author: likewise at openembedded.org
Branch: org.openembedded.dev
Revision: 87340602aa07df333706fb76344ef87e4c5322d5
ViewMTN: http://monotone.openembedded.org/revision/info/87340602aa07df333706fb76344ef87e4c5322d5
Files:
1
packages/squashfs-tools/squashfs-tools-3.3
packages/squashfs-tools/squashfs-tools-3.3/Makefile.patch
packages/squashfs-tools/squashfs-tools-native_3.3.bb
packages/squashfs-tools/squashfs-tools.inc
packages/squashfs-tools/squashfs-tools_3.3.bb
packages/gtk+/gtk-2.10.inc
Diffs:

#
# mt diff -rccb8e6064f587afdc66d3e09753bb3e85993c0f5 -r87340602aa07df333706fb76344ef87e4c5322d5
#
# 
# 
# add_dir "packages/squashfs-tools/squashfs-tools-3.3"
# 
# add_file "packages/squashfs-tools/squashfs-tools-3.3/Makefile.patch"
#  content [3d380232f2f1d9ab67d6fbb4593bce52013383cd]
# 
# add_file "packages/squashfs-tools/squashfs-tools-native_3.3.bb"
#  content [e15a76e677efe0fad5f48b913ceaad1a5ebdaf13]
# 
# add_file "packages/squashfs-tools/squashfs-tools.inc"
#  content [ad22119a3295e974023b38b75c8d957cc0b2b338]
# 
# add_file "packages/squashfs-tools/squashfs-tools_3.3.bb"
#  content [5eadd1237aad7a0241a37187a23bc234844abce4]
# 
# patch "packages/gtk+/gtk-2.10.inc"
#  from [162cf297e438ae9441b397783b38eb85d188382d]
#    to [0b317cf35adb0014c5b13d515f1e4a88a1395969]
# 
============================================================
--- packages/squashfs-tools/squashfs-tools-3.3/Makefile.patch	3d380232f2f1d9ab67d6fbb4593bce52013383cd
+++ packages/squashfs-tools/squashfs-tools-3.3/Makefile.patch	3d380232f2f1d9ab67d6fbb4593bce52013383cd
@@ -0,0 +1,32 @@
+Index: squashfs-tools/Makefile
+===================================================================
+--- squashfs-tools.orig/Makefile	2007-11-16 20:32:00.000000000 +0100
++++ squashfs-tools/Makefile	2007-11-16 20:37:04.000000000 +0100
+@@ -1,19 +1,24 @@
+ INCLUDEDIR = .
+ 
+-CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2
++LOCAL_CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+ 
+ all: mksquashfs unsquashfs
+ 
+ mksquashfs: mksquashfs.o read_fs.o sort.o
+-	$(CC) mksquashfs.o read_fs.o sort.o -lz -lpthread -lm -o $@
++	$(CC) $(LDFLAGS) mksquashfs.o read_fs.o sort.o -lz -lpthread -lm -o $@
+ 
+ mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h
++	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) -c -o mksquashfs.o mksquashfs.c
+ 
+ read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h
++	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) -c -o read_fs.o read_fs.c
+ 
+ sort.o: sort.c squashfs_fs.h global.h sort.h
++	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) -c -o sort.o sort.c
+ 
+ unsquashfs: unsquashfs.o
+-	$(CC) unsquashfs.o -lz -o $@
++	$(CC) $(LDFLAGS) unsquashfs.o -lz -o $@
+ 
+ unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h
++	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) -c -o unsquashfs.o -lz -o $@
++
============================================================
--- packages/squashfs-tools/squashfs-tools-native_3.3.bb	e15a76e677efe0fad5f48b913ceaad1a5ebdaf13
+++ packages/squashfs-tools/squashfs-tools-native_3.3.bb	e15a76e677efe0fad5f48b913ceaad1a5ebdaf13
@@ -0,0 +1,10 @@
+require squashfs-tools_${PV}.bb
+
+inherit native
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+PACKAGES = ""
+
+do_stage () {
+	install -m 0755 mksquashfs ${STAGING_BINDIR}/
+}
============================================================
--- packages/squashfs-tools/squashfs-tools.inc	ad22119a3295e974023b38b75c8d957cc0b2b338
+++ packages/squashfs-tools/squashfs-tools.inc	ad22119a3295e974023b38b75c8d957cc0b2b338
@@ -0,0 +1,19 @@
+DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux."
+SECTION = "base"
+LICENSE = "GPLv2"
+PR = "r0"
+
+DEPENDS = "zlib"
+
+S = "${WORKDIR}/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}/squashfs-tools"
+
+prefix = ""
+
+do_compile() {
+	oe_runmake mksquashfs
+}
+
+do_install () {
+	install -d ${D}${sbindir}
+	install -m 0755 mksquashfs ${D}${sbindir}/
+}
============================================================
--- packages/squashfs-tools/squashfs-tools_3.3.bb	5eadd1237aad7a0241a37187a23bc234844abce4
+++ packages/squashfs-tools/squashfs-tools_3.3.bb	5eadd1237aad7a0241a37187a23bc234844abce4
@@ -0,0 +1,7 @@
+require squashfs-tools.inc
+
+# some release have .tgz, some have .tar.gz, so keep that outside the .inc file
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tgz \
+file://Makefile.patch;patch=1"
+
============================================================
--- packages/gtk+/gtk-2.10.inc	162cf297e438ae9441b397783b38eb85d188382d
+++ packages/gtk+/gtk-2.10.inc	0b317cf35adb0014c5b13d515f1e4a88a1395969
@@ -80,9 +80,9 @@ python populate_packages_prepend () {
 	immodules_root = os.path.join(gtk_libdir, 'immodules')
 	printmodules_root = os.path.join(gtk_libdir, 'printbackends');
 
-	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
-	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
-	do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
+#	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
+#	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
+#	do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
 
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)