kuraga
/
calculate-overlay
forked from calculate/calculate-overlay
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Calculate 1.3.4 Caluclate-sources-2.6.32.6

Browse Source
master
Mike Hiretsky 15 years ago
parent 99e7a9679a
commit 8463bda5ae
6 changed files with 110 additions and 30 deletions
Show Stats Download Patch File Download Diff File

50
eclass/calculate-kernel.eclass
Unescape View File

@ -8,7 +8,7 @@
# Build the kernel from source.
inherit calculate eutils kernel-2
EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst pkg_postrm
IUSE="vmlinuz"
@ -16,13 +16,18 @@ detect_version
detect_arch
CKV=$(get_version_component_range 1-3)
SLOT=$CKV
SLOT=$(get_version_component_range 1-4)
KV_FULL="${PV}-calculate"
CKV_FULL="${CKV}-calculate"
#CKV_FULL="${CKV}-calculate"
CKV_FULL=${KV_FULL}
S="${WORKDIR}/linux-${KV_FULL}"
EXTRAVERSION="-calculate"
CALC_K_SUBV=$(get_version_component_range 4)
EXTRAVERSION=".${CALC_K_SUBV}-calculate"
UNIPATCH_STRICTORDER=1
CALC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${PN}-${CKV}.tar.bz2
@ -42,7 +47,6 @@ NEW_CALCULATE_OVERLAY="/var/lib/layman/calculate"
CARCH=`arch`
KERNEL_CONFIG=
MODULESDBFILE=${ROOT}/var/lib/module-rebuild/moduledb
calculate-kernel_pkg_setup() {
@ -52,7 +56,11 @@ calculate-kernel_pkg_setup() {
[[ -e $calculate_ini ]] && \
SYSTEM=$( cat $calculate_ini | sed -rn 's/^system\=(.*)/\1/p' )
[[ -n "$SYSTEM" ]] || SYSTEM=desktop
[[ -n "$KERNEL_CONFIG" ]] || KERNEL_CONFIG="config-${SYSTEM}-${CARCH}-${CKV}"
if [[ -z "${KERNEL_CONFIG}" ]] || [[ ! -f "${KERNEL_CONFIG}" ]]
then
KERNEL_CONFIG="${ROOT}/${CALCULATE_OVERLAY}/profiles/kernel"
KERNEL_CONFIG="${KERNEL_CONFIG}/config-${SYSTEM}-${CARCH}-${CKV}"
fi
#detect current kernel dir
[[ -e ${ROOT}/usr/src/linux ]] &&
SRCLINUXLINK=$( readlink ${ROOT}/usr/src/linux )
@ -63,6 +71,9 @@ calculate-kernel_src_unpack() {
}
vmlinuz_src_compile() {
# disable sandbox
export SANDBOX_ON=0
local GENTOOARCH="${ARCH}"
unset ARCH
@ -88,8 +99,9 @@ vmlinuz_src_compile() {
--module-prefix=${WORKDIR} \
all || die "genkernel failed"
einfo "kernel: >> Cleaning..."
make clean &>/dev/null || die "cannot perform clean"
cp ${S}/.config ${WORKDIR}/boot/config-${KV_FULL}-installed
einfo "kernel: >> Distclean..."
make distclean &>/dev/null || die "cannot perform distclean"
ARCH="${GENTOOARCH}"
mv ${WORKDIR}/boot/kernel-${SYSTEM}-*-${CKV_FULL} \
${WORKDIR}/boot/vmlinuz-${KV_FULL}-installed
@ -97,8 +109,6 @@ vmlinuz_src_compile() {
${WORKDIR}/boot/initramfs-${KV_FULL}-installed
mv ${WORKDIR}/boot/System.map-${SYSTEM}-*-${CKV_FULL} \
${WORKDIR}/boot/System.map-${KV_FULL}-installed
cp ${S}/.config ${WORKDIR}/boot/config-${CKV_FULL}-installed
cp ${S}/.config ${WORKDIR}/boot/config-${KV_FULL}-installed
cp ${WORKDIR}/boot/System.map-${KV_FULL}-installed ${S}/System.map
rm ${WORKDIR}/lib/modules/${CKV_FULL}/build
rm ${WORKDIR}/lib/modules/${CKV_FULL}/source
@ -108,8 +118,8 @@ calculate-kernel_src_compile() {
export LDFLAGS=""
mkdir -p ${WORKDIR}/boot
cd ${S}
cp ${ROOT}/${CALCULATE_OVERLAY}/profiles/kernel/${KERNEL_CONFIG} \
${WORKDIR}/config || die "cannot copy kernel config"
einfo "Using kernel config from "$( readlink -f ${KERNEL_CONFIG} )
cp ${KERNEL_CONFIG} ${WORKDIR}/config || die "cannot copy kernel config"
cp ${WORKDIR}/config ${S}/.config
use vmlinuz && vmlinuz_src_compile
@ -136,16 +146,11 @@ vmlinuz_src_install() {
}
calculate-kernel_src_install() {
mv ${S}/.config ${WORKDIR}/config
rm -f ${S}/.config
kernel-2_src_install
use vmlinuz && vmlinuz_src_install
}
calculate-kernel_pkg_preinst() {
PKG_CONTENTS=${ROOT}/var/db/pkg/${CATEGORY}/${PN}-${CKV}*/CONTENTS
use vmlinuz && test -f ${PKG_CONTENTS} && calculate_rm_modules_dir ${PKG_CONTENTS}
}
calculate-kernel_pkg_postrm() {
rm -f ${SLOT_T}/.alreadydel
rmdir ${SLOT_T} &>/dev/null
@ -153,6 +158,8 @@ calculate-kernel_pkg_postrm() {
}
vmlinuz_pkg_postinst() {
cp ${ROOT}/boot/initramfs-${KV_FULL}-installed \
${ROOT}/boot/initramfs-${KV_FULL}-install-installed
calculate_update_kernel ${KV_FULL} ${ROOT}/boot
cp -a ${ROOT}/tmp/firmware/* ${ROOT}/lib/firmware/
rm -rf ${ROOT}/tmp/firmware
@ -160,11 +167,6 @@ vmlinuz_pkg_postinst() {
calculate_update_modules
sed -ri 's/a:1:sys-fs\/aufs2/a:0:sys-fs\/aufs2/' $MODULESDBFILE
if [[ $SRCLINUXLINK != linux-${CKV}*calculate ]]
then
ewarn "Perform command for update modules:"
ewarn " module-rebuild -X rebuild"
fi
}
calculate-kernel_pkg_postinst() {
@ -172,7 +174,9 @@ calculate-kernel_pkg_postinst() {
kernel-2_pkg_postinst
KV_OUT_DIR=${ROOT}/usr/src/linux-${KV_FULL}
cp ${WORKDIR}/config ${KV_OUT_DIR}/.config
[[ -e ${ROOT}/boot/config-${KV_FULL}-installed ]] &&
cp ${ROOT}/boot/config-${KV_FULL}-installed ${KV_OUT_DIR}/.config ||
cp ${KERNEL_CONFIG} ${KV_OUT_DIR}/.config
cd ${KV_OUT_DIR}
local GENTOOARCH="${ARCH}"

5
eclass/calculate.eclass
Unescape View File

@ -92,14 +92,13 @@ calculate_update_kernel() {
update_file ${dir}/vmlinuz-${kversion} ${dir}/vmlinuz
# update initrd
update_file ${dir}/initramfs-${kversion} ${dir}/initrd
# update initrd-install
update_file ${dir}/initramfs-${kversion}-install ${dir}/initrd-install
# update System.map
update_file ${dir}/System.map-${kversion} ${dir}/System.map
# update config-{CKV} (CKV 2.6.31, KV 2.6.31.4)
make_old_file ${dir}/config-${CKV_FULL}
mv ${dir}/config-${CKV_FULL}-installed ${dir}/config-${CKV_FULL}
# update config-{KV}
make_old_file ${dir}/config-${KV_FULL}
mv ${dir}/config-${KV_FULL}-installed ${dir}/config-${KV_FULL}
ebegin "Trying to optimize initramfs"
( which calculate &>/dev/null && calculate --initrd ) && eend 0 || eend 1
}

2
sys-apps/calculate/Manifest
Unescape View File

@ -1,5 +1,7 @@
DIST calculate-1.3.3.tar.bz2 204828 RMD160 c219f26f3f763573d316c71519d262082dcea6ed SHA1 4bdea7937369b2f56c79eb3dd93a5e1091611067 SHA256 e4f13fede846508f17c221f429a665b49459cd7780b0015599b469461b023f01
DIST calculate-1.3.4.tar.bz2 205235 RMD160 f6c264af6343ebd8cf2f06afb5cf26f6f0d0dacc SHA1 31be443d089698f34258e23b04b92993bd338f75 SHA256 8a07a5ba99c4c5b9ea01e024eb4f40925e9ef7560f6910eeb591cf95a804b42e
EBUILD calculate-1.3.3.ebuild 1870 RMD160 3e0567790fd243d9ed2c403c35d80902b5129e79 SHA1 4837874dd775488de182007416794da4f8c1d9d7 SHA256 f460c3bfe1ecb8a6a1f0f551e5c0e1a70c5b0fdafb05cf76eb97961c59099afc
EBUILD calculate-1.3.4.ebuild 1870 RMD160 3e0567790fd243d9ed2c403c35d80902b5129e79 SHA1 4837874dd775488de182007416794da4f8c1d9d7 SHA256 f460c3bfe1ecb8a6a1f0f551e5c0e1a70c5b0fdafb05cf76eb97961c59099afc
EBUILD calculate-9999.ebuild 1475 RMD160 e92f19fe07c838093662c29e7a09bcc596974989 SHA1 ffa6cfbfd36fab36256795ed628af1f4e46ed073 SHA256 3023792798a253bd6eedc78eef75d5553af6fa656631b1ee1c8a2bec500ed919
MISC ChangeLog 729 RMD160 9bb5641fc223fa5539edb71cf0ae0082c2c6af4c SHA1 83c61eede2d5ed2c6d4bd2fdebe358809838c597 SHA256 dfb6f1c5b02dea24b64ccf74c991208700498d97e391a396549d973117298903
MISC metadata.xml 301 RMD160 2b89953e755d47fdc10f6def8e9d30975ed5aba1 SHA1 fa349945c077ca3d0fd95693f04a60f2da15f467 SHA256 074eff7c846f7fc8f0e74e0d992bdda9432164f28c0f3cf8991a1e59aac38700

75
sys-apps/calculate/calculate-1.3.4.ebuild
Unescape View File

@ -0,0 +1,75 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
DESCRIPTION="Program for installation, building and upgrading system"
HOMEPAGE="http://www.calculate-linux.org/Calculate"
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="x86 amd64"
IUSE=""
DEPEND="app-arch/bzip2
app-arch/cpio
app-arch/gzip
app-arch/p7zip
app-arch/tar
app-portage/layman
app-shells/bash
dev-lang/perl
dev-libs/openssl
app-cdr/cdrkit
net-misc/wget
sys-apps/file
sys-apps/findutils
sys-apps/grep
sys-apps/hal
sys-apps/module-init-tools
sys-apps/net-tools
sys-apps/pciutils
sys-apps/usbutils
sys-apps/util-linux
sys-apps/which
sys-boot/grub
sys-devel/gettext
sys-fs/udev"
RDEPEND="${DEPEND}"
need_repair_manconf=0
pkg_setup() {
[ -e /var/db/pkg/sys-apps/calculate-1.2.7* ] && need_repair_manconf=1
if [ -e /usr/calculate/install ] && \
[ `ls /usr/calculate/install | grep -c ""` -gt 0 ] && \
! [ -e /var/db/pkg/sys-apps/calculate-[0-9]* ];
then
eerror "Finding other copy of calculate in target directory"
eerror "Please, remove it, before continue installation."
eerror "\trm -rf /usr/calculate/install"
die "Cannot continue install. Remove previous calculate installation."
fi
}
src_install() {
emake install DESTDIR="${D}" || die "Calculate installation failed."
dodoc Change.log
}
pkg_postinst() {
if ! [ -e /usr/calculate/share/addition ];
then
mkdir -p /usr/calculate/share/addition
fi
if ! [ -e /usr/calculate/share/linux ];
then
mkdir -p /usr/calculate/share/linux
fi
if ! [ -e /usr/calculate/share/distfiles ];
then
mkdir -p -m 2775 /usr/calculate/share/distfiles
chgrp portage /usr/calculate/share/distfiles
fi
[[ $need_repair_manconf -eq 1 ]] && \
sed -ri 's#/usr/bin/python.*manrc \| ##' /etc/man.conf
}

4
sys-kernel/calculate-sources/Manifest
Unescape View File

@ -1,6 +1,6 @@
DIST calculate-sources-2.6.32.tar.bz2 133992 RMD160 6c8ad119807c591ad926435dad7986098f26e3ef SHA1 2b398bf6e9a6bceca26e3df42c471c9321c0a6f2 SHA256 b30e70642569bae7dff4c9b2046066774c6a8e2a2c1252b353b908824cf64bc4
DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
DIST patch-2.6.32.5.bz2 130610 RMD160 fa16352509b164e5f6453548e5041b6931fb8283 SHA1 56998c981401b37c029634e03019d783a29945a1 SHA256 b4d0d667db5094fd430ed58955f4f9ed71d278d5ce70e63d287c53f8db028ac3
EBUILD calculate-sources-2.6.32.5.ebuild 711 RMD160 4f81fe95286e0c92407807c961c69ebc5fb2ccaf SHA1 aa9a842457b5ac475bdb4168f0d78f9929008983 SHA256 cbeacdc9237a435d8544447b4bcc6d2975f9a1b87de39a1b1c5f99d7819269cf
DIST patch-2.6.32.6.bz2 140412 RMD160 8f4d8a6f92d98dd04b93d0aa3e3b4e9ee0438a52 SHA1 c07fd45610f4c980e2685d6b3e2901ece128f830 SHA256 6b13dc157049f588fdc4bd4260a4a43de0518d5b3664c25f1d46f98ca66e5b70
EBUILD calculate-sources-2.6.32.6.ebuild 713 RMD160 dc07147662ecf5c3fd61247b2154f2e5ed8704b6 SHA1 ded8c6a584fc2fabd2f8c275c1f545ee9b1f8f66 SHA256 9d0838ea85cc38c4d77cdab81adbeeb26647e26cf13c59c3f0803386e00bcf47
MISC ChangeLog 222 RMD160 09c8c97e1cd55540efc157d0a9eb5932f535c553 SHA1 20867411aefaf53108597d80e907371d80cdb26d SHA256 ec5e7be9e57fda7d1335335e2ae9ddf4ae247e5d59759b391f191f80424b00f0
MISC metadata.xml 364 RMD160 308abbf758102b5591c353f41a62be6836f98693 SHA1 5029bd7cf897e4eb8f8e8fa935c02d4c73eb59db SHA256 0bee25282d797e432206373a8535689412a3f76f8974315f8ecf73536bf0e505

4
sys-kernel/calculate-sources/calculate-sources-2.6.32.5.ebuild → sys-kernel/calculate-sources/calculate-sources-2.6.32.6.ebuild
Unescape View File

@ -7,7 +7,7 @@ ETYPE="sources"
inherit calculate-kernel
DESCRIPTION="Full sources including the Calculate patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
KEYWORDS="amd64 x86"
KEYWORDS="~amd64 ~x86"
HOMEPAGE="http://www.calculate-linux.org"
SRC_URI="${KERNEL_URI} ${ARCH_URI} ${CALC_URI}"
@ -15,7 +15,7 @@ SRC_URI="${KERNEL_URI} ${ARCH_URI} ${CALC_URI}"
UNIPATCH_LIST="${DISTDIR}/${PN}-${CKV}.tar.bz2"
DEPEND="vmlinuz? ( >=sys-kernel/calckernel-3.4.10.903-r19
>=sys-apps/calculate-1.3.3
>=sys-apps/calculate-1.3.4
app-arch/xz-utils
sys-apps/v86d )"
Write Preview
Loading…
Cancel
Save