Commit 5b29548b authored by Ruben Rodriguez's avatar Ruben Rodriguez

Merge branch 'belenos'

parents de1a881e 7f4a3a0f
## Introduction
This set of scripts are helpers that modify and compile those packages coming
from the Ubuntu upstream which need it. It might be because they contain
non-free stuff, references to Ubuntu that need to be changed, or because we
want the package to work our way.
This helpers are similar to some of those in the gNewSense builder[1], we took
This helpers are similar to some of those in the [gNewSense](http://www.gnewsense.org/Builder/HowToCreateourOwnGNULinuxDistribution) builder, we took
some ideas and even some lines from them. If you plan to build an Ubuntu
derivative of your own, we suggest you to use Builder instead of this helpers.
1: http://www.gnewsense.org/Builder/HowToCreateourOwnGNULinuxDistribution
All packages in this list are in the appropriate blacklist in the repository
updater, so they never enter into the repo from upstream and need to be
compiled with this helpers and pushed into reprepro. This helpers also need
to be run by hand -and the results tested- any time the repo watchdog warns
compiled with this helpers and pushed into reprepro. This helpers also need
to be run by hand - and the results tested - any time the repo watchdog warns
about pending updates from upstream.
To add a package to the list, just copy one -make-apache2 is a good template-
and rename it to make-sourcePackageName. To send the file back to us, or to
include any modification into the current scripts, use "bzr diff" and send
To add a package to the list, just copy one - `make-apache2` is a good template -
and rename it to `make-sourcePackageName`. To send the file back to us, or to
include any modification into the current scripts, use `bzr diff` and send
the output as an attachment to trisquel-devel@listas.trisquel.info. You need
to join the mailing list to send messages to it.
Some recommendations:
## Recommendations
- Take care to use the right sourcePackageName, many source packages produce
several binary packages. "apt-cache showsrc binary-package" can help you.
- If possible, use sed to replace chains in the upstream source without the
* Take care to use the right sourcePackageName, many source packages produce
several binary packages. `apt-cache showsrc binary-package` can help you.
* If possible, use sed to replace chains in the upstream source without the
need of external files or patches. If you really need to include a file, place
it at the DATA/sourcePackageName directory
- Do not replace *all* references to Ubuntu in the package, just those that
it at the `DATA/sourcePackageName` directory
* Do not replace *all* references to Ubuntu in the package, just those that
would actually be shown to the user. Avoid replacing copyright statements!
- Try to write your replacements in a way they might work in future versions
* Try to write your replacements in a way they might work in future versions
of the upstream package. Well written regexps and sed will help with that.
- Some of this packages require the lsb to match Trisquel values. Edit the
/etc/lsb_release accordingly, or run the helpers in a Trisquel box.
- You can -and maybe should- run this scripts inside a chroot.
* Some of this packages require the lsb to match Trisquel values. Edit the
`/etc/lsb_release` accordingly, or run the helpers in a Trisquel box.
* You can - and maybe should - run this scripts inside a chroot.
Netinstall:
## Netinstall
Included are the set of scipts used to generate the network installer images
found in Trisquel GNU/Linux LTS (version 2.0, 4.0, 6.0... and up). The scripts
......@@ -43,13 +44,13 @@ may not be available for all versions.
To generate the images, we run the following scripts:
make-apt-setup
make-base-installer
make-choose-mirror
make-main-menu
make-netcfg
make-net-retriever
make-pkgsel
* `make-apt-setup`
* `make-base-installer`
* `make-choose-mirror`
* `make-main-menu`
* `make-netcfg`
* `make-net-retriever`
* `make-pkgsel`
Then we push the results into the Trisquel repository and run the script
make-debian-installer to build the final images.
`make-debian-installer` to build the final images.
......@@ -52,7 +52,7 @@ background-color:#fff;
font-size:14px;
padding:10px 25px 20px 25px;
border-radius: 5px;
box-shadow: 0 0px 5px hsla(0,0%,0%,.3) inset;
box-shadow: 0 0px 2px hsla(0,0%,0%,.3) inset;
}
.block-side-margin {
......@@ -67,18 +67,25 @@ box-shadow: 0 0px 5px hsla(0,0%,0%,.3) inset;
ul li {
list-style:none;
background:#ddd;
border-radius:3px;
padding:3px 5px 3px 5px;
margin:5px;
box-shadow: 0px 2px 0 #ccc ;
float:left;
}
ul li a{
font-weight:bold;
color:#666;
text-shadow:0px 1px 0px #fff;
padding:5px 10px 5px 10px;
border-radius:3px;
margin:5px;
color:#888;
background:#dcdcdc;
box-shadow: 0px 2px 0 #ccc ;
}
ul li a:hover{
color:#666;
background:#ccc;
box-shadow: 0px 2px 0 #aaa;
}
.titlelink{
......@@ -95,7 +102,12 @@ display: -moz-box;
width: 100%;
background-color: hsla(0,0%,0%,.03);
border-top: 1px solid hsla(0,0%,0%,.03);
box-shadow: 0 2px 5px hsla(0,0%,0%,.1) inset, 0 -1px 0 hsla(0,0%,100%,.25);
box-shadow: 0 -1px 2px hsla(0,0%,0%,.1) inset, 0 -1px 0 hsla(0,0%,100%,.25);
}
#searchLogoContainer{
color:#888;
text-shadow: 0 1px 0 #fff;
}
</style>
......@@ -143,6 +155,10 @@ function jssettings(sel){
function prepare(){
srchsvc = Components.classes["@mozilla.org/browser/search-service;1"].getService(Components.interfaces.nsIBrowserSearchService);
currentEngine = srchsvc.defaultEngine.name;
document.getElementById("searchLogoContainer").innerHTML=currentEngine+":";
/*try {
Services.prefs.getCharPref("extensions.abrowserhome.intl.accept_languages");
}catch(err){
......@@ -255,6 +271,15 @@ Services.prefs.setIntPref("extensions.abrowserhome.browser.display.use_document_
}
}
function onSearchSubmit(){
srchsvc = Components.classes["@mozilla.org/browser/search-service;1"].getService(Components.interfaces.nsIBrowserSearchService);
currentEngine = srchsvc.defaultEngine;
var selectedText=document.getElementById("searchText").value;
submission = currentEngine.getSubmission(selectedText,null);
window.location = submission.uri.spec;
}
]]>
</script>
......@@ -266,13 +291,14 @@ Services.prefs.setIntPref("extensions.abrowserhome.browser.display.use_document_
<div class="spacer"/>
<div id="topSection">
<img src="chrome://branding/content/about-logo.png"/>
<br/>
<br/>
<div id="searchContainer">
<form name="searchForm" id="searchForm" action="https://duckduckgo.com/">
<input type="hidden" name="t" value="trisquel"/>
<form name="searchForm" id="searchForm" onsubmit="onSearchSubmit(); return false">
<div id="searchLogoContainer"></div>
<input type="text" name="q" value="" id="searchText" maxlength="256"
autofocus="autofocus"/>
<input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label; DuckDuckGO"/>
autofocus="autofocus" dir="auto"/>
<input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/>
</form>
</div>
......@@ -284,7 +310,7 @@ Services.prefs.setIntPref("extensions.abrowserhome.browser.display.use_document_
<div class="block-side-margin"></div>
<div id="addonsform">
<!--<h3>Enabled privacy features:</h3>-->
<p><a target="_blank" href="https://trisquel.info/browser">Abrowser</a> protects your <a target="_blank" href="http://www.gnu.org/philosophy/free-sw.html">freedom</a> and your privacy!<br/><small>For a browser with an even bigger focus on privacy, <a href="apt:icecat">install GNU/IceCat</a></small></p>
<p><a target="_blank" href="https://trisquel.info/browser">Abrowser</a> protects your <a target="_blank" href="http://www.gnu.org/philosophy/free-sw.html">freedom</a> and your privacy!<br/><small>For a browser with an even bigger focus on privacy, <a href="apt:icecat">install GNU IceCat</a></small></p>
</div>
<div class="block-side-margin"></div>
</div>
......
// Enable hello
pref("loop.throttled", false);
// Release notes and vendor URLs
pref("app.releaseNotesURL", "http://trisquel.info/browser");
pref("app.vendorURL", "http://trisquel.info/browser");
......@@ -11,6 +14,11 @@ pref("pfs.filehint.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETY
pref("keyword.URL", "https://duckduckgo.com/?t=trisquel&q=!+");
pref("browser.search.defaultenginename", "DuckDuckGo (SSL)");
pref("browser.search.order.extra.duckduckgo", "DuckDuckGo (SSL)");
pref("browser.search.showOneOffButtons", false);
pref("browser.search.suggest.enabled",false);
// Disable preconnecting to search engine when clicking on the search bar
//pref("network.http.speculative-parallel-limit", 0);
// Disable plugin installer
pref("plugins.hide_infobar_for_missing_plugin", true);
......@@ -99,7 +107,7 @@ pref("social.toast-notifications.enabled", false);
pref("datareporting.healthreport.uploadEnabled", false);
pref("datareporting.healthreport.service.enabled", false);
pref("browser.slowStartup.notificationDisabled", true);
pref("network.http.sendRefererHeader", 0);
pref("network.http.sendRefererHeader", 2);
//http://grack.com/blog/2010/01/06/3rd-party-cookies-dom-storage-and-privacy/
//pref("dom.storage.enabled", false);
pref("dom.event.clipboardevents.enabled",false);
......@@ -110,6 +118,10 @@ pref("toolkit.telemetry.enabled", false);
// Do not tell what plugins do we have enabled: https://mail.mozilla.org/pipermail/firefox-dev/2013-November/001186.html
pref("plugins.enumerable_names", "");
pref("plugin.state.flash", 1);
// Don't download ads for the newtab page
pref("browser.newtabpage.directory.source", "");
pref("browser.newtabpage.directory.ping", "");
pref("browser.newtabpage.introShown", true);
// Services
......@@ -132,7 +144,7 @@ pref("security.tls.version.min", 1);
// Do not autoupdate search engines
pref("browser.search.update", false);
// Warn when the page tries to redirect or refresh
pref("accessibility.blockautorefresh", true);
//pref("accessibility.blockautorefresh", true);
// Disable channel updates
pref("app.update.enabled", false);
......
This software is derived from the Cephes Math Library. It is
incorporated herein, and licensed in accordance with the Gnu
General Public License, Version 2, by permission of the author.
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Grace
Source: ftp://plasma-gate.weizmann.ac.il/pub/grace/src/
Comment: This is Debian GNU/Linux's prepackaged version of Grace, an XY plotting tool
based on Xmgr. Xmgr was written by Paul J Turner. Grace is maintained by a
team coordinated by Evgeny Stambulchik <fnevgeny@plasma-gate.weizmann.ac.il>.
Files: *
Copyright: Copyright (c) 1991-1995 Paul J Turner, Portland, OR
Copyright (c) 1996-2014 Grace Development Team
Maintained by Evgeny Stambulchik
License: GPL-2+
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later
version.
.
This program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the GNU General Public License for more
details.
.
You should have received a copy of the GNU General Public
License along with this package; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301 USA
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
Files: cephes/*
Copyright: © 1984-1985, 1987-1989, 1991-1993, 1995-1996 Stephen L. Moshier
License: GPL-2
The file cephes/COPYING states:
.
This software is derived from the Cephes Math Library. It is
incorporated herein, and licensed in accordance with the Gnu
General Public License, Version 2, by permission of the author.
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
Comment:
This email from Steve Moshier, the copyright owner of cephes, to Helen
Faulkner (Debian maintainer of labplot), and other interested parties
(labplot and grace authors, grace maintainer and labplot sponsor), confirms
that we may release labplot with cephes licensed under the GPL.
.
.
-------- Original Message --------
Subject: Re: licensing of cephes
Date: Sun, 2 Jan 2005 21:48:02 -0500 (EST)
From: Steve Moshier <steve@moshier.net>
To: Helen Faulkner <helen_ml_faulkner@yahoo.co.uk>
CC: twerner@debian.org, Ben Burton <bab@debian.org>, evgeny@stambulchik.net,
Stefan Gerlach <gerlach@mbi-berlin.de>
References: <41D14354.4040506@yahoo.co.uk>
<Pine.LNX.4.58.0412280836250.9987@moshier.net>
<41D17BE3.3020708@yahoo.co.uk>
<Pine.LNX.4.58.0412281219420.10873@moshier.net>
<41D1FB8D.6030002@yahoo.co.uk>
<Pine.LNX.4.58.0412291032190.15474@moshier.net>
<41D2D8EF.9010702@yahoo.co.uk>
<Pine.LNX.4.58.0412291632540.17032@moshier.net>
<41D41B2E.80508@yahoo.co.uk>
.
.
.
On Thu, 30 Dec 2004, Helen Faulkner wrote:
.
> http://www.debian.org/social_contract#guidelines
.
This is fine with me. To acknowedge your terms explicily,
how about augmenting the permission to read something like
the following --
.
This software is derived from the Cephes Math Library. It is
incorporated herein, and licensed in accordance with DFSG,
by permission of the author.
.
.
If you are trying to get me to suggest a specific form for your
license, then from looking at Debian programs such as dpkg it seems to
me that you would find the GPL to be appropriate and the permission
statement could reference one of the GPL documents instead of DFSG.
Alternatively, the packages you have been talking about distributing
with Debian presumably come with some sort of licenses and it would
make sense to propose those licenses.
Files: T1lib/*
Copyright: Copyright (C) 1996-2003 Rainer Menzner
License: GPL-2+
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later
version.
.
This program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the GNU General Public License for more
details.
.
You should have received a copy of the GNU General Public
License along with this package; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301 USA
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
Files: T1lib/t1lib/parseAFM.*
Copyright: (C) 1988, 1989, 1990 by Adobe Systems Incorporated.
License: MIT
* (C) 1988, 1989, 1990 by Adobe Systems Incorporated. All rights reserved.
*
* This file may be freely copied and redistributed as long as:
* 1) This entire notice continues to be included in the file,
* 2) If the file has been modified in any way, a notice of such
* modification is conspicuously indicated.
*
* PostScript, Display PostScript, and Adobe are registered trademarks of
* Adobe Systems Incorporated.
*
* ************************************************************************
* THE INFORMATION BELOW IS FURNISHED AS IS, IS SUBJECT TO CHANGE WITHOUT
* NOTICE, AND SHOULD NOT BE CONSTRUED AS A COMMITMENT BY ADOBE SYSTEMS
* INCORPORATED. ADOBE SYSTEMS INCORPORATED ASSUMES NO RESPONSIBILITY OR
* LIABILITY FOR ANY ERRORS OR INACCURACIES, MAKES NO WARRANTY OF ANY
* KIND (EXPRESS, IMPLIED OR STATUTORY) WITH RESPECT TO THIS INFORMATION,
* AND EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR PARTICULAR PURPOSES AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* ************************************************************************
Files: T1lib/type1/*
Copyright: Copyright International Business Machines, Corp. 1991
Copyright Lexmark International, Inc. 1991
Portions Copyright (c) 1990 Adobe Systems Incorporated.
License: MIT
* Copyright International Business Machines, Corp. 1991
* All Rights Reserved
* Copyright Lexmark International, Inc. 1991
* All Rights Reserved
* Portions Copyright (c) 1990 Adobe Systems Incorporated.
* All Rights Reserved
*
* License to use, copy, modify, and distribute this software and its
* documentation for any purpose and without fee is hereby granted,
* provided that the above copyright notice appear in all copies and that
* both that copyright notice and this permission notice appear in
* supporting documentation, and that the name of IBM or Lexmark or Adobe
* not be used in advertising or publicity pertaining to distribution of
* the software without specific, written prior permission.
*
* IBM, LEXMARK, AND ADOBE PROVIDE THIS SOFTWARE "AS IS", WITHOUT ANY
* WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT
* LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
* PARTICULAR PURPOSE, AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. THE
* ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE, INCLUDING
* ANY DUTY TO SUPPORT OR MAINTAIN, BELONGS TO THE LICENSEE. SHOULD ANY
* PORTION OF THE SOFTWARE PROVE DEFECTIVE, THE LICENSEE (NOT IBM,
* LEXMARK, OR ADOBE) ASSUMES THE ENTIRE COST OF ALL SERVICING, REPAIR AND
* CORRECTION. IN NO EVENT SHALL IBM, LEXMARK, OR ADOBE BE LIABLE FOR ANY
* SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
* RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Files: T1lib/type1/ffilest.h
T1lib/type1/fontfile.h
T1lib/type1/fontmisc.h
T1lib/type1/fontxlfd.h
Copyright: Copyright 1991 Massachusetts Institute of Technology
License: MIT
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation, and that the name of M.I.T. not be used in advertising or
* publicity pertaining to distribution of the software without specific,
* written prior permission. M.I.T. makes no representations about the
* suitability of this software for any purpose. It is provided "as is"
* without express or implied warranty.
*
* M.I.T. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL M.I.T.
* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Keith Packard, MIT X Consortium
Files: T1lib/type1/font.h
T1lib/type1/fontstruct.h
T1lib/type1/fsmasks.h
Copyright: Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts
Copyright 1987 by the Massachusetts Institute of Technology, Cambridge, Massachusetts
License: MIT
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Digital or MIT not be
used in advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
Files: Xbae/*
Comment: Xbae files are distributed in the upstream tarball, but the
binaries are compiled using the separate xbae packages. This
code copy is unused.
Copyright: Copyright (c) 1991, 1992 Bell Communications Research, Inc. (Bellcore)
Copyright (c) 1995-97 Andrew Lister
License: MIT
Permission to use, copy, modify and distribute this material for any
purpose and without fee is hereby granted, provided that the above
copyright notices and this permission notice appear in all copies, and
that the name of any author not be used in advertising or publicity
pertaining to this material without the specific, prior written
permission of an authorized representative of Bellcore and current
maintainer.
.
BELLCORE AND OTHER CONTRIBUTORS MAKE NO REPRESENTATIONS AND EXTEND NO
WARRANTIES, EXPRESS OR IMPLIED, WITH RESPECT TO THE INFORMATION,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR ANY PARTICULAR PURPOSE, AND THE
WARRANTY AGAINST INFRINGEMENT OF PATENTS OR OTHER INTELLECTUAL
PROPERTY RIGHTS. THE SOFTWARE IS PROVIDED "AS IS", AND IN NO EVENT
SHALL ANY AUTHOR OR ANY OF THEIR AFFILIATES BE LIABLE FOR ANY DAMAGES,
INCLUDING ANY LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL
DAMAGES RELATING TO THE INFORMATION.
Files: debian/*
Copyright: Copyright 1997-1998 Enrique Zanardi
Copyright 1999-2009 Torsten Werner
Copyright 2005-2008 Ionut Georgescu
Copyright 2010-2014 Nicholas Breen
License: GPL-2+
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later
version.
.
This program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the GNU General Public License for more
details.
.
You should have received a copy of the GNU General Public
License along with this package; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301 USA
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
From c21ab7dfe08353f54716a1361b541aade42c1dca Mon Sep 17 00:00:00 2001
From: Paolo Valente <paolo.valente@unimore.it>
Date: Thu, 22 May 2014 11:59:35 +0200
Subject: [PATCH 1/3] block: cgroups, kconfig, build bits for BFQ-v7r7-3.16
Update Kconfig.iosched and do the related Makefile changes to include
kernel configuration options for BFQ. Also add the bfqio controller
to the cgroups subsystem.
Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
---
block/Kconfig.iosched | 32 ++++++++++++++++++++++++++++++++
block/Makefile | 1 +
include/linux/cgroup_subsys.h | 4 ++++
3 files changed, 37 insertions(+)
diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
index 421bef9..0ee5f0f 100644
--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
@@ -39,6 +39,27 @@ config CFQ_GROUP_IOSCHED
---help---
Enable group IO scheduling in CFQ.
+config IOSCHED_BFQ
+ tristate "BFQ I/O scheduler"
+ default n
+ ---help---
+ The BFQ I/O scheduler tries to distribute bandwidth among
+ all processes according to their weights.
+ It aims at distributing the bandwidth as desired, independently of
+ the disk parameters and with any workload. It also tries to
+ guarantee low latency to interactive and soft real-time
+ applications. If compiled built-in (saying Y here), BFQ can
+ be configured to support hierarchical scheduling.
+
+config CGROUP_BFQIO
+ bool "BFQ hierarchical scheduling support"
+ depends on CGROUPS && IOSCHED_BFQ=y
+ default n
+ ---help---
+ Enable hierarchical scheduling in BFQ, using the cgroups
+ filesystem interface. The name of the subsystem will be
+ bfqio.
+
choice
prompt "Default I/O scheduler"
default DEFAULT_CFQ
@@ -52,6 +73,16 @@ choice
config DEFAULT_CFQ
bool "CFQ" if IOSCHED_CFQ=y
+ config DEFAULT_BFQ
+ bool "BFQ" if IOSCHED_BFQ=y
+ help
+ Selects BFQ as the default I/O scheduler which will be
+ used by default for all block devices.
+ The BFQ I/O scheduler aims at distributing the bandwidth
+ as desired, independently of the disk parameters and with
+ any workload. It also tries to guarantee low latency to
+ interactive and soft real-time applications.
+
config DEFAULT_NOOP
bool "No-op"
@@ -61,6 +92,7 @@ config DEFAULT_IOSCHED
string
default "deadline" if DEFAULT_DEADLINE
default "cfq" if DEFAULT_CFQ
+ default "bfq" if DEFAULT_BFQ
default "noop" if DEFAULT_NOOP
endmenu
diff --git a/block/Makefile b/block/Makefile
index a2ce6ac..a0fc06a 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING) += blk-throttle.o
obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o
+obj-$(CONFIG_IOSCHED_BFQ) += bfq-iosched.o
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o