Djam/kernel-5.13
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/kernel-5.13.git synced 2025-02-25 16:12:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle the case when CONFIG_64BIT gets removed

Browse source 
'#CONFIG_64BIT is not set' is present in the template config for i586
but it seems to be removed somehow when preparing the actual config. I
haven't investigated why and how.

For now, let us simply restore it.
This commit is contained in:
Evgenii Shatokhin 2018-07-09 14:12:08 +03:00
parent 95d0f2b220
commit 4c120bba95
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kernel.spec
View file

@ -612,18 +612,22 @@ CONFIG_DIR=arch/x86/configs
mkdir -p "${CONFIG_DIR}" mkdir -p "${CONFIG_DIR}"
for flav in ${FLAVOURS}; do for flav in ${FLAVOURS}; do
cfg_file=arch/x86/configs/%{arch_suffix}_defconfig-${flav}
echo "Creating configuration file for \"$flav\" kernel." echo "Creating configuration file for \"$flav\" kernel."
cp ./kernel-%{arch_suffix}.config .config cp ./kernel-%{arch_suffix}.config .config
# Make sure a newline is at the end of the basic part of the config. # Make sure a newline is at the end of the basic part of the config.
echo >> .config echo >> .config
cat ./kernel-${flav}-%{arch_suffix}.config >> .config cat ./kernel-${flav}-%{arch_suffix}.config >> .config
make ARCH=%{_arch} oldconfig && \ make ARCH=%{_arch} oldconfig && \
mv .config arch/x86/configs/%{arch_suffix}_defconfig-${flav} && \ mv .config ${cfg_file} && \
echo "Created arch/x86/configs/%{arch_suffix}_defconfig-${flav}." echo "Created ${cfg_file}."
# Do not try to build 64-bit kernels for 32-bit systems, for now. # Do not try to build 64-bit kernels for 32-bit systems, for now.
# Looks like something might have removed '# CONFIG_64BIT is not set' from
# the config, let us restore it.
%ifarch %{ix86} %ifarch %{ix86}
sed -i 's/CONFIG_64BIT=y/# CONFIG_64BIT is not set/' arch/x86/configs/%{arch_suffix}_defconfig-${flav} sed -i 's/CONFIG_64BIT=y//' ${cfg_file}
echo '# CONFIG_64BIT is not set' >> ${cfg_file}
%endif %endif
done done