ARM: Don't install or deal with in templates, no longer existing kernels

remove no longer used kernel variants from templates
dont try to install no longer existing kernel-tegra variant
This commit is contained in:
Dennis Gilmore 2013-10-07 15:23:35 -05:00
parent 7d3fafedf3
commit 8d84e9d25a
4 changed files with 3 additions and 9 deletions

View File

@ -10,7 +10,6 @@ LIVEDIR="LiveOS"
# include a 'baseline' kernel for no 'flavor'. # include a 'baseline' kernel for no 'flavor'.
kernelAddress = { 'baseline' : '0x00008000', kernelAddress = { 'baseline' : '0x00008000',
'lpae' : '0x00008000', 'lpae' : '0x00008000',
'tegra' : '0x00008000',
} }
# keep a comma-delimited list of platforms installed to add to .treeinfo # keep a comma-delimited list of platforms installed to add to .treeinfo

View File

@ -9,12 +9,7 @@ LIVEDIR="LiveOS"
# different platforms use different kernel load addresses. # different platforms use different kernel load addresses.
# include a 'baseline' kernel for no 'flavor'. # include a 'baseline' kernel for no 'flavor'.
kernelAddress = { 'baseline' : '0x00008000', kernelAddress = { 'baseline' : '0x00008000',
'highbank' : '0x00008000', 'lpae' : '0x00008000',
'imx' : '0x90008000',
'kirkwood' : '0x00008000',
'mvebu' : '0x00008000',
'omap' : '0x80008000',
'tegra' : '0x00008000',
} }
%> %>

View File

@ -22,7 +22,7 @@ installpkg grubby
## arch-specific packages (bootloaders etc.) ## arch-specific packages (bootloaders etc.)
%if basearch in ("arm", "armhfp"): %if basearch in ("arm", "armhfp"):
installpkg kernel-lpae kernel-tegra installpkg kernel-lpae
installpkg uboot-tools installpkg uboot-tools
%endif %endif
%if basearch == "i386": %if basearch == "i386":

View File

@ -264,7 +264,7 @@ class TreeBuilder(object):
def findkernels(root="/", kdir="boot"): def findkernels(root="/", kdir="boot"):
# To find possible flavors, awk '/BuildKernel/ { print $4 }' kernel.spec # To find possible flavors, awk '/BuildKernel/ { print $4 }' kernel.spec
flavors = ('debug', 'PAE', 'PAEdebug', 'smp', 'xen', 'lpae', 'tegra') flavors = ('debug', 'PAE', 'PAEdebug', 'smp', 'xen', 'lpae')
kre = re.compile(r"vmlinuz-(?P<version>.+?\.(?P<arch>[a-z0-9_]+)" kre = re.compile(r"vmlinuz-(?P<version>.+?\.(?P<arch>[a-z0-9_]+)"
r"(.(?P<flavor>{0}))?)$".format("|".join(flavors))) r"(.(?P<flavor>{0}))?)$".format("|".join(flavors)))
kernels = [] kernels = []