[Glibc-bsd-commits] r3597 - in trunk/kfreebsd-9/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sat Jul 16 19:47:19 UTC 2011
Author: rmh
Date: 2011-07-16 19:47:19 +0000 (Sat, 16 Jul 2011)
New Revision: 3597
Removed:
trunk/kfreebsd-9/debian/patches/006_mips_qemu.diff
Modified:
trunk/kfreebsd-9/debian/changelog
trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff
trunk/kfreebsd-9/debian/patches/110_disable_trampoline_flavour.diff
trunk/kfreebsd-9/debian/patches/series
Log:
* New upstream snapshot.
- Refresh all patches.
Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog 2011-07-16 14:14:57 UTC (rev 3596)
+++ trunk/kfreebsd-9/debian/changelog 2011-07-16 19:47:19 UTC (rev 3597)
@@ -1,5 +1,9 @@
-kfreebsd-9 (9.0~svn223966-2) UNRELEASED; urgency=low
+kfreebsd-9 (9.0~svn224106-1) UNRELEASED; urgency=low
+ * New upstream snapshot.
+ - Refresh all patches.
+
+ [ Robert Millan ]
* Revert part of 005_linux_cflags.diff which isn't going to be
accepted by upstream, and caused build breakage on GNU/Linux. Bring
back needed parts of the sed kludge.
Modified: trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff 2011-07-16 14:14:57 UTC (rev 3596)
+++ trunk/kfreebsd-9/debian/patches/003_glibc_dev_aicasm.diff 2011-07-16 19:47:19 UTC (rev 3597)
@@ -1,5 +1,5 @@
-Sent to freebsd-hackers (2011-07-02)
+Partially sent to freebsd-hackers (2011-07-02)
--- a/sys/dev/aic7xxx/aicasm/Makefile
+++ b/sys/dev/aic7xxx/aicasm/Makefile
@@ -41,126 +41,3 @@
.ifdef MAKESRCPATH
CFLAGS+= -I${MAKESRCPATH}
.endif
---- a/sys/dev/aic7xxx/aicasm/aicasm_gram.y
-+++ b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
-@@ -51,12 +51,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sysexits.h>
--
--#ifdef __linux__
--#include "../queue.h"
--#else
- #include <sys/queue.h>
--#endif
-
- #include "aicasm.h"
- #include "aicasm_symbol.h"
-@@ -1534,7 +1529,7 @@
- }
-
- static void
--add_macro_arg(const char *argtext, int argnum __unused)
-+add_macro_arg(const char *argtext, int argnum)
- {
- struct macro_arg *marg;
- int retval;
---- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
-+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
-@@ -44,10 +44,11 @@
-
- #include <sys/types.h>
-
--#ifdef __linux__
--#include "aicdb.h"
-+#include <sys/param.h> /* BSD */
-+#ifdef BSD
-+#include <db.h> /* BSD native libdb */
- #else
--#include <db.h>
-+#include <db_185.h> /* Sleepycat 1.85 compat */
- #endif
- #include <ctype.h>
- #include <fcntl.h>
---- a/sys/dev/aic7xxx/aicasm/aicasm.c
-+++ b/sys/dev/aic7xxx/aicasm/aicasm.c
-@@ -53,7 +53,7 @@
- #include <sysexits.h>
- #include <unistd.h>
-
--#if linux
-+#ifdef __GLIBC__
- #include <endian.h>
- #else
- #include <machine/endian.h>
---- a/sys/dev/aic7xxx/aicasm/aicasm.h
-+++ b/sys/dev/aic7xxx/aicasm/aicasm.h
-@@ -42,11 +42,7 @@
- * $FreeBSD$
- */
-
--#ifdef __linux__
--#include "../queue.h"
--#else
- #include <sys/queue.h>
--#endif
-
- #ifndef TRUE
- #define TRUE 1
---- a/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
-+++ b/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
-@@ -51,12 +51,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sysexits.h>
--
--#ifdef __linux__
--#include "../queue.h"
--#else
- #include <sys/queue.h>
--#endif
-
- #include "aicasm.h"
- #include "aicasm_symbol.h"
---- a/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
-+++ b/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
-@@ -51,11 +51,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <sysexits.h>
--#ifdef __linux__
--#include "../queue.h"
--#else
- #include <sys/queue.h>
--#endif
-
- #include "aicasm.h"
- #include "aicasm_symbol.h"
---- a/sys/dev/aic7xxx/aicasm/aicasm_scan.l
-+++ b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
-@@ -51,11 +51,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <sysexits.h>
--#ifdef __linux__
--#include "../queue.h"
--#else
- #include <sys/queue.h>
--#endif
-
- #include "aicasm.h"
- #include "aicasm_symbol.h"
---- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
-+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
-@@ -42,11 +42,7 @@
- * $FreeBSD$
- */
-
--#ifdef __linux__
--#include "../queue.h"
--#else
- #include <sys/queue.h>
--#endif
-
- typedef enum {
- UNINITIALIZED,
Deleted: trunk/kfreebsd-9/debian/patches/006_mips_qemu.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/006_mips_qemu.diff 2011-07-16 14:14:57 UTC (rev 3596)
+++ trunk/kfreebsd-9/debian/patches/006_mips_qemu.diff 2011-07-16 19:47:19 UTC (rev 3597)
@@ -1,44 +0,0 @@
-
-Fix initialization of i8259 controller. Opposite side is in
-qemu-0.14.1+dfsg/hw/i8259.c: pic_ioport_write()
-
---- a/sys/mips/malta/gt_pci.c
-+++ b/sys/mips/malta/gt_pci.c
-@@ -326,15 +326,15 @@
- ICW4_8086);
-
- /* mask all interrupts */
-- bus_space_write_1(sc->sc_st, sc->sc_ioh_icu1, 0,
-+ bus_space_write_1(sc->sc_st, sc->sc_ioh_icu1, 1,
- sc->sc_imask & 0xff);
-
- /* enable special mask mode */
-- bus_space_write_1(sc->sc_st, sc->sc_ioh_icu1, 1,
-+ bus_space_write_1(sc->sc_st, sc->sc_ioh_icu1, 0,
- OCW3_SEL | OCW3_ESMM | OCW3_SMM);
-
- /* read IRR by default */
-- bus_space_write_1(sc->sc_st, sc->sc_ioh_icu1, 1,
-+ bus_space_write_1(sc->sc_st, sc->sc_ioh_icu1, 0,
- OCW3_SEL | OCW3_RR);
-
- /* reset, program device, 4 bytes */
-@@ -348,15 +348,15 @@
- ICW4_8086);
-
- /* mask all interrupts */
-- bus_space_write_1(sc->sc_st, sc->sc_ioh_icu2, 0,
-+ bus_space_write_1(sc->sc_st, sc->sc_ioh_icu2, 1,
- sc->sc_imask & 0xff);
-
- /* enable special mask mode */
-- bus_space_write_1(sc->sc_st, sc->sc_ioh_icu2, 1,
-+ bus_space_write_1(sc->sc_st, sc->sc_ioh_icu2, 0,
- OCW3_SEL | OCW3_ESMM | OCW3_SMM);
-
- /* read IRR by default */
-- bus_space_write_1(sc->sc_st, sc->sc_ioh_icu2, 1,
-+ bus_space_write_1(sc->sc_st, sc->sc_ioh_icu2, 0,
- OCW3_SEL | OCW3_RR);
-
- /*
Modified: trunk/kfreebsd-9/debian/patches/110_disable_trampoline_flavour.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/110_disable_trampoline_flavour.diff 2011-07-16 14:14:57 UTC (rev 3596)
+++ trunk/kfreebsd-9/debian/patches/110_disable_trampoline_flavour.diff 2011-07-16 19:47:19 UTC (rev 3597)
@@ -1,6 +1,6 @@
--- a/sys/conf/Makefile.mips
+++ b/sys/conf/Makefile.mips
-@@ -55,7 +55,7 @@
+@@ -61,7 +61,7 @@
# XXX hardcoded kernel entry point
ASM_CFLAGS+=${CFLAGS} -D_LOCORE -DLOCORE
Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series 2011-07-16 14:14:57 UTC (rev 3596)
+++ trunk/kfreebsd-9/debian/patches/series 2011-07-16 19:47:19 UTC (rev 3597)
@@ -3,7 +3,6 @@
003_glibc_dev_aicasm.diff
004_xargs.diff
005_linux_cflags.diff
-006_mips_qemu.diff
007_clone_signals.diff
#009_disable_duped_modules.diff
020_linker.diff
More information about the Glibc-bsd-commits
mailing list