aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/linux/linux-omap_git.bb
blob: 7690b4d381acd342198410a75770af9b271b71e5 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
require linux.inc

DESCRIPTION = "Linux kernel for OMAP processors"
KERNEL_IMAGETYPE = "uImage"

COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm|omap3-pandora|overo|omapzoom|omapzoom2|omap4430-sdp"

DEFAULT_PREFERENCE = "-1"

SRCREV = "945044d157dd63c6af0f2ed40a5346382af94eb4"

FILESPATHPKG_prepend = "linux-omap-2.6.31:"

# The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
#PV = "2.6.30+2.6.31-rc8+gitr${SRCREV}"
PV = "2.6.31"

SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
	   file://defconfig"

SRC_URI_append = " \
                  file://ehci.patch;patch=1 \
                  file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \
                  file://cache/l1cache-shift.patch;patch=1 \
                  file://cache/copy-page-tweak.patch;patch=1 \
                  file://dss2/0001-OMAP2-Add-funcs-for-writing-SMS_ROT_-registers.patch;patch=1 \
                  file://dss2/0002-OMAP-OMAPFB-split-omapfb.h.patch;patch=1 \
                  file://dss2/0003-OMAP-OMAPFB-add-omapdss-device.patch;patch=1 \
                  file://dss2/0004-OMAP-Add-VRAM-manager.patch;patch=1 \
                  file://dss2/0005-OMAP-Add-support-for-VRFB-rotation-engine.patch;patch=1 \
                  file://dss2/0006-OMAP-DSS2-Documentation-for-DSS2.patch;patch=1 \
                  file://dss2/0007-OMAP-DSS2-Display-Subsystem-Driver-core.patch;patch=1 \
                  file://dss2/0008-OMAP-DSS2-Add-more-core-files.patch;patch=1 \
                  file://dss2/0009-OMAP-DSS2-DISPC.patch;patch=1 \
                  file://dss2/0010-OMAP-DSS2-DPI-driver.patch;patch=1 \
                  file://dss2/0011-OMAP-DSS2-Video-encoder-driver.patch;patch=1 \
                  file://dss2/0012-OMAP-DSS2-RFBI-driver.patch;patch=1 \
                  file://dss2/0013-OMAP-DSS2-SDI-driver.patch;patch=1 \
                  file://dss2/0014-OMAP-DSS2-DSI-driver.patch;patch=1 \
                  file://dss2/0015-OMAP-DSS2-omapfb-driver.patch;patch=1 \
                  file://dss2/0016-OMAP-DSS2-Add-DPI-panel-drivers.patch;patch=1 \
                  file://dss2/0017-OMAP-DSS2-Taal-DSI-command-mode-panel-driver.patch;patch=1 \
                  file://dss2/0001-OMAP3-Enable-DSS2-for-OMAP3EVM-board.patch;patch=1 \
                  file://dss2/0002-V4L2-Added-New-V4L2-CIDs-for-omap-devices-V4L2-IOCT.patch;patch=1 \
                  file://dss2/0003-V4L2-Updated-v4l2_common-for-new-V4L2-CIDs.patch;patch=1 \
                  file://dss2/0004-OMAP2-3-V4L2-Add-support-for-OMAP2-3-V4L2-driver-on.patch;patch=1 \
                  file://expansion-boards/tincantools-zippy.patch;patch=1 \
                  file://madc/madc-driver.patch;patch=1 \
                  file://madc/madc.patch;patch=1 \
                  file://arch-has-holes.diff;patch=1 \
                  file://usb/0001-musb-fix-put_device-call-sequence.patch;patch=1 \
                  file://usb/0008-omap3-Add-CHIP_GE_OMAP3430ES3-for-HSUSB.patch;patch=1 \
                  file://usb/0011-musb-fix-musb-gadget_driver-NULL-bug.patch;patch=1 \
                  file://usb/0012-musb-Add-back-old-musb-procfs-file.patch;patch=1 \
                  file://usb/0013-musb-Remove-USB_SUSPEND-auto-select-with-OTG.patch;patch=1 \
                  file://usb/0014-musb-disable-PING-on-status-phase-of-control-transf.patch;patch=1 \
                  file://usb/0015-musb-Add-context-save-and-restore-support.patch;patch=1 \
                  file://usb/0016-usb-update-defconfig.patch;patch=1 \
                  file://usb/0001-ARM-OMAP-Fix-beagleboard-EHCI-setup.patch;patch=1 \
                  file://modedb-hd720.patch;patch=1 \
                  file://dss2/beagle-dss2-support.patch;patch=1 \
                  file://fix-serial.eml;patch=1 \
                  file://fix-omap4.diff;patch=1 \
"

SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
"

S = "${WORKDIR}/git"

module_autoload_ohci-hcd_omap5912osk = "ohci-hcd"
8 } /* Generic.Output */ .highlight .gp { color: #555555 } /* Generic.Prompt */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #666666 } /* Generic.Subheading */ .highlight .gt { color: #aa0000 } /* Generic.Traceback */ .highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */ .highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */ .highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */ .highlight .kp { color: #008800 } /* Keyword.Pseudo */ .highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ }
Description: nss_wins stop clobbering other daemon's log
Author: Christian Perrier <bubulle@debian.org>,Buchan Milne 
Bug-Debian: http://bugs.debian.org/598313
Forwarded: yes
Bug: https://bugzilla.samba.org/show_bug.cgi?id=7499

Index: samba/lib/util/debug.c
===================================================================
--- samba.orig/lib/util/debug.c
+++ samba/lib/util/debug.c
@@ -474,15 +474,17 @@
 
 	if (state.logtype == DEBUG_FILE) {
 #ifdef WITH_SYSLOG
-		const char *p = strrchr_m( prog_name,'/' );
-		if (p)
-			prog_name = p + 1;
+		if (prog_name) {
+			const char *p = strrchr_m( prog_name,'/' );
+			if (p)
+				prog_name = p + 1;
 #ifdef LOG_DAEMON
-		openlog( prog_name, LOG_PID, SYSLOG_FACILITY );
+			openlog( prog_name, LOG_PID, SYSLOG_FACILITY );
 #else
-		/* for old systems that have no facility codes. */
-		openlog( prog_name, LOG_PID );
+			/* for old systems that have no facility codes. */
+			openlog( prog_name, LOG_PID );
 #endif
+		}
 #endif
 	}
 }
Index: samba/nsswitch/wins.c
===================================================================
--- samba.orig/nsswitch/wins.c
+++ samba/nsswitch/wins.c
@@ -52,7 +52,7 @@
 	lp_set_cmdline("log level", "0");
 
 	TimeInit();
-	setup_logging("nss_wins",False);
+	setup_logging(NULL,False);
 	lp_load(get_dyn_CONFIGFILE(),True,False,False,True);
 	load_interfaces();
 }