diff options
| -rw-r--r-- | patches/owfs-2.7p26/owfs-2.7p7-disable-offtpd.diff | 31 | ||||
| -rw-r--r-- | patches/owfs-2.7p26/series | 1 | ||||
| l--------- | patches/owfs-2.8p6/autogen.sh (renamed from patches/owfs-2.7p26/autogen.sh) | 0 | ||||
| -rw-r--r-- | patches/owfs-2.8p6/owfs-2.7p7-pkgconfigize-fuse.diff (renamed from patches/owfs-2.7p26/owfs-2.7p7-pkgconfigize-fuse.diff) | 0 | ||||
| -rw-r--r-- | patches/owfs-2.8p6/owfs-2.8p6-add-missing-semicolon.diff | 31 | ||||
| -rw-r--r-- | patches/owfs-2.8p6/series | 2 | ||||
| -rw-r--r-- | rules/owfs.make | 18 |
7 files changed, 39 insertions, 44 deletions
diff --git a/patches/owfs-2.7p26/owfs-2.7p7-disable-offtpd.diff b/patches/owfs-2.7p26/owfs-2.7p7-disable-offtpd.diff deleted file mode 100644 index e362528a4..000000000 --- a/patches/owfs-2.7p26/owfs-2.7p7-disable-offtpd.diff +++ /dev/null @@ -1,31 +0,0 @@ -From: Robert Schwebel <r.schwebel@pengutronix.de> -Subject: cleanup configure output - -The configure script currently outputs this: - -checking if owftpd is enabled... configure: error: no -make: *** -[/ptx/work/minime/rsc/svn/OSELAS.BSP-phyCORE-trunk/platform-phyCORE-i.MX27/state/owfs.prepare] -Error 1 - -Fixup for proper linebreaks. - -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: owfs-2.7p7/configure.ac -=================================================================== ---- owfs-2.7p7.orig/configure.ac -+++ owfs-2.7p7/configure.ac -@@ -371,7 +371,7 @@ AC_ARG_ENABLE(owftpd, - [ - if test ! "$enableval" = "yes" ; then - ENABLE_OWFTPD="false" -- AC_MSG_ERROR([no]) -+ AC_MSG_RESULT([no]) - else - if test ! "${ENABLE_MT}" = "true" ; then - AC_MSG_ERROR([owftpd needs multithreading]) diff --git a/patches/owfs-2.7p26/series b/patches/owfs-2.7p26/series deleted file mode 100644 index 5678fedea..000000000 --- a/patches/owfs-2.7p26/series +++ /dev/null @@ -1 +0,0 @@ -owfs-2.7p7-pkgconfigize-fuse.diff diff --git a/patches/owfs-2.7p26/autogen.sh b/patches/owfs-2.8p6/autogen.sh index 9f8a4cb7d..9f8a4cb7d 120000 --- a/patches/owfs-2.7p26/autogen.sh +++ b/patches/owfs-2.8p6/autogen.sh diff --git a/patches/owfs-2.7p26/owfs-2.7p7-pkgconfigize-fuse.diff b/patches/owfs-2.8p6/owfs-2.7p7-pkgconfigize-fuse.diff index 8c3334695..8c3334695 100644 --- a/patches/owfs-2.7p26/owfs-2.7p7-pkgconfigize-fuse.diff +++ b/patches/owfs-2.8p6/owfs-2.7p7-pkgconfigize-fuse.diff diff --git a/patches/owfs-2.8p6/owfs-2.8p6-add-missing-semicolon.diff b/patches/owfs-2.8p6/owfs-2.8p6-add-missing-semicolon.diff new file mode 100644 index 000000000..15d446950 --- /dev/null +++ b/patches/owfs-2.8p6/owfs-2.8p6-add-missing-semicolon.diff @@ -0,0 +1,31 @@ +Subject: owfs: add missing ; +From: Robert Schwebel <r.schwebel@pengutronix.de> + +Without this patch, we get this compile error: + +libtool: compile: arm-1136jfs-linux-gnueabi-gcc -DHAVE_CONFIG_H -I. -I../../../../src/include -isystem /home/rsc/svn/oselas/bsp/pengutronix/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-ARM-reference/sysroot-target/include -isystem /home/rsc/svn/oselas/bsp/pengutronix/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-ARM-reference/sysroot-target/usr/include -I../include -fexceptions -Wall -W -Wundef -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wredundant-decls -D__EXTENSIONS__ -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=500 -D_BSD_SOURCE=1 -D_ISOC99_SOURCE=1 -D_POSIX_C_SOURCE=200112L -pthread -g -O2 -D_XOPEN_SOURCE=500 -D_BSD_SOURCE=1 -D_ISOC99_SOURCE=1 -D_POSIX_C_SOURCE=200112L -MT ow_simultaneous.lo -MD -MP -MF .deps/ow_simultaneous.Tpo -c ow_simultaneous.c -fPIC -DPIC -o .libs/ow_simultaneous.o +ow_simultaneous.c: In function 'FS_Test_Simultaneous': +ow_simultaneous.c:81: warning: unused parameter 'type' +ow_simultaneous.c:81: warning: unused parameter 'pn' +ow_simultaneous.c: In function 'FS_w_convert_temp': +ow_simultaneous.c:152: error: expected ';' before 'return' + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + +--- + module/owlib/src/c/ow_simultaneous.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: owfs-2.8p6/module/owlib/src/c/ow_simultaneous.c +=================================================================== +--- owfs-2.8p6.orig/module/owlib/src/c/ow_simultaneous.c ++++ owfs-2.8p6/module/owlib/src/c/ow_simultaneous.c +@@ -148,7 +148,7 @@ static ZERO_OR_ERROR FS_w_convert_temp(s + break ; + } + if ( BAD(ret) ) { +- LEVEL_DEBUG("Trouble setting simultaneous for %s",pn_directory->path) ++ LEVEL_DEBUG("Trouble setting simultaneous for %s",pn_directory->path); + return -EINVAL ; + } + Cache_Add_Simul(simul_temp, pn_directory); // Mark start time diff --git a/patches/owfs-2.8p6/series b/patches/owfs-2.8p6/series new file mode 100644 index 000000000..88e459cd8 --- /dev/null +++ b/patches/owfs-2.8p6/series @@ -0,0 +1,2 @@ +owfs-2.7p7-pkgconfigize-fuse.diff +owfs-2.8p6-add-missing-semicolon.diff diff --git a/rules/owfs.make b/rules/owfs.make index bbf23418c..284371bab 100644 --- a/rules/owfs.make +++ b/rules/owfs.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_OWFS) += owfs # # Paths and names # -OWFS_VERSION := 2.7p26 +OWFS_VERSION := 2.8p6 OWFS := owfs-$(OWFS_VERSION) OWFS_SUFFIX := tar.gz OWFS_URL := $(PTXCONF_SETUP_SFMIRROR)/owfs/$(OWFS).$(OWFS_SUFFIX) @@ -41,10 +41,6 @@ $(OWFS_SOURCE): # OWFS_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --enable-shared \ - --enable-static \ - --disable-fast-install \ - --enable-libtool-lock \ --disable-debian \ --disable-debug \ --enable-owlib \ @@ -53,12 +49,14 @@ OWFS_AUTOCONF := \ --enable-mt \ --disable-i2c \ --disable-ha7 \ + --disable-w1 \ --disable-owhttpd \ --disable-owftpd \ --disable-owserver \ --disable-ownet \ --disable-owtap \ - --disable-owside \ + --disable-owmalloc \ + --disable-owtraffic \ --disable-owmon \ --disable-owcapi \ --disable-swig \ @@ -71,8 +69,6 @@ OWFS_AUTOCONF := \ --disable-zero \ --disable-usb \ --disable-parport \ - --with-gnu-ld \ - --with-pic \ --without-perl5 \ --without-php \ --without-phpconfig \ @@ -80,8 +76,6 @@ OWFS_AUTOCONF := \ --without-pythonconfig \ --without-tcl -# --with-libusb-config=PATH - ifdef PTXCONF_OWFS__OWSHELL OWFS_AUTOCONF += --enable-owshell else @@ -111,10 +105,10 @@ $(STATEDIR)/owfs.targetinstall: @$(call install_fixup, owfs,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") @$(call install_fixup, owfs,DESCRIPTION,missing) - @$(call install_lib, owfs, 0, 0, 0644, libow-2.7) + @$(call install_lib, owfs, 0, 0, 0644, libow-2.8) ifdef PTXCONF_OWFS__OWFS - @$(call install_copy, owfs, 0, 0, 0755, /usr/bin/owfs) + @$(call install_copy, owfs, 0, 0, 0755, -, /usr/bin/owfs) endif @$(call install_finish, owfs) |