Kernel 3.7.9

atratsevskiy
parent 2e2822604a
commit dd49b46a8d

@ -0,0 +1,197 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
#
# Original Author: © 2007-2009 Mir Calculate, Ltd.
# Purpose: Installing linux-desktop, linux-server.
# Build the kernel from source.
inherit calculate eutils kernel-2
EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst
IUSE="vmlinuz minimal"
REQUIRED_USE="minimal? ( vmlinuz )"
detect_version
detect_arch
if [[ ${KV_MAJOR} -ge 3 ]]
then
CKV=$(get_version_component_range 1-3)
CL_PATCH=$(get_version_component_range 1-2)
local oldifs=${IFS}
export IFS="."
local OKV_ARRAY=( $OKV )
export IFS=${oldifs}
if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then
# handle calculate-sources-3.x.y correctly
if [[ ${KV_PATCH} -gt 0 ]]; then
KERNEL_URI="${KERNEL_BASE_URI}/patch-${OKV}.bz2"
UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.bz2"
fi
KERNEL_URI="${KERNEL_URI} ${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.bz2"
else
KERNEL_URI="${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
fi
else
die "Eclass is used only for kernel-3"
fi
SLOT=$(get_version_component_range 1-4)
KV_FULL="${PV}-calculate"
S="${WORKDIR}/linux-${KV_FULL}"
CALC_K_SUBV=.$(get_version_component_range 4)
[[ ${CALC_K_SUBV} == "." ]] && CALC_K_SUBV=
EXTRAVERSION="${CALC_K_SUBV}-calculate"
UNIPATCH_STRICTORDER=1
if [[ -n $LONGTERM ]];then
if [[ $KERNEL_URI =~ ^(.*)(kernel/v3.0/patch)(.*)$ ]];then
KERNEL_URI="${BASH_REMATCH[1]}kernel/v3.0/longterm/v${CKV}/patch${BASH_REMATCH[3]}"
fi
fi
calculate-kernel-5_pkg_setup() {
kernel-2_pkg_setup
eqawarn "!!! WARNING !!! WARNING !!! WARNING !!! WARNING !!!"
eqawarn "After the kernel assemble perform command to update modules:"
eqawarn " module-rebuild -X rebuild"
}
calculate-kernel-5_src_unpack() {
kernel-2_src_unpack
}
vmlinuz_src_compile() {
# disable sandbox
export SANDBOX_ON=0
export LDFLAGS=""
local GENTOOARCH="${ARCH}"
unset ARCH
cd ${S}
DEFAULT_KERNEL_SOURCE="${S}" CMD_KERNEL_DIR="${S}" cl-kernel \
--ebuild \
-o \
${CL_KERNEL_OPTS} \
--kerneldir=${S} \
--set cl_kernel_cache_path=${WORKDIR}/cache \
--set cl_kernel_temp_path=${S}/temp \
--set cl_kernel_install_path=${WORKDIR} \
|| die "kernel build failed"
[ -f .config ] && cp .config .config.save
make distclean &>/dev/null || die "cannot perform distclean"
mv .config.save .config
ARCH="${GENTOOARCH}"
rm ${WORKDIR}/lib/modules/${KV_FULL}/build
rm ${WORKDIR}/lib/modules/${KV_FULL}/source
}
calculate-kernel-5_src_compile() {
use vmlinuz && vmlinuz_src_compile
}
vmlinuz_src_install() {
cd ${WORKDIR}/lib
insinto /lib
doins -r modules
insinto /usr/share/${PN}/${PV}
doins -r firmware
cd ${WORKDIR}
doins -r boot
dosym /usr/src/linux-${KV_FULL} \
"/lib/modules/${KV_FULL}/source" ||
die "cannot install source symlink"
dosym /usr/src/linux-${KV_FULL} \
"/lib/modules/${KV_FULL}/build" ||
die "cannot install build symlink"
insinto /etc/modprobe.d
}
calculate-kernel-5_src_install() {
if use minimal
then
local GENTOOARCH="${ARCH}"
unset ARCH
ebegin "kernel: >> Running modules_prepare..."
make modules_prepare &>/dev/null
eend $? "Failed modules prepare"
ARCH="${GENTOOARCH}"
einfo "Cleaning sources"
for rmpath in $(ls arch | grep -v x86)
do
rm -r arch/$rmpath
done
KEEPLIST="scripts/Makefile.lib scripts/module-common.lds \
scripts/gcc-version.sh scripts/Makefile.help \
scripts/Makefile.modinst scripts/Makefile.asm-generic \
scripts/Makefile.modbuiltin scripts/Makefile.fwinst \
scripts/depmod.sh scripts/Makefile.host \
scripts/Kbuild.include scripts/Makefile.modpost \
scripts/gcc-goto.sh scripts/Makefile.headersinst \
scripts/Makefile.build scripts/basic/fixdep \
scripts/Makefile.clean scripts/mod/modpost \
include/config/kernel.release include/config/auto.conf \
arch/x86/Makefile_32.cpu arch/x86/Makefile \
System.map Makefile Kbuild"
find . -type f -a \! -wholename ./.config \
$(echo $KEEPLIST | sed -r 's/(\S+)(\s|$)/-a \! -wholename .\/\1 /g') \
-a \! -name "*.h" -delete
rm -r drivers
rm -r Documentation
fi
kernel-2_src_install
dodir /usr/share/${PN}/${PV}/boot
use vmlinuz && vmlinuz_src_install
if ! use vmlinuz
then
cp .config ${D}/usr/share/${PN}/${PV}/boot/config-${KV_FULL}
fi
}
vmlinuz_pkg_postinst() {
cp -p /usr/share/${PN}/${PV}/boot/* ${ROOT}/boot/
cl-kernel --ebuild \
-k /usr/src/linux-${KV_FULL} \
--set cl_kernel_install_path=${ROOT}/
mkdir -p ${ROOT}/lib/firmware
cp -a ${ROOT}/usr/share/${PN}/${PV}/firmware/* ${ROOT}/lib/firmware/
calculate_update_depmod
calculate_update_modules
[[ -f $MODULESDBFILE ]] &&
sed -ri 's/a:1:sys-fs\/aufs2/a:0:sys-fs\/aufs2/' $MODULESDBFILE
}
calculate-kernel-5_pkg_postinst() {
kernel-2_pkg_postinst
KV_OUT_DIR=${ROOT}/usr/src/linux-${KV_FULL}
if ls /usr/share/${PN}/${PV}/boot/ | grep -q System.map
then
cp -p /usr/share/${PN}/${PV}/boot/System.map* ${KV_OUT_DIR}/System.map
fi
cp -p /usr/share/${PN}/${PV}/boot/config* ${KV_OUT_DIR}/.config
cd ${KV_OUT_DIR}
if ! use minimal
then
local GENTOOARCH="${ARCH}"
unset ARCH
ebegin "kernel: >> Running modules_prepare..."
make modules_prepare &>/dev/null
eend $? "Failed modules prepare"
ARCH="${GENTOOARCH}"
fi
use vmlinuz && vmlinuz_pkg_postinst
}

@ -0,0 +1 @@
# Calculate append=skip merge(sys-kernel/calculate-sources)>=3.7&&merge(sys-kernel/calculate-sources)<3.8

@ -0,0 +1,98 @@
# Calculate format=diff os_linux_system==desktop
From 454bb8a84add6d8469b25e73b666d24291db6705 Mon Sep 17 00:00:00 2001
From: Arianna Avanzini <avanzini.arianna@gmail.com>
Date: Sat, 4 Feb 2012 10:55:51 +0100
Subject: [PATCH 1/2] block: cgroups, kconfig, build bits for BFQ-v6-3.7
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 | 26 ++++++++++++++++++++++++++
block/Makefile | 1 +
include/linux/cgroup_subsys.h | 6 ++++++
3 files changed, 33 insertions(+)
diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
index 421bef9..56474b2 100644
--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
@@ -39,6 +39,28 @@ config CFQ_GROUP_IOSCHED
---help---
Enable group IO scheduling in CFQ.
+config IOSCHED_BFQ
+ tristate "BFQ I/O scheduler"
+ depends on EXPERIMENTAL
+ 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 +74,9 @@ choice
config DEFAULT_CFQ
bool "CFQ" if IOSCHED_CFQ=y
+ config DEFAULT_BFQ
+ bool "BFQ" if IOSCHED_BFQ=y
+
config DEFAULT_NOOP
bool "No-op"
@@ -61,6 +86,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 39b76ba..c0d20fa 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -15,6 +15,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
obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
index f204a7a..b999bfa 100644
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
@@ -78,3 +78,9 @@ SUBSYS(hugetlb)
#endif
/* */
+
+#ifdef CONFIG_CGROUP_BFQIO
+SUBSYS(bfqio)
+#endif
+
+/* */
--
1.7.10.4

@ -0,0 +1,15 @@
# Calculate format=diff
diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
index 602cd63..750f44f 100644
--- a/net/core/sock_diag.c
+++ b/net/core/sock_diag.c
@@ -121,6 +121,9 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
if (nlmsg_len(nlh) < sizeof(*req))
return -EINVAL;
+ if (req->sdiag_family >= AF_MAX)
+ return -EINVAL;
+
hndl = sock_diag_lock_handler(req->sdiag_family);
if (hndl == NULL)
err = -ENOENT;

@ -14,6 +14,7 @@ AUX calculate-lib-3.1.3_alpha2-r1.patch 1875 SHA256 35c90a86233ebba723803b04115e
AUX calculate-lib-3.1.3_beta1-r1.patch 2790 SHA256 c4484dd1cfab42e26a1d72fb272bbd68ac0c102c09c1a21f2affa9a96a653720 SHA512 18f40b1dbcbcbda9e53101bb9910e65e5d255846c0dc59e04b48d656d26bffe787756cf83145dd5ac98326c28926e89fb511d671557db58be36a66ca32eb0188 WHIRLPOOL 3f8c7c3c46cd8b523043064d414f975a525889d0caefd7120e2b50df36d5a3fb52c4f6d6d64253a34cb90aa28ad334cbd130393f39485076fd099deb5bfc941f
AUX calculate-lib-3.1.3_beta1-r2.patch 4101 SHA256 01f0f8d3e539223e634ba57d247526da3f0d235e04b5ff64ff087d120a599e1a SHA512 8bacac52fcc6e9c3abaf672ca51c4b51af77991484e157c33e16fc66fd31599923f3ecb767749f9411953848a66a4663d5196a20edbce6f19cd1bca6c3c9a17d WHIRLPOOL bc48fdf1d74084b212fdc2b748b09ec6aefd194f29d30d408ddb8cfa48e4b08c5dc40be7a0ccf6c004ef774226ad45e9df6dbf8069cf44f2fcd481d59dbda494
AUX calculate-lib-3.1.3_beta1-r3.patch 4574 SHA256 55802104c6ce15b0cf979513f72325c05e3d64f426d966bdd11548e7bcac355b SHA512 c1ab5d723120ddc262aa8d5149971f4d3d9068e4b1047083c8f2f19c87cbb461bc595de2122de2f1fc19821afa44898bec0b6a2caa4c3831a7542a9cf6059b27 WHIRLPOOL 505819d48e650237835947d6b832e2ad28972442084acef89c0de3cf2efac918ad04a65039ec2d5e9ae9ed3314215af04a0e7993e268ae617398b5086c02efea
AUX calculate-lib-3.1.4_beta1-r1.patch 3809 SHA256 326da966bd8e06ccf97498f3c12edbb4a1dbfced68d003aa8509a0c67feee8bf SHA512 5f9c54908139bf499f5c7ac835b0c4982a7452deca73b8cbb8e380be42d07641108c030da8e9991c4997c56fbebf62a71c0155fe86eecd5f0ac2feff5dd23a3c WHIRLPOOL e4dd0a4d80a045b0d7c0fdbc3e389a8bee5ba6be9119307278ef889816ee7eeb7f803cff170b7ae1c7844a5004a1bcb935765f4334ee4917dfe9a32dbb1a745e
DIST calculate-lib-2.1.11.tar.bz2 61687 SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599 SHA512 e3bc2168a55367cf19ad3a27921b53e5e845643238bf171209ab29752c91b5d4d338a2120774764ac1c79abd93f2deff8680f8faa1407940984ea9fd6a199e67 WHIRLPOOL 0ced92ea493dd8db02b0ae1514ebbb51ee76dc6f441b4a38c984c39da2121fb81dd1f2e840c4c5b71a117a12817a2a269d85676288202aa9801f69727e3338dc
DIST calculate-lib-2.2.30.tar.bz2 120055 SHA256 a5aa07e5c5e02d27a8b9fad8c0e4bd0562d40d7a2753c2b57a18d99bd0dd6cb2 SHA512 7e8920f5fd855f05aba6576d5e4751ecf71a3e4107b46671d9a4be8557e1dd616adefad728b6a9ca87656dca6fd17d52bce41462b7fc906d20118e97607f1b1b WHIRLPOOL 0e8441484ee7d91c9926ab2deed8357272fecb2156e5dad45f865f6b13aff6c43868323dececc859ce7824bedd8794cec25b857be30afa83c44a81bcbcf510d2
DIST calculate-lib-2.2.31.tar.bz2 120044 SHA256 ba38052d8b2349a1c60adc589a74eb8a3ffcbf6f3c1124e4c1fb0da3aa777f12 SHA512 902871b9159f2bcf7a0cc767fb6df5b19902fce6cf9468d96f902c383a422738b65debe3094c92d1f82de2124936496f89631c6eb9670da00807b63156b101b7 WHIRLPOOL 5179ee691519f3a7faa3135d040ad64bd6d67c026ebf39bb17f7d641130a2b58641d1fe5da4f6cfbd45d4442d93508f0a5f641ef2cd8c43e1a322aab3d11f4b9
@ -46,6 +47,7 @@ EBUILD calculate-lib-3.1.3_beta1-r1.ebuild 829 SHA256 09168e9dcac1a21b300c5d3e39
EBUILD calculate-lib-3.1.3_beta1-r2.ebuild 829 SHA256 64a88bdf361cdf7a5b401bfd2f9568272ce6044576670d93985c484a1593781e SHA512 364b8e8fca2eb9f7363838a65877ea839171429865b63c25573e7ea0752cb6dd6255a1ca2e7594d8b70edf0b054043c5b4cd23a01ab4a8752e4a25c6e1442d4b WHIRLPOOL 679c07bf8d777c71f42a074b5ecf89cbbc7c80e573aa6d0eca2442a05efb8ac1b0054c73ca20360c1185611cca24f5dac1a17472807044aa422b831245dd2b3b
EBUILD calculate-lib-3.1.3_beta1-r3.ebuild 829 SHA256 6f1c83b0709de6bca2aede9230984e0c1a40aa48a867e6291a89f582095db89c SHA512 5d6070b374e96492c51ce2e28fcff730c0baa7c32af85ce2e9375b5822118385a5233360aaca26975ee9ae6ceaa8dff1111ef83a729c405fc109eec17b4a9830 WHIRLPOOL 36d0956c148033a265d9c8dc6def18017cb815f1a9572e21bdda449ca04f8f9aa6af8347af4510c69f9807fb1ff3899c507b43afe2addd5c562b7935c265a277
EBUILD calculate-lib-3.1.3_beta1.ebuild 690 SHA256 c89c29f5de3f70146e98f15035366506933f03e8a5066b1ad55aeccbebdeae2c SHA512 a7277c2e5fa64a5e5840be7fc8d3df9a31f41926386c5fe6a9bed31eeed6321af5881c218d9ce7eeb12aee518edb682b438e10397dcb815cc63645100430e43e WHIRLPOOL 8f19e4d46381e26fec81e20fa35599f4658b3891d6372c921a8b1354ad3b1821ea9c78f71caebf54610e0b5aacfb6e6ded018e155e1979322406a0ac1e823d09
EBUILD calculate-lib-3.1.4_beta1-r1.ebuild 829 SHA256 66bcc1e709c66e66850881039a71df737746d279962d2027ecfaba889b05d8b5 SHA512 e853f1b2561a92325fe9fe81d5f9097e7a3f43478dd53ce2c193a771dc6e75513fa190861cfba009dd6538f41d2458a938e11f44b8d0eb6effca10ac6f2a2c05 WHIRLPOOL 84b88529c6b07f29cf10346745f3d8145ae7940787ada4d1b94dc3296f6691e41443787d3b7d7c034f7f2f6b39e224bd8a9b770b5ce45744605eb465f9dab7ca
EBUILD calculate-lib-3.1.4_beta1.ebuild 690 SHA256 c89c29f5de3f70146e98f15035366506933f03e8a5066b1ad55aeccbebdeae2c SHA512 a7277c2e5fa64a5e5840be7fc8d3df9a31f41926386c5fe6a9bed31eeed6321af5881c218d9ce7eeb12aee518edb682b438e10397dcb815cc63645100430e43e WHIRLPOOL 8f19e4d46381e26fec81e20fa35599f4658b3891d6372c921a8b1354ad3b1821ea9c78f71caebf54610e0b5aacfb6e6ded018e155e1979322406a0ac1e823d09
EBUILD calculate-lib-3.1.9999.ebuild 708 SHA256 a1d64b7f014831bf6b0a38928d53cb55758b7a12e5f3e98fffd28025ffacbce1 SHA512 3873859a791941d421e2338b437521955da383ce986408f1a951305e2dd75a1a4f771c9ec2caa096c5c8ea6a1776d6d0ed99e025ffa786ba029cafdbadfa439b WHIRLPOOL 5ac1a10b53f810ab527a0ebe52bc87e8397e61375cf6e0acbed89d8f6b8385e72bf234e0fdce479c3a3f1652bb6e520710ce9356750a97d644c0db0a33f6facb
MISC ChangeLog 29851 SHA256 16ca15c794bce78eefc487ed372c3d4960078fbd4c5fe4524211688d0146ef97 SHA512 be6bdf290f391529dce0deb67bf9d367e42e407601dd581f7c08d082399b5860cff2a76d4d64dd876154d51e84f34499db06c715145ac64f78d168aae7e78dbf WHIRLPOOL 2561ccd1eefe3423d97c67aff5c0fe6c8ca624e527fb885b042c8e812194bb1635d7e7d7d86c534562eb780c6b9144d92e24893f2d0696cf8a34a6a912a45788

@ -0,0 +1,35 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 3"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/iproute2
sys-apps/pciutils
sys-fs/lvm2
sys-fs/mdadm
dev-python/pyinotify
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-lib-3.1.4_beta1-r1.patch"
}

@ -0,0 +1,83 @@
diff --git calculate/lib/cl_template.py calculate/lib/cl_template.py
index 2790486..0e7d094 100644
--- calculate/lib/cl_template.py
+++ calculate/lib/cl_template.py
@@ -2221,7 +2221,7 @@ class _file(_error):
return F_CONF
- def openFiles(self, nameFileTemplate, nameFileConfig):
+ def openFiles(self, nameFileTemplate, nameFileConfig, typeFormat=None):
"""Открывает шаблон и конфигурационный файл"""
self.textConfig = ""
self.textTemplate = ""
@@ -2231,7 +2231,7 @@ class _file(_error):
self.nameFileConfig = os.path.abspath(nameFileConfig)
self.nameFileTemplate = os.path.abspath(nameFileTemplate)
self.F_TEMPL = self.openTemplFile(self.nameFileTemplate)
- if not self.executeType:
+ if not self.executeType and typeFormat != "diff":
self.F_CONF = self.__openConfFile(self.nameFileConfig)
if self.F_TEMPL and self.F_CONF:
self.textTemplate = self.F_TEMPL.read()
@@ -4610,7 +4610,7 @@ gettext -d cl_template "$*"
if stat.S_ISREG(statInfo):
if not self.processingFile(absPath, prefix, optDir):
ret = False
- break
+ continue
elif stat.S_ISDIR(statInfo):
# Обработка директории
retDir = self.processingDirectory(absPath, prefix,
@@ -4639,6 +4639,7 @@ gettext -d cl_template "$*"
self.stop = e.status()
return False
else:
+ self.clearErrors()
self.printWARNING(str(e))
finally:
self.objVar.defaultModule = prevModule
@@ -5431,7 +5432,7 @@ gettext -d cl_template "$*"
preReturn(pathProg)
return ([], False)
if not flagSymlink:
- self.openFiles(nameFileTemplate, pathOldFile)
+ self.openFiles(nameFileTemplate, pathOldFile,objHeadNew.fileType)
if self.getError():
return ([], False)
if not objHeadNew.params.has_key("chown"):
@@ -5656,9 +5657,8 @@ gettext -d cl_template "$*"
self.textTemplate = objTempl.processingFile(self.textConfig,
self.objVar.Get('cl_root_path'))
if objTempl.getError():
- self.setError(_("Failed to use patch ") + \
+ raise TemplatesError(_("Failed to use patch ") + \
nameFileTemplate)
- return False
elif formatTemplate == 'diff':
self.printSUCCESS(_("Applying patch")+ " " + \
os.path.basename(nameFileTemplate))
@@ -5979,6 +5979,7 @@ class scanDirectoryClt:
self.stop = e.status()
return False
else:
+ self.clearErrors()
self.printWARNING(str(e))
return True
diff --git calculate/lib/format/diff.py calculate/lib/format/diff.py
index 1f45e8e..210f7ec 100644
--- calculate/lib/format/diff.py
+++ calculate/lib/format/diff.py
@@ -43,6 +43,11 @@ class diff(_error):
patchDryRun.write(self.text)
if patchDryRun.success():
break
+ patchDryRun = process('/usr/bin/patch','-R','--dry-run',
+ '-p%d'%i,cwd=rootPath,)
+ patchDryRun.write(self.text)
+ if patchDryRun.success():
+ return ""
else:
self.setError(_("Patching failed"))
return False

@ -29,6 +29,7 @@ EBUILD calculate-utilities-3.1.3_beta1-r4.ebuild 815 SHA256 9909c9ffb7822c884502
EBUILD calculate-utilities-3.1.3_beta1-r5.ebuild 815 SHA256 9a7cfdfbab83328e54083ceb46fb624d4e3dcaf71fd8354c05302c1f7f1d966e SHA512 18254e988f71ba09ca68d001874fe3d0c7732d9d1ffa49ef7c26fea2f0854e3ebbe763ba000a80601d120e14f6b09e37000ac126792d881c40db60bf80835705 WHIRLPOOL e0526bdd59205ea93e81e8c028bd758936d21dda930989f7b71e2bf363e70e637a11c911893cc3d290d1c24aca7e880b20e3ef038c21e30757581cbf2d0ffe32
EBUILD calculate-utilities-3.1.3_beta1-r6.ebuild 818 SHA256 1154c4ed993789c851307cf1ffdf629fc43bd93bd390807a6286d9107310c3b0 SHA512 2ffa445e1b12919aedbd7f8dbd1ec1e917df843789ea409f1ed5078c7b6f5c638396173d3e28708c25f44c87def143ac184abca2c7ff7b13fdd84ae7c06dde9d WHIRLPOOL 42998ce33350fc910780cdec1f2dc025c99f911d99ba544b4e1331a9801dccd0159e700bc9f103253f01d0ff3996d2533dfafa1607a99f82c733a4e262588774
EBUILD calculate-utilities-3.1.3_beta1.ebuild 803 SHA256 01fe721fa13a5f482817adfcc1acda6d875c3e89bbe5e7b040678eb2dcaca955 SHA512 514968f56a539337f960abb8d0e3667cfaf28832c3b6dd301f100be03419e6edb9b8bfa134eb2613b192d2ca657cfe0a78c06e2d33c939f20ec1a9b936290fd5 WHIRLPOOL 57cab0053e5e467282758747c1a967eb27b936a3bedc47a58c6f9a40baf1964a9419dcc96beaa022fd91ba66906eabed29fed29e9f9217a2536d2afb135db693
EBUILD calculate-utilities-3.1.4_beta1-r1.ebuild 806 SHA256 4a7adfe80122e55371861dba634a2e8514d04e37c86c1c702586af4b8e86af81 SHA512 e4ac5feca71624c50a817cd04f0560abb9f6d6b1572213a2c62c260627f278aafc20aad04db97084ec2759c058c92cecdd0938ec935e883fd8383f55aa67f121 WHIRLPOOL b03882469278cc0be9dee0f3ad8973333e80307e65b3a07cacface934d58ead7b021882bcb74759945d693dd4f97a3e97556d85dd331a54e83c5f7721f6066f3
EBUILD calculate-utilities-3.1.4_beta1.ebuild 803 SHA256 c2c52a9e05c240e687dec688c27d3073ded2682c6cb2ad6825b20aea16d34761 SHA512 f7604ab68017bd116850dc627a3e7ed4aa23a8a99eaa2a95229cde553ce1394629489cf1e59f69de084ccc69cb7241e06978da73f3e4ce7205cd014da3a5b0eb WHIRLPOOL 100bfaf16ad6575c8c14ff8a222bc2641620dfff2bafebdef03949ade4c352b1437838d8b13293c71866ca0db62e08c581b2c1a99a8fa1a466a718fca1494302
EBUILD calculate-utilities-3.1.9999.ebuild 800 SHA256 9de4807341cb552ef8d4f702e9c4a0ca10c52c9d532cc2eb741cea29b92f09b5 SHA512 b35ed4d49c4943a5ad375e646bece419271900c50301153408b30dede0fe834e098baaa42a21c130730c0bc32ba09decc588277da6782d2010c18c9d8df679ae WHIRLPOOL 78e2c5ee8ef8356c4fc0275f920177778925278cad78585ed37c08048241f775030e59a0ced0696fba6379741fe865dc339d190c46b5f2173097328a73c64a24
MISC ChangeLog 38731 SHA256 7e70a0bc1f3b34c0011f3874773a698a4bb96eb6d3dad10903575156bb8578bc SHA512 2de466ea990b9eac702b81fd097c3f5d06d1f4db1a4bd1d1b7380b45e551f6fd62c16564ecfc810246157d3ef1113ae373041580e70981d44752e50ed6134bc0 WHIRLPOOL 5ca0cee1ad0e9419f91ec11a9629b9a29db9fcbed4f5ae0aef1f8a2170ff58112c8580d61884c56ee410a0abc201fa8f4419cea35077fc8bb84e733f6fa6f4db

@ -0,0 +1,26 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="cl_consolegui cl_client cl_desktop cl_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.1.4_beta1
=sys-apps/calculate-i18n-3.1.4_beta1
=sys-apps/calculate-lib-3.1.4_beta1-r1
=sys-apps/calculate-core-3.1.4_beta1
=sys-apps/calculate-update-3.1.4_beta1
cl_client? ( =sys-apps/calculate-client-3.1.4_beta1 )
cl_desktop? ( =sys-apps/calculate-desktop-3.1.4_beta1 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.4_beta1 )
cl_console? ( =sys-apps/calculate-console-3.1.4_beta1 )
"

@ -63,6 +63,7 @@ DIST patch-3.5.5.bz2 192824 SHA256 8af65a2a3bf77a86c715aedad79b3d5bc02ef05619a77
DIST patch-3.5.7.bz2 241834 SHA256 c064888f2c815353b2ca483935a9e79572e2d033559b73971f7f32c8eaa4b66f SHA512 024bfbd23905805bf6ce8326b9e69b2d9cd539038cc8c00f3145b8a482caa6eec3993771c69800784ebab0d9c3d43910a9bd5e561012c67df44f663cfd61afc0 WHIRLPOOL 98239024aa4a702aa80fd53b2efb8614ab64eb23c2b35aeb75bc858ca3df4c05f986dd517f455c8fa04ce05079bd03ac1bc974b873e12f431fa773d7766f7015
DIST patch-3.6.11.bz2 229142 SHA256 bd25c577b623468286d228ef5e09f4126e1c16ed22fb1cfeebc80e47a40b1de1 SHA512 bd59c0cf8a1208161633344444de4e4b8ef1d536ab4c095cbf402dded968daa9b0cccf35eeaf4ec243a66de5fdfe84b3e5755f972854559af38221614b1c6665 WHIRLPOOL 67cd2b7a40407de46c1e9308ef3807a07e5df7338c7cc8dd08c380ece42c20d5e34acafde2861e3bdeced71523e764421c633172f563d39840f54130dabacb3e
DIST patch-3.7.7.bz2 182947 SHA256 f4dfc70d642dea333ae67b37520ed218a71fb1a8c7bbb543da5bc2e2141c2628 SHA512 644abd55ed6db4b4aead399332344a6df47236721f1ae2f3cb5ab726bab170109e590c492d4cdfdc2bc9bd7d0c717ba81a511ef89ec85b4bdf70f7c1147eadc6 WHIRLPOOL b83114acaf5aa6969fa11045f2a3cd8601edb9bb51c84ee2765b5a836794a5f90699da57625e186a4bfcc656e2228aa8dd26f19d1a4f381e1515afbafd99f86b
DIST patch-3.7.9.bz2 200016 SHA256 01400628da043a99724f04ab021d40d0756a7a9c02d662f4a7e267e88c5b943f SHA512 b5ed83363abb59feb65894d44b36c7263daf974f9e85084824858a2357324298a3c988e5377af160f61ae89da56947d3c4921f5100ab9af536816dcd7ae350be WHIRLPOOL 8e32befa516b682104626a2535ddb440607faf0138eb4e225959406ab60f67b2baef4b24a49e2036d3a52950e7e4582a97282cadf6453724473aa50ee8d62712
EBUILD calculate-sources-2.6.32.60.ebuild 747 SHA256 2ca22d6ad7b2e2a20d42c77462043bc359e36dc73d144231b758ac408885e988 SHA512 b07d2d22cb0b51380746c2baf642e78f08afd44bdaf2d98704e64dfb043570a3cd899645f01a4b702db175d92f89bcec5b9488f026df73c48bcbbbd6101e6443 WHIRLPOOL f4f5310d72560098c57e8f2920a9590495f19a1bd1d9e67789e7234ea1873ef8be63ecf53cc0fb831230d8b08c63ed9a9b4f85c44509b5d550101c1dec7736c0
EBUILD calculate-sources-2.6.35.13.ebuild 1337 SHA256 4a6fd8693a3948f581a0adf550d7898da01a719f8fcb8ecfb18ec14347c37131 SHA512 daf44d7b377af09287229c017ea84bd07133a49a269518557b5652112c3087a7c7416b899cc19ff42f2bf3da04831d5b35611535d55a012c05ec07f713559d2e WHIRLPOOL cf94157a4ce70c730faf3e5fb0e0977a09e8e77071208d9664f4e0cbc96b666bd7ac04a97151eb05ab60ea043e44618d1866ade738dd05f44f84a133883ac7aa
EBUILD calculate-sources-2.6.36.4.ebuild 1325 SHA256 261e22b1f6000039b006e00eca83a524d4614a6cfb329b35cfa09180cbb086c6 SHA512 cb6fa3a44514272d0c201ab748917956b277bab9bed422b491d9211a109c13775fed22eb323504bd72b2a51456ba7fd5820676794ed79f8271d09f5d0c18e76c WHIRLPOOL 3ed3c664d87118069446471446031589e74f3cc74b0a3c8df78c2577f456165f7d020d5866212acee99f22e9328afb8a0f6b31ad199abff727c7922d5f250916
@ -81,4 +82,5 @@ EBUILD calculate-sources-3.5.5.ebuild 1493 SHA256 826155fa9986a2791e0e3034b8c6c5
EBUILD calculate-sources-3.5.7.ebuild 1495 SHA256 c5bd0265ffd456329e798b2b0c20015c64c8b40addd7d45faff4c9537ff52a22 SHA512 43c152e5d842387baf3bb1b5a7b1c63fe2e362902df14ec76a713d11c0eb1de20d4a12b8ea4f867a7d87d29aec9e65843d517c5325e50cd75ace7e4179f69f32 WHIRLPOOL 0700f8a951d54d6503a78ae034bd4897330b8a4b6e55691433cd0375d14463742c18dbbe489446d4cf4cb8a54613ff3b7c6399db26aeafe5c6ca4a9e53c15691
EBUILD calculate-sources-3.6.11.ebuild 1491 SHA256 0988752d2c1d88eaff3265cfda8b839d6b8cf6245413d21009665736598d1ff5 SHA512 73a2d9ed488199570ad5f1177855e74e565d6f0659dc0166c77fd711f72fe22050ce04f1bd6cea89a3c220dca7fd566e704eecf28cacf347b25ddaf9c4511ec0 WHIRLPOOL 04dd6c0e4c36770a38b3f92a1f171c055e8cc8affefd1efd88d904cd0b8d6275323e54181930a2121d12329750b55416eb72c123d054d1930aa09c19e4ed4b92
EBUILD calculate-sources-3.7.7-r1.ebuild 1491 SHA256 205116e7bf4d1a2b1f342b882d9e4daeb78e9c6bc5724069fdb6e49163be1b6f SHA512 b117ac74ec2645fcf5eed381323e57af9e73a7f599c9f2be9a60d8514afdc7336d0aabbc3e1fac5845fcb04507ea98eeb1d516e4bc853caa7f70e328f34f8b76 WHIRLPOOL 38ef203b5f2155c38fb6ceab683b48cca2e25c09c8d62ebf45b99299999a4c9a8d27e699890d50fe6111828109eda7944f6f3957e0572225df266d135a8adf78
EBUILD calculate-sources-3.7.9.ebuild 870 SHA256 3388a043b64ba0d77697611c6bf59745329f0202050f549ca5d8d10adbeecb18 SHA512 36e92b2e207b85ff41cad03e3f943cde87675e998919a471ce345ef1a09baa6e1044eb8fc2c3d18b9ee82e3f67638272797598ed649dac7ad0df935d2930e945 WHIRLPOOL 18f152588fe86762bcb3cb42563bd4dddacd8251c9a307c8d7db7283b36b7fc7000307e600141e418d90cf4ddfd23fb800f8c1412b7650412182d50cc0b5b111
MISC metadata.xml 602 SHA256 2b222337597cf63fdd23baa8e278b8c62e4ee2e6d65e92dd52253a857e48913d SHA512 19b14786eda7f838389608211c7f9aa3f22ddc9677269a3dca53d10d627dce40463d1fa471efe2187f9f7731abc7fe8812ec72851690d76299565f3c52c23392 WHIRLPOOL e1a2a0384808427b48320071e9057e2e69ac1e259ae698270e4261415c8ff4f2aca15decdcd7eb2a57eb33092683f12f84a7fe1d348008c2410c671fa8d9a562

@ -0,0 +1,39 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
ETYPE="sources"
inherit calculate-kernel-5 eutils
DESCRIPTION="Full sources including the Calculate patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
KEYWORDS="amd64 x86"
HOMEPAGE="http://www.calculate-linux.org"
IUSE=""
#IUSE="hardened"
HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-5"
HGPV_URI=""
SRC_URI="${KERNEL_URI} ${ARCH_URI} ${HGPV_URI}"
DEPEND="vmlinuz? ( >=sys-kernel/calckernel-3.4.18-r12
>=sys-apps/calculate-builder-2.2.30-r3
>=sys-apps/calculate-install-3.1.4_beta1
|| ( app-arch/xz-utils app-arch/lzma-utils )
sys-apps/v86d
!<net-wireless/rtl8192se-3.0
sys-boot/grub
)"
CL_KERNEL_OPTS="--lvm --mdadm --dmraid"
src_unpack() {
calculate-kernel-5_src_unpack
}
pkg_postinst() {
calculate-kernel-5_pkg_postinst
}
Loading…
Cancel
Save