Fix calckernel. Fix calculate-kernel.eclass.

atratsevskiy
Mike Hiretsky 15 years ago
parent 12069e75ec
commit 3f14f46648

@ -43,10 +43,14 @@ MODULESDBFILE=${ROOT}/var/lib/module-rebuild/moduledb
calculate-kernel_pkg_setup() {
mkdir -p ${SLOT_T}
kernel-2_pkg_setup
[[ -e /etc/calculate/calculate.ini ]] && \
SYSTEM=$( cat /etc/calculate/calculate.ini | sed -rn 's/system\=(.*)/\1/p' )
local calculate_ini=${ROOT}/etc/calculate/calculate.ini
[[ -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}"
#detect current kernel dir
[[ -e ${ROOT}/usr/src/linux ]] &&
SRCLINUXLINK=$( readlink ${ROOT}/usr/src/linux )
}
calculate-kernel_src_unpack() {
@ -82,7 +86,8 @@ calculate-kernel_src_compile() {
--module-prefix=${WORKDIR} \
all || die "genkernel failed"
make clean || die "cannot modules prepare"
einfo "kernel: >> Cleaning..."
make clean &>/dev/null || die "cannot perform clean"
ARCH="${GENTOOARCH}"
mv ${WORKDIR}/boot/kernel-${SYSTEM}-*-${CKV_FULL} \
${WORKDIR}/boot/vmlinuz-${KV_FULL}-installed
@ -132,15 +137,17 @@ calculate-kernel_pkg_postrm() {
calculate-kernel_pkg_postinst() {
#calculate_update_splash ${ROOT}/boot/initramfs-${SYSTEM}-${KV_FULL}
calculate_update_kernel ${KV_FULL} ${ROOT}/boot
cp -a /tmp/firmware/* /lib/firmware/
rm -rf /tmp/firmware
cp -a ${ROOT}/tmp/firmware/* ${ROOT}/lib/firmware/
rm -rf ${ROOT}/tmp/firmware
KV_OUT_DIR=/usr/src/linux-${KV_FULL}
KV_OUT_DIR=${ROOT}/usr/src/linux-${KV_FULL}
cd ${KV_OUT_DIR}
local GENTOOARCH="${ARCH}"
unset ARCH
make modules_prepare || die "cannot modules prepare"
ebegin "kernel: >> Running modules_prepare..."
make modules_prepare &>/dev/null
eend $? "Failed modules prepare"
ARCH="${GENTOOARCH}"
kernel-2_pkg_postinst
@ -149,4 +156,9 @@ calculate-kernel_pkg_postinst() {
calculate_update_modules
sed -ri 's/a:1:sys-fs\/aufs2/a:0:sys-fs\/aufs2/' $MODULESDBFILE
if [[ $SRCLINUXLINK != linux-2.6.32*calcualte ]]
then
ewarn "Perform command for update modules:"
ewarn " module_rebuild -X rebuild"
fi
}

@ -1,6 +1,6 @@
AUX calckernel-3.4.10.903-r15.patch 9850 RMD160 59a18be3318a798910a22f1ee03062167074578c SHA1 918783f6615a8cbee2475bf3989b93db13fe4021 SHA256 a5c036b0476f171daef09a61970d6727bb05bf30f6b85df42c60c3ae0eb68eb0
AUX calckernel-3.4.10.903-r16.patch 9250 RMD160 849a11ab3e0e3d21cf807d9d28237f881196613b SHA1 26ee4e8aded9a5525cb35c3f22f95f2539a20b58 SHA256 60301770e69f18171b0c17aaf6eaafb3f3205b8ac1cc45d5dd9cecb6a968743e
AUX calckernel-3.4.10.903-r17.patch 9403 RMD160 85d8110d85414818aea035e9e8138e3865fafd26 SHA1 6bc2dc37662e61dcfff4078f9da38391a44781c1 SHA256 6562cbaf8822fb41eb000c4fb62fcd6a3b48d84c28d1acde851dfd3397609aaf
AUX calckernel-3.4.10.903-r18.patch 9675 RMD160 01fe22b4d3a48ffca1b77341042be24cef909ded SHA1 6568f6621430e10c0b4eba6df118712bcb7cb239 SHA256 01825f8a1c39d25c3c0e108079fa077eaa5703cb2ef03281cbdd5096d006b07e
AUX calckernel-3.4.10.903-r2.patch 3217 RMD160 2af53fea69a8c4bb7295326c8dcca874186163eb SHA1 6988125ac5ec2788aeb24b39b9648edec2fcc09d SHA256 787528254f20544155f00fd36626d11eee681350a4217edfac22e6e21d68eee1
AUX calckernel-3.4.10.903-r5.patch 4900 RMD160 c06016481281a2a056f31cd1c2796ed783627997 SHA1 96bc1c4466598c33117b2a018a66631f9e5132a8 SHA256 c5ad1a6f4bc16ed3971bed3179a629445bb88cd2267facb261502454b3ab2d94
AUX calckernel-3.4.10.903-r6.patch 4906 RMD160 166a07f41f72363750f94249c0d14a0e64ede600 SHA1 858b563247c9485453be53bc60296397df675521 SHA256 4fd297e02b19b1accd18bdf19f06eb4fdfc52e2f75c67ad0bb1734f7e3b57f42
@ -24,7 +24,7 @@ DIST unionfs-fuse-0.22.tar.bz2 27355 RMD160 f29cbf41af0ba8f2181ac565a6663871676f
EBUILD calckernel-3.4.10.903-r1.ebuild 4721 RMD160 0ad6351496f60f77f5cdb47f91e8887ad2b67111 SHA1 a7f6d9be941333647a4dbc578316792fdd942fc5 SHA256 2f5327f3b368a25cda0dcce60f287c38cd6a2a74e03b6e3280fdd846c1aaeaf8
EBUILD calckernel-3.4.10.903-r15.ebuild 4797 RMD160 3f7804e47bbb2c36bdfad781250eba6a73329fb7 SHA1 a61c04ba488c87c144ec57845881300e664f8e37 SHA256 04268c64db9eae32db2c37d679ba0b2d09cb4fb146e71881ea685e20193502cd
EBUILD calckernel-3.4.10.903-r16.ebuild 4797 RMD160 3f7804e47bbb2c36bdfad781250eba6a73329fb7 SHA1 a61c04ba488c87c144ec57845881300e664f8e37 SHA256 04268c64db9eae32db2c37d679ba0b2d09cb4fb146e71881ea685e20193502cd
EBUILD calckernel-3.4.10.903-r17.ebuild 4797 RMD160 3f7804e47bbb2c36bdfad781250eba6a73329fb7 SHA1 a61c04ba488c87c144ec57845881300e664f8e37 SHA256 04268c64db9eae32db2c37d679ba0b2d09cb4fb146e71881ea685e20193502cd
EBUILD calckernel-3.4.10.903-r18.ebuild 4797 RMD160 3f7804e47bbb2c36bdfad781250eba6a73329fb7 SHA1 a61c04ba488c87c144ec57845881300e664f8e37 SHA256 04268c64db9eae32db2c37d679ba0b2d09cb4fb146e71881ea685e20193502cd
EBUILD calckernel-3.4.10.903-r2.ebuild 4722 RMD160 86a8fd0be899be5fe4db799269f0eae5063a30ac SHA1 2d52f4ff1805734cb0ffe572786015a9c0fe0311 SHA256 7ebc44592700cbfc4759508ddc147fe9cafe7c54116b731bfa42dfc7baa19206
EBUILD calckernel-3.4.10.903-r5.ebuild 4722 RMD160 86a8fd0be899be5fe4db799269f0eae5063a30ac SHA1 2d52f4ff1805734cb0ffe572786015a9c0fe0311 SHA256 7ebc44592700cbfc4759508ddc147fe9cafe7c54116b731bfa42dfc7baa19206
EBUILD calckernel-3.4.10.903-r6.ebuild 4722 RMD160 86a8fd0be899be5fe4db799269f0eae5063a30ac SHA1 2d52f4ff1805734cb0ffe572786015a9c0fe0311 SHA256 7ebc44592700cbfc4759508ddc147fe9cafe7c54116b731bfa42dfc7baa19206

@ -288,3 +288,16 @@ index d506f83..538b29b 100755
fi
else
bad_msg "Could not mount specified ROOT, try again"
diff --git a/genkernel b/genkernel
index f74846e..518f206 100755
--- a/genkernel
+++ b/genkernel
@@ -55,7 +55,7 @@ trap_cleanup(){
cleanup(){
if [ -n "$TEMP" -a -d "$TEMP" ]; then
- rm -rf "$TEMP"
+ rm -rf "$TEMP" &>/dev/null
fi
if isTrue ${POSTCLEAR}
Loading…
Cancel
Save