OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 18-Apr-2009 19:46:20
Branch: HEAD Handle: 2009041818461900
Modified files:
openpkg-src/amd amd.patch
Log:
use the better fix for Linux from Debian package
Summary:
Revision Changes Path
1.19 +24 -9 openpkg-src/amd/amd.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/amd/amd.patch
============================================================================
$ cvs diff -u -r1.18 -r1.19 amd.patch
--- openpkg-src/amd/amd.patch 18 Apr 2009 11:00:47 -0000 1.18
+++ openpkg-src/amd/amd.patch 18 Apr 2009 17:46:19 -0000 1.19
@@ -126,20 +126,35 @@
if (gopt.auto_attrcache == 0) {
xstrlcat(opts, ",", sizeof(opts));
Index: configure
---- configure.orig 2009-04-18 12:48:36 +0200
-+++ configure 2009-04-18 12:50:17 +0200
-@@ -20952,8 +20952,13 @@
+--- configure
++++ configure
+@@ -20960,7 +20960,14 @@
{
if (argc > 1)
-+#if defined(UTS_RELEASE)
++#ifdef UTS_RELEASE
printf("%s", UTS_RELEASE);
--
-+#elif defined(LINUX_VERSION_CODE)
-+ printf("%d", LINUX_VERSION_CODE);
+#else
-+ printf("%d", 0);
++# define AMU_MA(a) ((a) >> 16)
++# define AMU_MI(a) (((a) & 0xffff) >> 8)
++# define AMU_PL(a) ((a) & 0xff)
++ printf("%d.%d.%d", AMU_MA(LINUX_VERSION_CODE), AMU_MI(LINUX_VERSION_CODE),
AMU_PL(LINUX_VERSION_CODE));
+#endif
+
exit(0);
}
- _ACEOF
+Index: conf/mount/mount_linux.c
+--- conf/mount/mount_linux.c
++++ conf/mount/mount_linux.c
+@@ -277,7 +277,11 @@
+ int errorcode;
+
+ /* Fake some values for linux */
++#if NFS_MOUNT_VERSION > 4
++ mnt_data->version = 4;
++#else
+ mnt_data->version = NFS_MOUNT_VERSION;
++#endif /* NFS_MOUNT_VERSION > 4 */
+ if (!mnt_data->timeo) {
+ #ifdef MNT2_NFS_OPT_TCP
+ if (mnt_data->flags & MNT2_NFS_OPT_TCP)
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
