[Glibc-bsd-commits] r3452 - trunk/kfreebsd-9/debian/patches
Robert Millan
rmh at alioth.debian.org
Wed Jun 15 21:25:09 UTC 2011
Author: rmh
Date: 2011-06-15 21:25:09 +0000 (Wed, 15 Jun 2011)
New Revision: 3452
Modified:
trunk/kfreebsd-9/debian/patches/004_xargs.diff
trunk/kfreebsd-9/debian/patches/007_clone_signals.diff
trunk/kfreebsd-9/debian/patches/009_disable_duped_modules.diff
trunk/kfreebsd-9/debian/patches/020_linker.diff
trunk/kfreebsd-9/debian/patches/103_stat_pipe.diff
trunk/kfreebsd-9/debian/patches/108_teken_utf8_table.diff
trunk/kfreebsd-9/debian/patches/109_linprocfs_non_x86.diff
trunk/kfreebsd-9/debian/patches/110_disable_trampoline_flavour.diff
trunk/kfreebsd-9/debian/patches/111_linprocfs_kthread.diff
trunk/kfreebsd-9/debian/patches/902_version.diff
trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-9/debian/patches/904_dev_full.diff
trunk/kfreebsd-9/debian/patches/907_cpu_class.diff
trunk/kfreebsd-9/debian/patches/908_linprocfs_is_not_proc.diff
trunk/kfreebsd-9/debian/patches/914_psm.diff
Log:
refresh all patches
Modified: trunk/kfreebsd-9/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/004_xargs.diff 2011-06-15 21:15:58 UTC (rev 3451)
+++ trunk/kfreebsd-9/debian/patches/004_xargs.diff 2011-06-15 21:25:09 UTC (rev 3452)
@@ -1,10 +1,9 @@
Status: xargs -J option requested to both upstream and debian.
-diff -ur a/sys/conf/kmod.mk b/sys/conf/kmod.mk
---- a/sys/conf/kmod.mk 2010-07-22 20:47:41.000000000 +0200
-+++ b/sys/conf/kmod.mk 2010-11-09 00:29:56.000000000 +0100
-@@ -220,7 +220,7 @@
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
+@@ -217,7 +217,7 @@
grep -v '^#' < ${EXPORT_SYMS} > export_syms
.endif
awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
@@ -12,11 +11,10 @@
+ export_syms | xargs -I% ${OBJCOPY} % ${.TARGET}
.endif
.endif
- .if !defined(DEBUG_FLAGS) && \
-diff -ur a/sys/contrib/dev/acpica/acpica_prep.sh b/sys/contrib/dev/acpica/acpica_prep.sh
---- a/sys/contrib/dev/acpica/acpica_prep.sh 2010-07-06 22:57:28.000000000 +0200
-+++ b/sys/contrib/dev/acpica/acpica_prep.sh 2010-11-09 00:30:19.000000000 +0100
-@@ -59,10 +59,10 @@
+ .if !defined(DEBUG_FLAGS) && ${__KLD_SHARED} == no
+--- a/sys/contrib/dev/acpica/acpica_prep.sh
++++ b/sys/contrib/dev/acpica/acpica_prep.sh
+@@ -60,10 +60,10 @@
# copy files
echo copying full dirs
for i in ${fulldirs}; do
Modified: trunk/kfreebsd-9/debian/patches/007_clone_signals.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/007_clone_signals.diff 2011-06-15 21:15:58 UTC (rev 3451)
+++ trunk/kfreebsd-9/debian/patches/007_clone_signals.diff 2011-06-15 21:25:09 UTC (rev 3452)
@@ -1,6 +1,6 @@
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
-@@ -562,7 +562,13 @@
+@@ -477,7 +477,13 @@
p2->p_sigacts = newsigacts;
}
if (flags & RFLINUXTHPN)
Modified: trunk/kfreebsd-9/debian/patches/009_disable_duped_modules.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/009_disable_duped_modules.diff 2011-06-15 21:15:58 UTC (rev 3451)
+++ trunk/kfreebsd-9/debian/patches/009_disable_duped_modules.diff 2011-06-15 21:25:09 UTC (rev 3452)
@@ -3,10 +3,10 @@
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
-@@ -40,6 +40,8 @@
+@@ -48,6 +48,8 @@
+ ASM_CFLAGS+= ${.IMPSRC:T:Mmpboot.S:C/^.+$/-no-integrated-as/}
+ .endif
- MKMODULESENV+= MACHINE=amd64
-
+%WITHOUT_MODULES
+
%BEFORE_DEPEND
@@ -14,7 +14,7 @@
%OBJS
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
-@@ -121,6 +121,8 @@
+@@ -123,6 +123,8 @@
MKMODULESENV+= MACHINE=${MACHINE}
@@ -25,10 +25,10 @@
%OBJS
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
-@@ -34,6 +34,8 @@
+@@ -40,6 +40,8 @@
+ ASM_CFLAGS+= ${.IMPSRC:T:Mmpboot.s:C/^.+$/-no-integrated-as/}
+ .endif
- MKMODULESENV+= MACHINE=${MACHINE}
-
+%WITHOUT_MODULES
+
%BEFORE_DEPEND
@@ -47,7 +47,7 @@
%OBJS
--- a/sys/conf/Makefile.mips
+++ b/sys/conf/Makefile.mips
-@@ -105,6 +105,8 @@
+@@ -70,6 +70,8 @@
${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \
${KERNEL_KO}.tramp.bin \
@@ -69,7 +69,7 @@
%OBJS
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
-@@ -37,6 +37,8 @@
+@@ -42,6 +42,8 @@
CFLAGS+= -fno-omit-frame-pointer
.endif
@@ -99,7 +99,7 @@
static void do_before_depend(FILE *);
static int opteq(const char *, const char *);
static void read_files(void);
-@@ -146,6 +147,8 @@
+@@ -161,6 +162,8 @@
}
if (eq(line, "%BEFORE_DEPEND\n"))
do_before_depend(ofp);
@@ -108,7 +108,7 @@
else if (eq(line, "%OBJS\n"))
do_objs(ofp);
else if (strncmp(line, "%FILES.", 7) == 0)
-@@ -626,6 +629,28 @@
+@@ -647,6 +650,28 @@
}
static void
Modified: trunk/kfreebsd-9/debian/patches/020_linker.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/020_linker.diff 2011-06-15 21:15:58 UTC (rev 3451)
+++ trunk/kfreebsd-9/debian/patches/020_linker.diff 2011-06-15 21:25:09 UTC (rev 3452)
@@ -19,7 +19,7 @@
${OBJCOPY} --strip-debug ${.TARGET}
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
-@@ -199,7 +199,9 @@
+@@ -189,7 +189,9 @@
.if ${__KLD_SHARED} == yes
${FULLPROG}: ${KMOD}.kld
Modified: trunk/kfreebsd-9/debian/patches/103_stat_pipe.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/103_stat_pipe.diff 2011-06-15 21:15:58 UTC (rev 3451)
+++ trunk/kfreebsd-9/debian/patches/103_stat_pipe.diff 2011-06-15 21:25:09 UTC (rev 3452)
@@ -1,6 +1,6 @@
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
-@@ -1405,6 +1405,8 @@
+@@ -1384,6 +1384,8 @@
struct thread *td;
{
struct pipe *pipe = fp->f_data;
@@ -9,7 +9,7 @@
#ifdef MAC
int error;
-@@ -1431,6 +1433,8 @@
+@@ -1410,6 +1412,8 @@
* Left as 0: st_dev, st_ino, st_nlink, st_rdev, st_flags, st_gen.
* XXX (st_dev, st_ino) should be unique.
*/
Modified: trunk/kfreebsd-9/debian/patches/108_teken_utf8_table.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/108_teken_utf8_table.diff 2011-06-15 21:15:58 UTC (rev 3451)
+++ trunk/kfreebsd-9/debian/patches/108_teken_utf8_table.diff 2011-06-15 21:25:09 UTC (rev 3452)
@@ -1,6 +1,6 @@
--- a/sys/dev/syscons/scterm-teken.c
+++ b/sys/dev/syscons/scterm-teken.c
-@@ -356,10 +356,18 @@
+@@ -424,10 +424,18 @@
{ 0x00b6, 0x14, 0x00 }, { 0x00b7, 0xfa, 0x00 },
{ 0x00ba, 0xa7, 0x00 }, { 0x00bb, 0xaf, 0x00 },
{ 0x00bc, 0xac, 0x00 }, { 0x00bd, 0xab, 0x00 },
@@ -23,7 +23,7 @@
{ 0x00df, 0xe1, 0x00 }, { 0x00e0, 0x85, 0x00 },
{ 0x00e1, 0xa0, 0x00 }, { 0x00e2, 0x83, 0x00 },
{ 0x00e4, 0x84, 0x00 }, { 0x00e5, 0x86, 0x00 },
-@@ -374,6 +382,7 @@
+@@ -442,6 +450,7 @@
{ 0x00f8, 0xed, 0x00 }, { 0x00f9, 0x97, 0x00 },
{ 0x00fa, 0xa3, 0x00 }, { 0x00fb, 0x96, 0x00 },
{ 0x00fc, 0x81, 0x00 }, { 0x00ff, 0x98, 0x00 },
@@ -31,7 +31,7 @@
{ 0x0192, 0x9f, 0x00 }, { 0x0393, 0xe2, 0x00 },
{ 0x0398, 0xe9, 0x00 }, { 0x03a3, 0xe4, 0x00 },
{ 0x03a6, 0xe8, 0x00 }, { 0x03a9, 0xea, 0x00 },
-@@ -422,7 +431,8 @@
+@@ -490,7 +499,8 @@
{ 0x2584, 0xdc, 0x00 }, { 0x2588, 0xdb, 0x00 },
{ 0x258c, 0xdd, 0x00 }, { 0x2590, 0xde, 0x00 },
{ 0x2591, 0xb0, 0x02 }, { 0x25a0, 0xfe, 0x00 },
Modified: trunk/kfreebsd-9/debian/patches/109_linprocfs_non_x86.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/109_linprocfs_non_x86.diff 2011-06-15 21:15:58 UTC (rev 3451)
+++ trunk/kfreebsd-9/debian/patches/109_linprocfs_non_x86.diff 2011-06-15 21:25:09 UTC (rev 3452)
@@ -1,6 +1,6 @@
--- a/sys/conf/options.mips
+++ b/sys/conf/options.mips
-@@ -56,6 +56,9 @@
+@@ -55,6 +55,9 @@
TICK_USE_YAMON_FREQ opt_global.h
TICK_USE_MALTA_RTC opt_global.h
Modified: trunk/kfreebsd-9/debian/patches/110_disable_trampoline_flavour.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/110_disable_trampoline_flavour.diff 2011-06-15 21:15:58 UTC (rev 3451)
+++ trunk/kfreebsd-9/debian/patches/110_disable_trampoline_flavour.diff 2011-06-15 21:25:09 UTC (rev 3452)
@@ -1,6 +1,6 @@
--- a/sys/conf/Makefile.mips
+++ b/sys/conf/Makefile.mips
-@@ -79,7 +79,7 @@
+@@ -55,7 +55,7 @@
# XXX hardcoded kernel entry point
ASM_CFLAGS+=${CFLAGS} -D_LOCORE -DLOCORE
Modified: trunk/kfreebsd-9/debian/patches/111_linprocfs_kthread.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/111_linprocfs_kthread.diff 2011-06-15 21:15:58 UTC (rev 3451)
+++ trunk/kfreebsd-9/debian/patches/111_linprocfs_kthread.diff 2011-06-15 21:25:09 UTC (rev 3452)
@@ -5,7 +5,7 @@
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
-@@ -1044,6 +1044,10 @@
+@@ -1049,6 +1049,10 @@
PROC_UNLOCK(p);
return (ret);
}
@@ -16,7 +16,7 @@
if (p->p_args != NULL) {
sbuf_bcpy(sb, p->p_args->ar_args, p->p_args->ar_length);
PROC_UNLOCK(p);
-@@ -1068,6 +1072,10 @@
+@@ -1073,6 +1077,10 @@
PROC_UNLOCK(p);
return (ret);
}
Modified: trunk/kfreebsd-9/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/902_version.diff 2011-06-15 21:15:58 UTC (rev 3451)
+++ trunk/kfreebsd-9/debian/patches/902_version.diff 2011-06-15 21:25:09 UTC (rev 3452)
@@ -1,6 +1,6 @@
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
-@@ -136,7 +136,7 @@
+@@ -128,7 +128,7 @@
cat << EOF > vers.c
$COPYRIGHT
#define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}: ${t}"
Modified: trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff 2011-06-15 21:15:58 UTC (rev 3451)
+++ trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff 2011-06-15 21:25:09 UTC (rev 3452)
@@ -28,8 +28,8 @@
compat/linprocfs/linprocfs.c optional linprocfs
compat/linsysfs/linsysfs.c optional linsysfs
compat/linux/linux_emul.c optional compat_linux
-@@ -173,14 +152,6 @@
- dev/fe/if_fe_isa.c optional fe isa
+@@ -174,14 +153,6 @@
+ dev/glxiic/glxiic.c optional glxiic
dev/glxsb/glxsb.c optional glxsb
dev/glxsb/glxsb_hash.c optional glxsb
-dev/hptmv/entry.c optional hptmv
@@ -43,7 +43,7 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_intel.c optional hwpmc
dev/hwpmc/hwpmc_core.c optional hwpmc
-@@ -213,7 +184,6 @@
+@@ -214,7 +185,6 @@
dev/mse/mse.c optional mse
dev/mse/mse_isa.c optional mse isa
dev/nfe/if_nfe.c optional nfe pci
@@ -53,7 +53,7 @@
dev/random/nehemiah.c optional random
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
-@@ -142,8 +142,6 @@
+@@ -141,8 +141,6 @@
device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
device ciss # Compaq Smart RAID 5*
device dpt # DPT Smartcache III, IV - See NOTES for options
@@ -64,7 +64,7 @@
device mly # Mylex AcceleRAID/eXtremeRAID
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -106,8 +106,6 @@
+@@ -108,8 +108,6 @@
hifn \
hme \
${_hptiop} \
@@ -73,7 +73,7 @@
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -225,7 +223,6 @@
+@@ -227,7 +225,6 @@
ntfs \
ntfs_iconv \
nullfs \
@@ -81,7 +81,7 @@
${_nvram} \
${_nwfs} \
${_nxge} \
-@@ -478,8 +475,6 @@
+@@ -492,8 +489,6 @@
_dpt= dpt
_ex= ex
_hptiop= hptiop
@@ -90,7 +90,7 @@
_ichwd= ichwd
_ida= ida
_iir= iir
-@@ -495,7 +490,6 @@
+@@ -509,7 +504,6 @@
_ixgbe= ixgbe
_mly= mly
_nfe= nfe
@@ -98,7 +98,7 @@
_nvram= nvram
_nxge= nxge
_tpm= tpm
-@@ -549,8 +543,6 @@
+@@ -565,8 +559,6 @@
_exca= exca
_ext2fs= ext2fs
_hptiop= hptiop
@@ -107,7 +107,7 @@
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -581,7 +573,6 @@
+@@ -597,7 +589,6 @@
.endif
_ndis= ndis
_nfe= nfe
@@ -117,7 +117,7 @@
.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -136,8 +136,6 @@
+@@ -135,8 +135,6 @@
#device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
device ciss # Compaq Smart RAID 5*
device dpt # DPT Smartcache III, IV - See NOTES for options
Modified: trunk/kfreebsd-9/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/904_dev_full.diff 2011-06-15 21:15:58 UTC (rev 3451)
+++ trunk/kfreebsd-9/debian/patches/904_dev_full.diff 2011-06-15 21:25:09 UTC (rev 3452)
@@ -2,10 +2,9 @@
Status: FIONBIO/FIOASYNC is in http://www.freebsd.org/cgi/query-pr.cgi?pr=138526
/dev/full already rejected in upstream (kern/68961)
-diff -ur a/sys/dev/null/null.c b/sys/dev/null/null.c
---- a/sys/dev/null/null.c 2010-08-06 11:47:48.000000000 +0200
-+++ b/sys/dev/null/null.c 2010-11-09 00:41:11.000000000 +0100
-@@ -43,9 +43,11 @@
+--- a/sys/dev/null/null.c
++++ b/sys/dev/null/null.c
+@@ -45,9 +45,11 @@
/* For use with destroy_dev(9). */
static struct cdev *null_dev;
@@ -17,7 +16,7 @@
static d_ioctl_t null_ioctl;
static d_read_t zero_read;
-@@ -57,6 +59,14 @@
+@@ -59,6 +61,14 @@
.d_name = "null",
};
@@ -58,8 +57,8 @@
if (cmd != DIOCSKERNELDUMP)
return (ENOIOCTL);
error = priv_check(td, PRIV_SETDUMPER);
-@@ -114,12 +138,15 @@
- zbuf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK | M_ZERO);
+@@ -122,12 +146,15 @@
+ printf("null: <null device, zero device>\n");
null_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &null_cdevsw, 0,
NULL, UID_ROOT, GID_WHEEL, 0666, "null");
+ null_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &full_cdevsw, 0,
@@ -72,5 +71,5 @@
destroy_dev(null_dev);
+ destroy_dev(full_dev);
destroy_dev(zero_dev);
- free(zbuf, M_TEMP);
break;
+
Modified: trunk/kfreebsd-9/debian/patches/907_cpu_class.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/907_cpu_class.diff 2011-06-15 21:15:58 UTC (rev 3451)
+++ trunk/kfreebsd-9/debian/patches/907_cpu_class.diff 2011-06-15 21:25:09 UTC (rev 3452)
@@ -3,7 +3,7 @@
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
-@@ -634,6 +634,7 @@
+@@ -647,6 +647,7 @@
#if defined(I486_CPU)
case CPUCLASS_486:
printf("486");
@@ -11,17 +11,17 @@
break;
#endif
#if defined(I586_CPU)
-@@ -643,6 +644,7 @@
- (intmax_t)(tsc_freq + 4999) / 1000000,
- (u_int)((tsc_freq + 4999) / 10000) % 100);
+@@ -658,6 +659,7 @@
+ (u_int)((tsc_freq + 4999) / 10000) % 100);
+ }
printf("586");
+ machine[1] = '5';
break;
#endif
#if defined(I686_CPU)
-@@ -652,6 +654,7 @@
- (intmax_t)(tsc_freq + 4999) / 1000000,
- (u_int)((tsc_freq + 4999) / 10000) % 100);
+@@ -669,6 +671,7 @@
+ (u_int)((tsc_freq + 4999) / 10000) % 100);
+ }
printf("686");
+ machine[1] = '6';
break;
Modified: trunk/kfreebsd-9/debian/patches/908_linprocfs_is_not_proc.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/908_linprocfs_is_not_proc.diff 2011-06-15 21:15:58 UTC (rev 3451)
+++ trunk/kfreebsd-9/debian/patches/908_linprocfs_is_not_proc.diff 2011-06-15 21:25:09 UTC (rev 3452)
@@ -1,6 +1,6 @@
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
-@@ -351,10 +351,6 @@
+@@ -361,10 +361,6 @@
/* determine fs type */
fstype = mp->mnt_stat.f_fstypename;
Modified: trunk/kfreebsd-9/debian/patches/914_psm.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/914_psm.diff 2011-06-15 21:15:58 UTC (rev 3451)
+++ trunk/kfreebsd-9/debian/patches/914_psm.diff 2011-06-15 21:25:09 UTC (rev 3452)
@@ -18,15 +18,15 @@
#include <sys/syslog.h>
#include <machine/bus.h>
#include <sys/rman.h>
-@@ -302,7 +299,6 @@
+@@ -297,7 +294,6 @@
struct cdev *bdev;
int lasterr;
int cmdcount;
- struct sigio *async; /* Processes waiting for SIGIO */
};
static devclass_t psm_devclass;
- #define PSM_SOFTC(unit) \
-@@ -1494,7 +1490,6 @@
+
+@@ -1518,7 +1514,6 @@
sc->mode.level = sc->dflt_mode.level;
sc->mode.protocol = sc->dflt_mode.protocol;
sc->watchdog = FALSE;
@@ -34,7 +34,7 @@
/* flush the event queue */
sc->queue.count = 0;
-@@ -1634,12 +1629,6 @@
+@@ -1660,12 +1655,6 @@
/* remove anything left in the output buffer */
empty_aux_buffer(sc->kbdc, 10);
@@ -47,7 +47,7 @@
/* close is almost always successful */
sc->state &= ~PSM_OPEN;
kbdc_lock(sc->kbdc, FALSE);
-@@ -2201,15 +2190,6 @@
+@@ -2227,15 +2216,6 @@
break;
#endif /* MOUSE_GETHWID */
@@ -63,7 +63,7 @@
default:
return (ENOTTY);
}
-@@ -3474,9 +3454,6 @@
+@@ -3502,9 +3482,6 @@
wakeup(sc);
}
selwakeuppri(&sc->rsel, PZERO);
More information about the Glibc-bsd-commits
mailing list