| Message ID | 1366881542-15350-3-git-send-email-spdawson@gmail.com |
|---|---|
| State | Changes Requested |
| Headers | show |
Simon, Pascal, On Thu, 25 Apr 2013 10:19:02 +0100, spdawson@gmail.com wrote: > diff --git a/package/wvdial/wvdial-0001-ppp-install-prefix.patch b/package/wvdial/wvdial-0001-ppp-install-prefix.patch > new file mode 100644 > index 0000000..5db9648 > --- /dev/null > +++ b/package/wvdial/wvdial-0001-ppp-install-prefix.patch > @@ -0,0 +1,16 @@ > +Fix install prefix for PPP configuration files. > + > +Signed-off-by: Simon Dawson <spdawson@gmail.com> > + > +diff -Nurp a/Makefile b/Makefile > +--- a/Makefile 2011-08-04 20:30:52.000000000 +0100 > ++++ b/Makefile 2013-04-25 09:11:36.916376367 +0100 > +@@ -23,7 +23,7 @@ LIBS+=$(PC_LIBS) > + > + BINDIR=${prefix}/bin > + MANDIR=${prefix}/share/man > +-PPPDIR=/etc/ppp/peers > ++PPPDIR=${prefix}/etc/ppp/peers This one looks suspicious: /etc is usually not in the prefix, other it would be in /usr/etc/ppp/peers. Could you explain what's going on here? > +WVDIAL_VERSION = 1.61 > +WVDIAL_SITE = http://wvdial.googlecode.com/files > +WVDIAL_SOURCE = wvdial-$(WVDIAL_VERSION).tar.bz2 > +WVDIAL_DEPENDENCIES = wvstreams > + > +WVDIAL_LICENSE = LGPLv2 I haven't checked the code, is it really LGPLv2, and not LGPLv2.1 ? No "+" ? > +WVDIAL_LICENSE_FILES = COPYING.LIB > + > +# N.B. parallel make fails > +WVDIAL_MAKE = $(MAKE1) > + > +WVDIAL_MAKE_ENV += \ > + CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" WVSTREAMS="$(WVSTREAMS_DIR)" Use $(TARGET_CONFIGURE_OPTS) instead of CC/CXX. I don't really like to see the wvdial build process poke into the wvstreams build directory. Each component should normally build even if the build directories of its dependencies have been removed. Is it possible to point it to the headers+libraries installed in $(STAGING_DIR) instead? > +WVDIAL_INSTALL_TARGET_OPT += prefix="$(TARGET_DIR)/usr" install > +WVDIAL_UNINSTALL_TARGET_OPT += prefix="$(TARGET_DIR)/usr" uninstall Those are used only once, so I would rather put them directly into the install/uninstall commands below. Other than that, looks good. Thanks! Thomas
Hi Thomas; thanks for the feedback. On 25 April 2013 14:57, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: >> + BINDIR=${prefix}/bin >> + MANDIR=${prefix}/share/man >> +-PPPDIR=/etc/ppp/peers >> ++PPPDIR=${prefix}/etc/ppp/peers > > This one looks suspicious: /etc is usually not in the prefix, other it > would be in /usr/etc/ppp/peers. Could you explain what's going on here? You're right --- this needs fixing. >> +WVDIAL_VERSION = 1.61 >> +WVDIAL_SITE = http://wvdial.googlecode.com/files >> +WVDIAL_SOURCE = wvdial-$(WVDIAL_VERSION).tar.bz2 >> +WVDIAL_DEPENDENCIES = wvstreams >> + >> +WVDIAL_LICENSE = LGPLv2 > > I haven't checked the code, is it really LGPLv2, and not LGPLv2.1 ? No > "+" ? Yes, and it's even titled "GNU LIBRARY GENERAL PUBLIC LICENSE Version 2" in the COPYING.LIB file; I think the codebase is just quite old and unloved. >> +WVDIAL_MAKE_ENV += \ >> + CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" WVSTREAMS="$(WVSTREAMS_DIR)" > > Use $(TARGET_CONFIGURE_OPTS) instead of CC/CXX. I don't really like to > see the wvdial build process poke into the wvstreams build directory. > Each component should normally build even if the build directories of > its dependencies have been removed. Is it possible to point it to the > headers+libraries installed in $(STAGING_DIR) instead? Okay; understood. >> +WVDIAL_INSTALL_TARGET_OPT += prefix="$(TARGET_DIR)/usr" install >> +WVDIAL_UNINSTALL_TARGET_OPT += prefix="$(TARGET_DIR)/usr" uninstall > > Those are used only once, so I would rather put them directly into the > install/uninstall commands below. Okay. I'll fix the patch, and resubmit. Simon.
diff --git a/package/Config.in b/package/Config.in index 33d75a9..84a92e1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -777,6 +777,7 @@ source "package/wireless-regdb/Config.in" source "package/wireless_tools/Config.in" source "package/wireshark/Config.in" source "package/wpa_supplicant/Config.in" +source "package/wvdial/Config.in" source "package/xinetd/Config.in" source "package/xl2tp/Config.in" diff --git a/package/wvdial/Config.in b/package/wvdial/Config.in new file mode 100644 index 0000000..2dc93ab --- /dev/null +++ b/package/wvdial/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_WVDIAL + bool "wvdial" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_MMU # wvstreams + select BR2_PACKAGE_WVSTREAMS + help + wvdial with support for software flow control and asyncmaps. + + http://wvdial.googlecode.com/ diff --git a/package/wvdial/wvdial-0001-ppp-install-prefix.patch b/package/wvdial/wvdial-0001-ppp-install-prefix.patch new file mode 100644 index 0000000..5db9648 --- /dev/null +++ b/package/wvdial/wvdial-0001-ppp-install-prefix.patch @@ -0,0 +1,16 @@ +Fix install prefix for PPP configuration files. + +Signed-off-by: Simon Dawson <spdawson@gmail.com> + +diff -Nurp a/Makefile b/Makefile +--- a/Makefile 2011-08-04 20:30:52.000000000 +0100 ++++ b/Makefile 2013-04-25 09:11:36.916376367 +0100 +@@ -23,7 +23,7 @@ LIBS+=$(PC_LIBS) + + BINDIR=${prefix}/bin + MANDIR=${prefix}/share/man +-PPPDIR=/etc/ppp/peers ++PPPDIR=${prefix}/etc/ppp/peers + + include wvrules.mk + diff --git a/package/wvdial/wvdial-0002-uClibc-scandir.patch b/package/wvdial/wvdial-0002-uClibc-scandir.patch new file mode 100644 index 0000000..b611e94 --- /dev/null +++ b/package/wvdial/wvdial-0002-uClibc-scandir.patch @@ -0,0 +1,23 @@ +Fix wvdial so that it works with scandir as defined in uClibc. + +Signed-off-by: Simon Dawson <spdawson@gmail.com> + +diff -Nurp a/wvmodemscan.cc b/wvmodemscan.cc +--- a/wvmodemscan.cc 2009-09-29 18:27:28.000000000 +0100 ++++ b/wvmodemscan.cc 2012-07-28 14:03:56.359729660 +0100 +@@ -495,13 +495,13 @@ static int fileselect(const struct diren + // (no internal ISDN support) || !strncmp(e->d_name, "ttyI", 4); + } + +-#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 10) ++#if defined(__UCLIBC__) || (defined(__GLIBC__) && __GLIBC_PREREQ(2, 10)) + static int filesort(const dirent **e1, const dirent **e2) + #else + static int filesort(const void *_e1, const void *_e2) + #endif + { +-#if !(defined(__GLIBC__) && __GLIBC_PREREQ(2, 10)) ++#if !(defined(__UCLIBC__) || (defined(__GLIBC__) && __GLIBC_PREREQ(2, 10))) + dirent const * const *e1 = (dirent const * const *)_e1; + dirent const * const *e2 = (dirent const * const *)_e2; + #endif diff --git a/package/wvdial/wvdial.mk b/package/wvdial/wvdial.mk new file mode 100644 index 0000000..8537813 --- /dev/null +++ b/package/wvdial/wvdial.mk @@ -0,0 +1,41 @@ +############################################################# +# +# wvdial +# +############################################################# + +WVDIAL_VERSION = 1.61 +WVDIAL_SITE = http://wvdial.googlecode.com/files +WVDIAL_SOURCE = wvdial-$(WVDIAL_VERSION).tar.bz2 +WVDIAL_DEPENDENCIES = wvstreams + +WVDIAL_LICENSE = LGPLv2 +WVDIAL_LICENSE_FILES = COPYING.LIB + +# N.B. parallel make fails +WVDIAL_MAKE = $(MAKE1) + +WVDIAL_MAKE_ENV += \ + CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" WVSTREAMS="$(WVSTREAMS_DIR)" +WVDIAL_INSTALL_TARGET_OPT += prefix="$(TARGET_DIR)/usr" install +WVDIAL_UNINSTALL_TARGET_OPT += prefix="$(TARGET_DIR)/usr" uninstall + +define WVDIAL_BUILD_CMDS + $(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) -C $(@D) +endef + +define WVDIAL_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) \ + $(WVDIAL_INSTALL_TARGET_OPT) -C $(@D) +endef + +define WVDIAL_UNINSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) \ + $(WVDIAL_UNINSTALL_TARGET_OPT) -C $(@D) +endef + +define WVDIAL_CLEAN_CMDS + $(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) clean -C $(@D) +endef + +$(eval $(generic-package))