Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 478436 | Differences between
and this patch

Collapse All | Expand All

(-)tauon.orig/kernel-2.eclass (-15 / +15 lines)
Lines 494-501 Link Here
494
#==============================================================
494
#==============================================================
495
kernel_header_destdir() {
495
kernel_header_destdir() {
496
	[[ ${CTARGET} == ${CHOST} ]] \
496
	[[ ${CTARGET} == ${CHOST} ]] \
497
		&& echo /usr/include \
497
		&& echo "${EPREFIX}"/usr/include \
498
		|| echo /usr/${CTARGET}/usr/include
498
		|| echo "${EPREFIX}"/usr/${CTARGET}/usr/include
499
}
499
}
500
500
501
cross_pre_c_headers() {
501
cross_pre_c_headers() {
Lines 622-628 Link Here
622
622
623
		# autoconf.h isnt generated unless it already exists. plus, we have
623
		# autoconf.h isnt generated unless it already exists. plus, we have
624
		# no guarantee that any headers are installed on the system...
624
		# no guarantee that any headers are installed on the system...
625
		[[ -f ${ROOT}/usr/include/linux/autoconf.h ]] \
625
		[[ -f ${EROOT}/usr/include/linux/autoconf.h ]] \
626
			|| touch include/linux/autoconf.h
626
			|| touch include/linux/autoconf.h
627
627
628
		# if K_DEFCONFIG isn't set, force to "defconfig"
628
		# if K_DEFCONFIG isn't set, force to "defconfig"
Lines 696-710 Link Here
696
	# Do not use "linux/*" as that can cause problems with very long
696
	# Do not use "linux/*" as that can cause problems with very long
697
	# $S values where the cmdline to cp is too long
697
	# $S values where the cmdline to cp is too long
698
	pushd "${S}" >/dev/null
698
	pushd "${S}" >/dev/null
699
	dodir ${ddir}/linux
699
	dodir ${ddir#${EPREFIX}}/linux
700
	cp -pPR "${S}"/include/linux "${D}"/${ddir}/ || die
700
	cp -pPR "${S}"/include/linux "${D}"/${ddir}/ || die
701
	rm -rf "${D}"/${ddir}/linux/modules
701
	rm -rf "${D}"/${ddir}/linux/modules
702
702
703
	dodir ${ddir}/asm
703
	dodir ${ddir#${EPREFIX}}/asm
704
	cp -pPR "${S}"/include/asm/* "${D}"/${ddir}/asm
704
	cp -pPR "${S}"/include/asm/* "${ED}"/${ddir}/asm
705
705
706
	if kernel_is 2 6 ; then
706
	if kernel_is 2 6 ; then
707
		dodir ${ddir}/asm-generic
707
		dodir ${ddir#${EPREFIX}}/asm-generic
708
		cp -pPR "${S}"/include/asm-generic/* "${D}"/${ddir}/asm-generic
708
		cp -pPR "${S}"/include/asm-generic/* "${D}"/${ddir}/asm-generic
709
	fi
709
	fi
710
710
Lines 739-745 Link Here
739
			> "${S}"/patches.txt
739
			> "${S}"/patches.txt
740
	fi
740
	fi
741
741
742
	mv ${WORKDIR}/linux* "${D}"/usr/src
742
	mv ${WORKDIR}/linux* "${ED}"/usr/src
743
743
744
	if [[ -n "${UNIPATCH_DOCS}" ]] ; then
744
	if [[ -n "${UNIPATCH_DOCS}" ]] ; then
745
		for i in ${UNIPATCH_DOCS}; do
745
		for i in ${UNIPATCH_DOCS}; do
Lines 771-791 Link Here
771
771
772
	# if we are to forcably symlink, delete it if it already exists first.
772
	# if we are to forcably symlink, delete it if it already exists first.
773
	if [[ ${K_SYMLINK} > 0 ]]; then
773
	if [[ ${K_SYMLINK} > 0 ]]; then
774
		[[ -h ${ROOT}usr/src/linux ]] && rm ${ROOT}usr/src/linux
774
		[[ -h ${EROOT}usr/src/linux ]] && rm ${EROOT}usr/src/linux
775
		MAKELINK=1
775
		MAKELINK=1
776
	fi
776
	fi
777
777
778
	# if the link doesnt exist, lets create it
778
	# if the link doesnt exist, lets create it
779
	[[ ! -h ${ROOT}usr/src/linux ]] && MAKELINK=1
779
	[[ ! -h ${EROOT}usr/src/linux ]] && MAKELINK=1
780
780
781
	if [[ ${MAKELINK} == 1 ]]; then
781
	if [[ ${MAKELINK} == 1 ]]; then
782
		cd "${ROOT}"usr/src
782
		cd "${EROOT}"usr/src
783
		ln -sf linux-${KV_FULL} linux
783
		ln -sf linux-${KV_FULL} linux
784
		cd ${OLDPWD}
784
		cd ${OLDPWD}
785
	fi
785
	fi
786
786
787
	# Don't forget to make directory for sysfs
787
	# Don't forget to make directory for sysfs
788
	[[ ! -d ${ROOT}sys ]] && kernel_is 2 6 && mkdir ${ROOT}sys
788
	[[ ! -d ${EROOT}sys ]] && kernel_is 2 6 && mkdir ${EROOT}sys
789
789
790
	echo
790
	echo
791
	elog "If you are upgrading from a previous kernel, you may be interested"
791
	elog "If you are upgrading from a previous kernel, you may be interested"
Lines 1041-1047 Link Here
1041
	for x in ${KPATCH_DIR}; do
1041
	for x in ${KPATCH_DIR}; do
1042
		for i in ${UNIPATCH_DOCS}; do
1042
		for i in ${UNIPATCH_DOCS}; do
1043
			if [[ -f "${x}/${i}" ]] ; then
1043
			if [[ -f "${x}/${i}" ]] ; then
1044
				tmp="${tmp} ${i}"
1044
				tmp="${tmp} \"${T}/${i}\""
1045
				cp -f "${x}/${i}" "${T}"/
1045
				cp -f "${x}/${i}" "${T}"/
1046
			fi
1046
			fi
1047
		done
1047
		done
Lines 1238-1248 Link Here
1238
	[[ ${ETYPE} == headers ]] && return 0
1238
	[[ ${ETYPE} == headers ]] && return 0
1239
1239
1240
	# If there isn't anything left behind, then don't complain.
1240
	# If there isn't anything left behind, then don't complain.
1241
	[[ -e ${ROOT}usr/src/linux-${KV_FULL} ]] || return 0
1241
	[[ -e ${EROOT}usr/src/linux-${KV_FULL} ]] || return 0
1242
	echo
1242
	echo
1243
	ewarn "Note: Even though you have successfully unmerged "
1243
	ewarn "Note: Even though you have successfully unmerged "
1244
	ewarn "your kernel package, directories in kernel source location: "
1244
	ewarn "your kernel package, directories in kernel source location: "
1245
	ewarn "${ROOT}usr/src/linux-${KV_FULL}"
1245
	ewarn "${EROOT}usr/src/linux-${KV_FULL}"
1246
	ewarn "with modified files will remain behind. By design, package managers"
1246
	ewarn "with modified files will remain behind. By design, package managers"
1247
	ewarn "will not remove these modified files and the directories they reside in."
1247
	ewarn "will not remove these modified files and the directories they reside in."
1248
	echo
1248
	echo

Return to bug 478436