[Glibc-bsd-commits] r2217 - in trunk/kfreebsd-7/debian: . patches
ps-guest at alioth.debian.org
ps-guest at alioth.debian.org
Thu Jul 10 07:37:01 UTC 2008
Author: ps-guest
Date: 2008-07-10 07:37:00 +0000 (Thu, 10 Jul 2008)
New Revision: 2217
Added:
trunk/kfreebsd-7/debian/patches/101_subsecond_timestamp.diff
Modified:
trunk/kfreebsd-7/debian/changelog
trunk/kfreebsd-7/debian/control.in
trunk/kfreebsd-7/debian/patches/series
trunk/kfreebsd-7/debian/rules
Log:
* clean whitespace in debian/rules
* libdb-dev is now a real package, build-depend only on it.
* fix subsecond timestamp resolution handling for *times(arg, NULL)
syscall family. Exposed by touch. Closes #489894.
Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog 2008-07-08 17:59:02 UTC (rev 2216)
+++ trunk/kfreebsd-7/debian/changelog 2008-07-10 07:37:00 UTC (rev 2217)
@@ -1,4 +1,4 @@
-kfreebsd-7 (7.1~cvs20080707-1) EXPERIMENTAL; urgency=low
+kfreebsd-7 (7.1~cvs20080710-1) EXPERIMENTAL; urgency=low
[ Petr Salinger ]
* New upstream snapshot of RELENG_7
@@ -6,6 +6,9 @@
- refresh remaining patches
- 030_abi_cld.diff and 000_tcp.diff applied upstream
* Reduce number of kernel-image flavours
+ * Fix subsecond timestamp resolution handling for *times(arg, NULL)
+ syscall family. Exposed by touch. Closes #489894.
+ * libdb-dev is now a real package, build-depend only on it.
[ Aurelien Jarno ]
* Build by gcc-4.3
Modified: trunk/kfreebsd-7/debian/control.in
===================================================================
--- trunk/kfreebsd-7/debian/control.in 2008-07-08 17:59:02 UTC (rev 2216)
+++ trunk/kfreebsd-7/debian/control.in 2008-07-10 07:37:00 UTC (rev 2217)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: debhelper (>= 4.1.0), bzip2, quilt, freebsd6-buildutils (>= 6.2) [kfreebsd-i386 kfreebsd-amd64] | freebsd at major@-buildutils [kfreebsd-i386 kfreebsd-amd64] , libdb4.4-dev | libdb-dev, flex-old | flex, libbsd-dev [kfreebsd-i386 kfreebsd-amd64], gcc-4.3 [kfreebsd-i386 kfreebsd-amd64], sharutils
+Build-Depends: debhelper (>= 4.1.0), bzip2, quilt, freebsd6-buildutils (>= 6.2) [kfreebsd-i386 kfreebsd-amd64] | freebsd at major@-buildutils [kfreebsd-i386 kfreebsd-amd64] , libdb-dev, flex-old | flex, libbsd-dev [kfreebsd-i386 kfreebsd-amd64], gcc-4.3 [kfreebsd-i386 kfreebsd-amd64], sharutils
Standards-Version: 3.7.3
Package: kfreebsd-source- at version@
Added: trunk/kfreebsd-7/debian/patches/101_subsecond_timestamp.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/101_subsecond_timestamp.diff (rev 0)
+++ trunk/kfreebsd-7/debian/patches/101_subsecond_timestamp.diff 2008-07-10 07:37:00 UTC (rev 2217)
@@ -0,0 +1,36 @@
+There is inconsistence in subsecond timestamp resolution handling.
+See #489894, try to execute
+
+ touch k0; echo > k1; touch k2; echo > k3; touch k4; echo > k5
+ ls --full-time k? | cut -c25-
+
+The results are rather surprising:
+
+ 2008-07-10 00:55:01.020578000 +0200 k0
+ 2008-07-10 00:55:01.000000000 +0200 k1
+ 2008-07-10 00:55:01.022910000 +0200 k2
+ 2008-07-10 00:55:01.000000000 +0200 k3
+ 2008-07-10 00:55:01.023841000 +0200 k4
+ 2008-07-10 00:55:01.000000000 +0200 k5
+
+The problem seems to be in cooperating between vfs.timestamp_precision
+and utimes/futimes syscalls. Passed NULL to them means "now",
+lets the "now" have precision according to vfs.timestamp_precision.
+
+Index: sys/kern/vfs_syscalls.c
+===================================================================
+--- sys/kern/vfs_syscalls.c.orig
++++ sys/kern/vfs_syscalls.c
+@@ -2819,8 +2819,7 @@
+ int error;
+
+ if (usrtvp == NULL) {
+- microtime(&tv[0]);
+- TIMEVAL_TO_TIMESPEC(&tv[0], &tsp[0]);
++ vfs_timestamp(&tsp[0]);
+ tsp[1] = tsp[0];
+ } else {
+ if (tvpseg == UIO_SYSSPACE) {
+
+
+
Modified: trunk/kfreebsd-7/debian/patches/series
===================================================================
--- trunk/kfreebsd-7/debian/patches/series 2008-07-08 17:59:02 UTC (rev 2216)
+++ trunk/kfreebsd-7/debian/patches/series 2008-07-10 07:37:00 UTC (rev 2217)
@@ -9,6 +9,7 @@
013_ip_packed.diff -p0
017_oss_compat.diff -p0
020_linker.diff -p0
+101_subsecond_timestamp.diff -p0
902_version.diff -p0
903_disable_non-free_drivers.diff -p0
904_dev_full.diff -p0
Modified: trunk/kfreebsd-7/debian/rules
===================================================================
--- trunk/kfreebsd-7/debian/rules 2008-07-08 17:59:02 UTC (rev 2216)
+++ trunk/kfreebsd-7/debian/rules 2008-07-10 07:37:00 UTC (rev 2217)
@@ -27,7 +27,7 @@
HEADERS_DIR := kfreebsd-headers-$(version)-$(abiname)
FLAVOR_DIR := flavor-$(version)-$(abiname)
-MAKE := make MACHINE_ARCH=$(cpu) CC=gcc-4.3 WERROR=
+MAKE := make MACHINE_ARCH=$(cpu) CC=gcc-4.3 WERROR=
PATH := $(CURDIR)/config:/usr/lib/freebsd:$(PATH)
control: clean
@@ -63,7 +63,7 @@
src: src-stamp
src-stamp:
tar xfj $(CURDIR)/src.tar.bz2
-
+
set -e ; find src -type d -name CVS | xargs rm -rf
set -e ; find src -type f | (while read i ; do \
@@ -79,7 +79,7 @@
-e 's,#\( \|\t\)*include\( \|\t\)*\(<\|"\)bpfilter.h\(>\|"\),,g' \
-e 's,#\( \|\t\)*include\( \|\t\)*\(<\|"\)pflog.h\(>\|"\),,g' \
; done)
-
+
set -e ; cd $(CURDIR)/src ; QUILT_PC=$(CURDIR)/.pc QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a ; cd $(CURDIR)
install debian/gen-ld-u-options src/usr.sbin/config
grep -v ^__FBSDID src/sys/kern/subr_sbuf.c > src/usr.sbin/config/sbuf.c
@@ -89,7 +89,7 @@
build-indep: build-indep-stamp
build-indep-stamp: src
dh_testdir
-
+
cp -af src $(SRC_DIR)
touch build-indep-stamp
@@ -120,7 +120,7 @@
build-arch: $(foreach flavor,$(flavours),build-flavor-$(flavor)-stamp)
build-flavor-%-stamp: src config
cp -af src $(FLAVOR_DIR)-$*
-
+
# Add the abiname and the flavor to the kernel version
sed -i -e 's/^RELEASE=".*"/RELEASE="$(version)-$(abiname)-$*"/g' $(FLAVOR_DIR)-$*/sys/conf/newvers.sh
@@ -140,11 +140,11 @@
touch build-flavor-$*-stamp
install-common-stamp: src
- dh_testdir
+ dh_testdir
dh_testroot
mkdir -p $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR)
cd src \
- && find . -type f -name "*.h" -not -regex ".*modules.*" -not -regex ".*sys/$(cpu)/.*" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR) \;
+ && find . -type f -name "*.h" -not -regex ".*modules.*" -not -regex ".*sys/$(cpu)/.*" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR) \;
find $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR) -type f -exec chmod 644 {} \;
touch install-common-stamp
@@ -168,7 +168,7 @@
install -o root -g root -m 644 \
$(FLAVOR_DIR)-$*/sys/boot/forth/loader.conf \
$(IMAGE_PACKAGE)-$*/boot/defaults/loader.conf
-
+
# now install the kernel
$(MAKE) -C $(FLAVOR_DIR)-$*/sys/$(cpu)/compile/$(configfile) DESTDIR=$(IMAGE_PACKAGE)-$* install
mv $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/kernel $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
@@ -187,7 +187,7 @@
# remove device.hints (built into kernel)
rm -f $(IMAGE_PACKAGE)-$*/boot/device.hints
-
+
# override file
mkdir -p $(IMAGE_PACKAGE)-$*/usr/share/lintian/overrides
install -p -o root -g root -m 644 \
@@ -202,13 +202,13 @@
# scripts
sed -e "s/@RELEASE@/$(version)-$(abiname)-$*/g" debian/kfreebsd-image.postinst.in \
> debian/kfreebsd-image-$(version)-$(abiname)-$*.postinst
-
+
# headers package
mkdir -p $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu)
cd $(FLAVOR_DIR)-$*/sys/$(cpu) \
&& find . -type f -name "*.h" -not -regex ".*modules.*" -exec cp --parents {} $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu) \; \
&& cp -d --parents compile/$(configfile)/machine $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu) \
- && cp -d --parents conf/$(configfile) $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu)
+ && cp -d --parents conf/$(configfile) $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu)
find $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu) -type f -exec chmod 644 {} \;
for dir in `ls $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR)/sys` ; do \
ln -s ../../$(HEADERS_DIR)/sys/$$dir $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$$dir ; \
@@ -254,7 +254,7 @@
else
binary-arch:
# We have nothing to do
-endif
+endif
binary: binary-indep binary-arch
More information about the Glibc-bsd-commits
mailing list