Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 355734 Details for
Bug 478436
kernel-2.eclass: add prefix support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
kernel-2.patch
kernel-2.patch (text/plain), 3.33 KB, created by
Benda Xu
on 2013-08-12 06:57:53 UTC
(
hide
)
Description:
kernel-2.patch
Filename:
MIME Type:
Creator:
Benda Xu
Created:
2013-08-12 06:57:53 UTC
Size:
3.33 KB
patch
obsolete
>Index: tauon/kernel-2.eclass >=================================================================== >--- tauon.orig/kernel-2.eclass 2013-08-12 15:52:06.000000000 +0900 >+++ tauon/kernel-2.eclass 2013-08-12 15:53:28.319347198 +0900 >@@ -494,8 +494,8 @@ > #============================================================== > kernel_header_destdir() { > [[ ${CTARGET} == ${CHOST} ]] \ >- && echo /usr/include \ >- || echo /usr/${CTARGET}/usr/include >+ && echo "${EPREFIX}"/usr/include \ >+ || echo "${EPREFIX}"/usr/${CTARGET}/usr/include > } > > cross_pre_c_headers() { >@@ -622,7 +622,7 @@ > > # autoconf.h isnt generated unless it already exists. plus, we have > # no guarantee that any headers are installed on the system... >- [[ -f ${ROOT}/usr/include/linux/autoconf.h ]] \ >+ [[ -f ${EROOT}/usr/include/linux/autoconf.h ]] \ > || touch include/linux/autoconf.h > > # if K_DEFCONFIG isn't set, force to "defconfig" >@@ -696,15 +696,15 @@ > # Do not use "linux/*" as that can cause problems with very long > # $S values where the cmdline to cp is too long > pushd "${S}" >/dev/null >- dodir ${ddir}/linux >+ dodir ${ddir#${EPREFIX}}/linux > cp -pPR "${S}"/include/linux "${D}"/${ddir}/ || die > rm -rf "${D}"/${ddir}/linux/modules > >- dodir ${ddir}/asm >- cp -pPR "${S}"/include/asm/* "${D}"/${ddir}/asm >+ dodir ${ddir#${EPREFIX}}/asm >+ cp -pPR "${S}"/include/asm/* "${ED}"/${ddir}/asm > > if kernel_is 2 6 ; then >- dodir ${ddir}/asm-generic >+ dodir ${ddir#${EPREFIX}}/asm-generic > cp -pPR "${S}"/include/asm-generic/* "${D}"/${ddir}/asm-generic > fi > >@@ -739,7 +739,7 @@ > > "${S}"/patches.txt > fi > >- mv ${WORKDIR}/linux* "${D}"/usr/src >+ mv ${WORKDIR}/linux* "${ED}"/usr/src > > if [[ -n "${UNIPATCH_DOCS}" ]] ; then > for i in ${UNIPATCH_DOCS}; do >@@ -771,21 +771,21 @@ > > # if we are to forcably symlink, delete it if it already exists first. > if [[ ${K_SYMLINK} > 0 ]]; then >- [[ -h ${ROOT}usr/src/linux ]] && rm ${ROOT}usr/src/linux >+ [[ -h ${EROOT}usr/src/linux ]] && rm ${EROOT}usr/src/linux > MAKELINK=1 > fi > > # if the link doesnt exist, lets create it >- [[ ! -h ${ROOT}usr/src/linux ]] && MAKELINK=1 >+ [[ ! -h ${EROOT}usr/src/linux ]] && MAKELINK=1 > > if [[ ${MAKELINK} == 1 ]]; then >- cd "${ROOT}"usr/src >+ cd "${EROOT}"usr/src > ln -sf linux-${KV_FULL} linux > cd ${OLDPWD} > fi > > # Don't forget to make directory for sysfs >- [[ ! -d ${ROOT}sys ]] && kernel_is 2 6 && mkdir ${ROOT}sys >+ [[ ! -d ${EROOT}sys ]] && kernel_is 2 6 && mkdir ${EROOT}sys > > echo > elog "If you are upgrading from a previous kernel, you may be interested" >@@ -1041,7 +1041,7 @@ > for x in ${KPATCH_DIR}; do > for i in ${UNIPATCH_DOCS}; do > if [[ -f "${x}/${i}" ]] ; then >- tmp="${tmp} ${i}" >+ tmp="${tmp} \"${T}/${i}\"" > cp -f "${x}/${i}" "${T}"/ > fi > done >@@ -1238,11 +1238,11 @@ > [[ ${ETYPE} == headers ]] && return 0 > > # If there isn't anything left behind, then don't complain. >- [[ -e ${ROOT}usr/src/linux-${KV_FULL} ]] || return 0 >+ [[ -e ${EROOT}usr/src/linux-${KV_FULL} ]] || return 0 > echo > ewarn "Note: Even though you have successfully unmerged " > ewarn "your kernel package, directories in kernel source location: " >- ewarn "${ROOT}usr/src/linux-${KV_FULL}" >+ ewarn "${EROOT}usr/src/linux-${KV_FULL}" > ewarn "with modified files will remain behind. By design, package managers" > ewarn "will not remove these modified files and the directories they reside in." > echo
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 478436
:
354382
|
354384
| 355734