diff options
| author | Ghiunhan Mamut (aka V3n3RiX) <venerix@rogentos.ro> | 2016-10-20 17:50:13 +0000 |
|---|---|---|
| committer | Ghiunhan Mamut (aka V3n3RiX) <venerix@rogentos.ro> | 2016-10-20 17:50:13 +0000 |
| commit | f73bdb899e4d04727979d84c53ad82b800c073b5 (patch) | |
| tree | 7cd7f53dd2fb792993e8629e7f599dce22dfddc3 | |
| parent | 9a8fb45756c3fac17e08217f1dc0101f5251f122 (diff) | |
| parent | c073beea85a260c3fb3a02b4f0e105a9d2096598 (diff) | |
Merge branch 'master' into 'master'
kogaion-kernel eclass revision upgrade
@V3n3RiX @bionel
This patch's usage:
1) If there is no revision, or revision r0, it must have the form of **version+kernelname.tar.xz** as standard
2) If there is a revision higher than r0, the archive must have the form of **version-revision+kernelname.tar.xz** as standard
.
In any of these two cases, the gentoo package built out of these cases will have the form:
1) if no revision, standard form **linux-kernelname-version**, analogical to sources
2) if revision, standard form **linux-kernelname-version-revision**, analogical to sources
.
In the sourcecode build of packages ( i.e. location on filesystem and so forth ) it will have the forms:
1) if no revision, standard form **linux-version-kernelname**
2) if revision, standard form **linux-version-kernelname-revision**
.
kernel-2.eclass from gentoo considers revisioning as per gentoo package, not kernel source-code.
SLOTting is still in the old form ( i.e. no matter the revision, the mainline matters: 4.4, 4.9, etc. ). Not sure which way we will take here. There are multiple methods.
See merge request !14
| -rw-r--r-- | eclass/kogaion-kernel.eclass | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/eclass/kogaion-kernel.eclass b/eclass/kogaion-kernel.eclass index 11e5c752..00e33942 100644 --- a/eclass/kogaion-kernel.eclass +++ b/eclass/kogaion-kernel.eclass @@ -236,19 +236,26 @@ _get_real_kv_full() { # replace "linux" with K_ROGKERNEL_NAME, usually replaces # "linux" with "kogaion" or "server" or "openvz" -KV_FULL="${KV_FULL/${PN/-*}/${K_ROGKERNEL_NAME}}" -KV_FULL="${PV}-${K_ROGKERNEL_NAME}" +#KV_FULL="${KV_FULL/${PN/-*}/${K_ROGKERNEL_NAME}}" +#KV_FULL="${PV}-${K_ROGKERNEL_NAME}" EXTRAVERSION="${EXTRAVERSION/${PN/-*}/${K_ROGKERNEL_NAME}}" # drop -rX if exists -if [[ -n "${PR//r0}" ]] && [[ "${K_KERNEL_DISABLE_PR_EXTRAVERSION}" = "1" ]] \ - && [[ -z "${K_NOSETEXTRAVERSION}" ]]; then - EXTRAVERSION="${EXTRAVERSION%-r*}" - KV_FULL="${KV_FULL%-r*}" - KV="${KV%-r*}" -fi +#if [[ -n "${PR//r0}" ]] && [[ "${K_KERNEL_DISABLE_PR_EXTRAVERSION}" = "1" ]] \ +# && [[ -z "${K_NOSETEXTRAVERSION}" ]]; then +# EXTRAVERSION="${EXTRAVERSION%-r*}" +# KV_FULL="${KV_FULL%-r*}" +# KV="${KV%-r*}" +#fi # rewrite it +#ORIGINAL_KV_FULL="${KV_FULL}" +#KV_FULL="$(_get_real_kv_full)" + +if [ "${PR}" == "r0" ] ; then + KV_FULL="${PV}-${K_ROGKERNEL_NAME}" + else + KV_FULL="${PV}-${K_ROGKERNEL_NAME}-${PR}" +fi ORIGINAL_KV_FULL="${KV_FULL}" -KV_FULL="$(_get_real_kv_full)" # Starting from linux-3.0, we still have to install # sources stuff into /usr/src/linux-3.0.0-kogaion (example) @@ -813,7 +820,11 @@ _dracut_initramfs_create() { local kern_arch="x86" fi fi - local kver="${PV}-${K_ROGKERNEL_SELF_TARBALL_NAME}" + if [ "${PR}" == "r0" ] ; then + local kver="${PV}-${K_ROGKERNEL_SELF_TARBALL_NAME}" + else + local kver="${PV}-${K_ROGKERNEL_SELF_TARBALL_NAME}-${PR}" + fi elog "" elog "Generating initramfs for ${kver}, please wait" |