Magellan Linux

Diff of /smage/trunk/include/kernel.sminc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2938 by niro, Tue Sep 6 18:52:10 2011 UTC revision 4527 by niro, Fri Mar 15 11:06:39 2013 UTC
# Line 2  Line 2 
2  # $Id$  # $Id$
3    
4  # needed extra vars:  # needed extra vars:
5  #   ${KERNEL_TYPE}:   needed, 'sources' or 'image'  #  ${KERNEL_TYPE}:       needed, 'sources', 'headers' or 'image'
6  #   ${BRANCH}:        needed, style branch of the kernel  #  ${BRANCH}:            needed, style branch of the kernel
7  #   ${KERNEL_CONFIG}: optional, needed if you want to override the default  #  ${KERNEL_CONFIG}:     optional, needed if you want to override the default
8  #                     searchpath ${SOURCEDIR}/${PNAME}/config-${PVER}-${BRANCH}-${PBUILD}  #                        searchpath ${SOURCEDIR}/${PNAME}/config-${PVER}-${BRANCH}-${PBUILD}
9  #  #
10  #   ${PSUBVER}:       optional, only needed for 2.6.x.x naming scheme  #  ${PSUBVER}:           optional, only needed for 2.6.x.x naming scheme
11  #   ${EXTRAVERSION}:  optinal, extra version for the kernel name  #  ${EXTRAVERSION}:      optinal, extra version for the kernel name
12  #                     default setting is ${PSUBVER}-${BRANCH}-${PBUILD}  #                        default setting is ${PSUBVER}-${BRANCH}-${PBUILD}
13  #   ${KERNEL_IMAGE_PATH}: override the default KERNEL_IMAGE_PATH (to build xen images for e.g.)  #  ${KERNEL_IMAGE_PATH}: override the default KERNEL_IMAGE_PATH (to build xen images for e.g.)
14    #  ${COMPRESS_MODULES}:  compresses the kernel modules with given compressor (gzip|bzip2|xz)
15    #  ${LINUX_FIRMWARE}:    remove included firmware bits if requested
16    #                        set the version here like USE_LINUX_FIRMARE="20110605"
17    #                        version "internal" keeps the bits too
18    #
19    #  ${INCLUDE_KERNELVERSION_FILE}:
20    #  ${USE_KERNEL_SYMLINKS}:
21    
22  sminclude mtools  sminclude mtools
23    
# Line 22  else Line 29  else
29   KERNEL_ARCH_EXTENSION=""   KERNEL_ARCH_EXTENSION=""
30  fi  fi
31    
32    if [[ ! -z ${COMPRESS_MODULES} ]]
33    then
34     case ${COMPRESS_MODULES} in
35     gzip)
36     COMPRESS_MODULES_CMD="gzip -9v"
37     SDEPEND="${SDEPEND}
38     >= app-arch/gzip-1.4"
39     ;;
40     bzip2)
41     COMPRESS_MODULES_CMD="bzip2 -9v"
42     SDEPEND="${SDEPEND}
43     >= app-arch/bzip2-1.0.6"
44     ;;
45     xz)
46     COMPRESS_MODULES_CMD="xz -9v"
47     SDEPEND="${SDEPEND}
48     >= app-arch/xz-5"
49     ;;
50     none)
51     echo "Disabled compressed kernel-modules!"
52     COMPRESS_MODULES_CMD=""
53     ;;
54     *) die "Unkown compression format '${COMPRESS_MODULES}'" ;;
55     esac
56    fi
57    
58  # some sane defaults  # some sane defaults
59  : ${SRCFILE="linux-${PVER/${PSUBVER}/}.tar.bz2"}  : ${PCAT="sys-kernel"}
60    : ${HOMEPAGE="http://magellan-linux.de/"}
61    : ${TARBALLPVER="${PVER}"}
62    : ${SRCFILE="linux-${TARBALLPVER}.tar.bz2"}
63  : ${SRCDIR="${BUILDDIR}/linux-${PVER}-${BRANCH}-${PBUILD}"}  : ${SRCDIR="${BUILDDIR}/linux-${PVER}-${BRANCH}-${PBUILD}"}
64    
65  : ${SRC_URI=(  if [[ -z ${SRC_URI[*]} ]]
66   http://www.kernel.org/pub/linux/kernel/v${PVER%%.*}/${SRCFILE}  then
67   mirror://kernel-${BRANCH}/${SRCFILE}   SRC_URI=(
68   mirror://kernel-${BRANCH}/config-${PVER}-${BRANCH}-${PBUILD}-i686   http://www.kernel.org/pub/linux/kernel/v$(echo ${PVER} | cut -d. -f1).x/${SRCFILE}
69   mirror://kernel-${BRANCH}/config-${PVER}-${BRANCH}-${PBUILD}-x86_64   http://ftp.uni-erlangen.de/pub/Linux/MIRROR.kernel/v$(echo ${PVER} | cut -d. -f1).x/${SRCFILE}
70  )}   mirror://kernel-${BRANCH}/${SRCFILE}
71     )
72  : ${DEPEND=">= sys-apps/module-init-tools-3.2   case ${KERNEL_TYPE} in
73   >= sys-fs/udev-115   image|sources)
74   >= sys-apps/mkinitrd-5.0.8   SRC_URI=(
75   >= virtual/initscripts"}   ${SRC_URI[*]}
76     mirror://kernel-${BRANCH}/config-${PVER}-${BRANCH}-${PBUILD}-i686
77     mirror://kernel-${BRANCH}/config-${PVER}-${BRANCH}-${PBUILD}-x86_64
78     )
79     ;;
80     esac
81    fi
82    
83  : ${PROVIDE="virtual/kernel"}  case ${KERNEL_TYPE} in
84     image)
85     : ${PROVIDE="virtual/kernel"}
86     : ${DEPEND=">= virtual/module-tools
87     >= sys-fs/udev-115
88     >= virtual/initramfs-tools
89     >= virtual/initscripts"}
90     if [[ ! -z ${LINUX_FIRMWARE}  ]] && [[ ${LINUX_FIRMWARE} != internal ]]
91     then
92     DEPEND="${DEPEND}
93     >= sys-kernel/linux-firmware-${LINUX_FIRMWARE}"
94     fi
95     : ${DESCRIPTION="Kernel image of the '${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}' kernel branch."}
96     ;;
97    
98     sources)
99     : ${PROVIDE="virtual/kernel-sources"}
100     : ${DESCRIPTION="Kernel sources of the '${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}' kernel branch."}
101     ;;
102    
103     headers)
104     : ${PROVIDE="virtual/kernel-headers"}
105     : ${DESCRIPTION="Sanitized kernel headers for libc."}
106     ;;
107    esac
108    
109  EXTRAVERSION="${PSUBVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}"  EXTRAVERSION="${PSUBVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}"
110  KERNEL_CONFIG="${SOURCEDIR}/${PNAME}/config-${PVER}-${BRANCH}-${PBUILD}-${ARCH}"  KERNEL_CONFIG="${SOURCEDIR}/${PNAME}/config-${PVER}-${BRANCH}-${PBUILD}-${ARCH}"
# Line 47  KERNEL_CONFIG="${SOURCEDIR}/${PNAME}/con Line 113  KERNEL_CONFIG="${SOURCEDIR}/${PNAME}/con
113  KPVER="${PVER}"  KPVER="${PVER}"
114  KPBUILD="${PBUILD}"  KPBUILD="${PBUILD}"
115  KBRANCH="${BRANCH}"  KBRANCH="${BRANCH}"
116  SPECIAL_VARS="${SPECIAL_VARS} KPVER KPBUILD KBRANCH"  SPECIAL_VARS="${SPECIAL_VARS} KPVER KPBUILD KBRANCH USE_KERNEL_SYMLINKS"
117    
118  kernel_src_prepare()  kernel_src_prepare()
119  {  {
120   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
121   mv ${BUILDDIR}/linux-${PVER/${PSUBVER}/} ${SRCDIR} || die   mv ${BUILDDIR}/linux-${TARBALLPVER} ${SRCDIR} || die
122    
123   # fix permissions   # fix permissions
124   chown -R 0:0 ${SRCDIR} || die   chown -R 0:0 ${SRCDIR} || die
# Line 63  kernel_src_prepare() Line 129  kernel_src_prepare()
129   # fixes INSTALL_PATH to /boot and EXTRAVERSION   # fixes INSTALL_PATH to /boot and EXTRAVERSION
130   sed -i -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \   sed -i -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
131   -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" Makefile || die   -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" Makefile || die
132    
133     # fix sublevel version with 3.x kernels and higher
134     local kver=$(echo ${PVER} | sed "s:\.::g")
135     if [[ ${PVER%%.*} -gt 2 ]]
136     then
137     local sublevel="$(echo ${PVER} | cut -d. -f3)"
138     sed -i "s:^\(SUBLEVEL =\).*:\1 ${sublevel}:" Makefile || die
139     fi
140  }  }
141    
142  kernel_src_compile()  kernel_src_compile()
# Line 71  kernel_src_compile() Line 145  kernel_src_compile()
145    
146   make mrproper || die   make mrproper || die
147    
148   # inject our kernel config   if [[ ${KERNEL_TYPE} = sources ]] || [[ ${KERNEL_TYPE} = image ]]
149   cp ${KERNEL_CONFIG} ${SRCDIR}/.config || die   then
150   make ARCH=${ARCH/i*86/x86} oldconfig || die   # inject our kernel config
151     cp ${KERNEL_CONFIG} ${SRCDIR}/.config || die
152     make ARCH=${ARCH/i*86/x86} oldconfig || die
153     fi
154    
155   case ${KERNEL_TYPE} in   case ${KERNEL_TYPE} in
156   image)   image)
157   mmake ARCH=${ARCH/i*86/x86} || die   mmake ARCH=${ARCH/i*86/x86} || die
158   ;;   ;;
159    
160     headers)
161     make ARCH=${ARCH/i*86/x86} headers_check || die
162     ;;
163    
164   sources)   sources)
165   make clean || die   make clean || die
166    
# Line 101  kernel_src_compile() Line 182  kernel_src_compile()
182    
183   # at least alsa-drivers needs this one ...   # at least alsa-drivers needs this one ...
184   touch include/linux/autoconf.h || die   touch include/linux/autoconf.h || die
185    
186     # compat symlink for 3.7.x new version.h location until everything is fixed
187   ;;   ;;
188   esac   esac
189  }  }
# Line 113  kernel_image_src_install() Line 196  kernel_image_src_install()
196   minstalldir /boot || die   minstalldir /boot || die
197    
198   # install modules   # install modules
199   make ARCH=${ARCH/i*86/x86} INSTALL_MOD_PATH=${BINDIR} modules_install || die   make ARCH=${ARCH/i*86/x86} INSTALL_MOD_PATH=${BINDIR}/usr modules_install || die
200    
201   # install kernelimage   # install kernelimage
202   if [[ -z ${KERNEL_IMAGE_PATH} ]]   if [[ -z ${KERNEL_IMAGE_PATH} ]]
# Line 143  kernel_image_src_install() Line 226  kernel_image_src_install()
226   /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \   /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \
227   || die   || die
228    
229   # install kernel description   if [[ ${INCLUDE_KERNELVERSION_FILE} = true ]]
230   echo "   then
231  KRNVER=${BRANCH}-${PVER}-${ARCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}   MCONFIG=/boot/kernelversion
232  KRNLIB=${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}   # install kernel description
233  KRNIMG=kernel-${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}   mclearconfig || die
234  KRNINITRD=   maddconfig "KRNVER=${BRANCH}-${PVER}-${ARCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}" || die
235  " > ${BINDIR}/boot/kernelversion || die   maddconfig "KRNLIB=${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}" || die
236     maddconfig "KRNIMG=kernel-${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}" || die
237     maddconfig "KRNINITRD=" || die
238     fi
239    
240   # install kernel-config from srcdir   # install kernel-config from srcdir
241   minstallfile .config \   minstallfile .config \
# Line 157  KRNINITRD= Line 243  KRNINITRD=
243   || die   || die
244    
245   # fix build symlink   # fix build symlink
246   if [ -L ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build ]   if [ -L ${BINDIR}/usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build ]
247   then   then
248   echo "fixing build symlink"   echo "fixing build symlink"
249   rm ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build || die   rm ${BINDIR}/usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build || die
250   mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \   mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \
251   /lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build \   /usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build \
252   || die   || die
253   fi   fi
254    
255   # and fixing source symlink   # and fixing source symlink
256   if [ -L ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source ]   if [ -L ${BINDIR}/usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source ]
257   then   then
258   echo "fixing source symlink"   echo "fixing source symlink"
259   rm ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source || die   rm ${BINDIR}/usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source || die
260   mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \   mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \
261   /lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source \   /usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source \
262   || die   || die
263   fi   fi
264    
265     # remove firmware bits if $LINUX_FIRMWARE was set
266     if [[ ! -z ${LINUX_FIRMWARE} ]] && [[ ${LINUX_FIRMWARE} != internal ]]
267     then
268     if [[ -d ${BINDIR}/usr/lib/firmware ]]
269     then
270     rm -rv ${BINDIR}/usr/lib/firmware
271     fi
272     fi
273    
274     # compress modules if COMPRESS_MODULES_CMD was set
275     if [[ ! -z ${COMPRESS_MODULES_CMD} ]]
276     then
277     # compress all kernel modules
278     find ${BINDIR} -name \*.ko | xargs ${COMPRESS_MODULES_CMD} || die
279     fi
280    }
281    
282    kernel_headers_src_install()
283    {
284     cd ${SRCDIR}
285     make ARCH=${ARCH/i*86/x86} INSTALL_HDR_PATH=${BINDIR}/usr headers_install || die
286    
287     # clean-up unnecessary files
288     find ${BINDIR} -name .install -or -name ..install.cmd | xargs --no-run-if-empty rm -f
289  }  }
290    
291  kernel_sources_src_install()  kernel_sources_src_install()
# Line 224  kernel_src_install() Line 335  kernel_src_install()
335   kernel_image_src_install || die   kernel_image_src_install || die
336   ;;   ;;
337    
338     headers)
339     kernel_headers_src_install || die
340     ;;
341    
342   sources)   sources)
343   kernel_sources_src_install || die   kernel_sources_src_install || die
344   ;;   ;;
# Line 283  kernel_image_preremove() Line 398  kernel_image_preremove()
398   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
399   then   then
400   mount /boot &> /dev/null   mount /boot &> /dev/null
  fi  
 }  
401    
 kernel_image_postremove()  
 {  
  if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]  
  then  
402   # remove old image entry from grub   # remove old image entry from grub
403   new-kernel-pkg -v --rminitrd --remove ${KPVER}-${KBRANCH}-${KPBUILD}   new-kernel-pkg -v --rminitrd --rmmoddep --remove ${KPVER}-${KBRANCH}-${KPBUILD}
404   fi   fi
405  }  }
406    
# Line 314  kernel_image_postinstall() Line 423  kernel_image_postinstall()
423   new-kernel-pkg -v --mkinitrd --make-default --install ${KPVER}-${KBRANCH}-${KPBUILD}   new-kernel-pkg -v --mkinitrd --make-default --install ${KPVER}-${KBRANCH}-${KPBUILD}
424   fi   fi
425    
426   # symlink actual kernel to /boot/vmlinuz etc...   if [[ ${USE_KERNEL_SYMLINKS} = true ]]
427   ln -snf kernel-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/vmlinuz   then
428   ln -snf System.map-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/System.map   # symlink actual kernel to /boot/vmlinuz etc...
429   ln -snf config-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/config   ln -snf kernel-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/vmlinuz
430   [[ -f ${MROOT}/boot/initrd-${KPVER}-${KBRANCH}-${KPBUILD}.img ]] &&   ln -snf System.map-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/System.map
431   ln -snf initrd-${KPVER}-${KBRANCH}-${KPBUILD}.img ${MROOT}/boot/initrd   ln -snf config-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/config
432     [[ -f ${MROOT}/boot/initrd-${KPVER}-${KBRANCH}-${KPBUILD}.img ]] &&
433     ln -snf initrd-${KPVER}-${KBRANCH}-${KPBUILD}.img ${MROOT}/boot/initrd
434     fi
435  }  }
436    
437  kernel_sources_postinstall()  kernel_sources_postinstall()
438  {  {
439   # check for linux-VERSION/include as the kernel-image installs   # check for linux-VERSION/include as the kernel-image installs
440   # the file Modules.symver in the linux-VERSION directory   # the file Modules.symver in the linux-VERSION directory
441   if [ ! -d ${MROOT}/usr/src/linux-${KPVER}-${KBRANCH}-${KPBUILD}/include ]   if mqueryfeature "kernelsrcunpack" &&
442     [ ! -d ${MROOT}/usr/src/linux-${KPVER}-${KBRANCH}-${KPBUILD}/include ]
443   then   then
444   echo "Unpacking linux-${KPVER}-${KBRANCH}-${KPBUILD} source tarball ... "   echo "Unpacking linux-${KPVER}-${KBRANCH}-${KPBUILD} source tarball ... "
445   tar xvjf ${MROOT}/usr/src/linux-${KPVER}-${KBRANCH}-${KPBUILD}.tar.bz2 -C ${MROOT}/usr/src   tar xvjf ${MROOT}/usr/src/linux-${KPVER}-${KBRANCH}-${KPBUILD}.tar.bz2 -C ${MROOT}/usr/src
446   fi   fi
447    
448   if [ ! -d ${MROOT}/usr/src/kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD} ] &&   if mqueryfeature "kernelsrcunpack" &&
449     [ ! -d ${MROOT}/usr/src/kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD} ] &&
450   [ -f ${MROOT}/usr/src/kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD}.tar.bz2 ]   [ -f ${MROOT}/usr/src/kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD}.tar.bz2 ]
451   then   then
452   echo "Unpacking kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD} source tarball ... "   echo "Unpacking kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD} source tarball ... "
453   tar xvjf ${MROOT}/usr/src/kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD}.tar.bz2 -C ${MROOT}/usr/src   tar xvjf ${MROOT}/usr/src/kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD}.tar.bz2 -C ${MROOT}/usr/src
454   fi   fi
455    
456   # if not exist create linux symlink   # create linux symlink
457   if [ ! -h ${MROOT}/usr/src/linux ]   if mqueryfeature "linuxsymlink"
458   then   then
459   echo "Creating linux -> linux-${KPVER}-${KBRANCH}-${KPBUILD} symlink ... "   echo "Creating linux -> linux-${KPVER}-${KBRANCH}-${KPBUILD} symlink ... "
460   [ ! -d ${MROOT}/usr/src ] && install ${MROOT}/usr/src   [ ! -d ${MROOT}/usr/src ] && install ${MROOT}/usr/src
# Line 348  kernel_sources_postinstall() Line 462  kernel_sources_postinstall()
462   ${MROOT}/usr/src/linux || die   ${MROOT}/usr/src/linux || die
463   fi   fi
464    
465   # if not exist create kernel-modules symlink   # create kernel-modules symlink
466   if [ ! -h ${MROOT}/usr/src/kernel-modules ] &&   if mqueryfeature "linuxsymlink" &&
467   [ -d ${MROOT}/usr/src/kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD} ]   [ -d ${MROOT}/usr/src/kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD} ]
468   then   then
469   echo "Creating kernel-modules -> kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD} symlink ... "   echo "Creating kernel-modules -> kernel-modules-${KPVER}-${KBRANCH}-${KPBUILD} symlink ... "
# Line 364  export_inherits kernel src_prepare src_c Line 478  export_inherits kernel src_prepare src_c
478  # export pre/postinstall functions depending on KERNEL_TYPE  # export pre/postinstall functions depending on KERNEL_TYPE
479  case ${KERNEL_TYPE} in  case ${KERNEL_TYPE} in
480   image)   image)
481   export_inherits kernel_image preinstall preremove postinstall postremove   export_inherits kernel_image preinstall preremove postinstall
482   SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} kernel_image_preinstall kernel_image_preremove kernel_image_postinstall kernel_image_postremove"   SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} kernel_image_preinstall kernel_image_preremove kernel_image_postinstall"
483   ;;   ;;
484   sources)   sources)
485   export_inherits kernel_sources postinstall   export_inherits kernel_sources postinstall

Legend:
Removed from v.2938  
changed lines
  Added in v.4527