From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/watchdog/Makefile | 4 ---- package/watchdog/patches/patch-src_mntent_c | 11 +++++++++++ package/watchdog/patches/patch-src_umount_c | 11 +++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 package/watchdog/patches/patch-src_mntent_c create mode 100644 package/watchdog/patches/patch-src_umount_c (limited to 'package/watchdog') diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile index eda6f83cb..14abf0ca3 100644 --- a/package/watchdog/Makefile +++ b/package/watchdog/Makefile @@ -15,10 +15,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,WATCHDOG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= gnu -BUILD_STYLE:= auto -INSTALL_STYLE:= auto - post-install: ${INSTALL_DIR} ${IDIR_WATCHDOG}/usr/sbin ${IDIR_WATCHDOG}/etc/ ${INSTALL_DATA} ./files/watchdog.conf ${IDIR_WATCHDOG}/etc/ diff --git a/package/watchdog/patches/patch-src_mntent_c b/package/watchdog/patches/patch-src_mntent_c new file mode 100644 index 000000000..f2277bdbf --- /dev/null +++ b/package/watchdog/patches/patch-src_mntent_c @@ -0,0 +1,11 @@ +--- watchdog-5.7.orig/src/mntent.c 2010-01-06 13:42:08.000000000 +0100 ++++ watchdog-5.7/src/mntent.c 2010-02-06 04:39:34.804334839 +0100 +@@ -157,7 +157,7 @@ my_getmntent (mntFILE *mfp) { + if (fgets (buf, sizeof(buf), mfp->mntent_fp) == NULL) + return NULL; + +- s = index (buf, '\n'); ++ s = strchr (buf, '\n'); + if (s == NULL) { + /* extremely long line - assume file was corrupted */ + mfp->mntent_errs = 1; diff --git a/package/watchdog/patches/patch-src_umount_c b/package/watchdog/patches/patch-src_umount_c new file mode 100644 index 000000000..6b5a82c1f --- /dev/null +++ b/package/watchdog/patches/patch-src_umount_c @@ -0,0 +1,11 @@ +--- watchdog-5.7.orig/src/umount.c 2010-01-06 13:42:08.000000000 +0100 ++++ watchdog-5.7/src/umount.c 2010-02-06 04:39:47.664334843 +0100 +@@ -212,7 +212,7 @@ umount_one (const char *spec, const char + if (res < 0) + umnt_err2 = errno; + /* Do not complain about remote NFS mount points */ +- if (errno == ENOENT && index(spec, ':')) ++ if (errno == ENOENT && strchr(spec, ':')) + umnt_err2 = 0; + } + } -- cgit v1.2.3