Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Config
Commits
72261d9f
Commit
72261d9f
authored
Sep 20, 2017
by
Igor Pecovnik
Browse files
Bugfix on kernel switching
parent
85befd04
Changes
2
Show whitespace changes
Inline
Side-by-side
debian-config-jobs
View file @
72261d9f
...
@@ -780,8 +780,8 @@ function jobs ()
...
@@ -780,8 +780,8 @@ function jobs ()
aval_kernel
aval_kernel
if
[[
$exitstatus
=
0
]]
;
then
if
[[
$exitstatus
=
0
]]
;
then
exceptions
"
$INSTALL_KERNEL
"
exceptions
"
$INSTALL_KERNEL
"
dialog
--title
" Install and reboot "
--backtitle
"
$BACKTITLE
"
--yes-label
"OK"
--no-label
"Back"
\
dialog
--title
" Install and reboot "
--colors
--backtitle
"
$BACKTITLE
"
--yes-label
"OK"
--no-label
"Back"
\
--yesno
"
\n
Switching to linux-image
${
TARGET_BRANCH
}
-
${
TARGET_FAMILY
}
\n\n
Make sure you know what you are doing!
\
--yesno
"
\n
Switching to
\Z
1
linux-image
${
TARGET_BRANCH
}
-
${
TARGET_FAMILY
}
\Z
0
\n\n
Make sure you know what you are doing!
\
\n\n
Board config will be reverted to defaults."
11 46
\n\n
Board config will be reverted to defaults."
11 46
if
[[
$?
=
0
]]
;
then
if
[[
$?
=
0
]]
;
then
# remove old
# remove old
...
...
debian-config-submenu
View file @
72261d9f
...
@@ -285,19 +285,14 @@ function exceptions ()
...
@@ -285,19 +285,14 @@ function exceptions ()
{
{
TARGET_FAMILY
=
$LINUXFAMILY
TARGET_FAMILY
=
$LINUXFAMILY
UBOOT_BRANCH
=
$TARGET_BRANCH
# uboot naming is different
UBOOT_BRANCH
=
$TARGET_BRANCH
# uboot naming is different
case
$BOARD
in
cubietruck
|
cubieboard2
|
bananapipro
|
lamobo-r1
|
orangepi
|
orangepimini
|
lime
*
|
micro
|
pcduino3
|
pcduino3nano
)
if
[[
$TARGET_BRANCH
==
"default"
]]
;
then
TARGET_BRANCH
=
""
;
else
TARGET_BRANCH
=
"-"
$TARGET_BRANCH
;
fi
if
[[
$TARGET_BRANCH
==
"default"
]]
;
\
if
[[
$TARGET_FAMILY
==
sun
*
i
]]
;
then
then
TARGET_FAMILY
=
"sun7i"
;
TARGET_BRANCH
=
""
;
else
TARGET_FAMILY
=
"sunxi"
;
TARGET_BRANCH
=
"-"
$TARGET_BRANCH
;
fi
TARGET_FAMILY
=
"sunxi"
;;
if
[[
$UBOOT_BRANCH
==
"default"
]]
;
then
cubieboard
|
lime-a10
|
pcduino2
)
TARGET_FAMILY
=
$(
cat
/proc/cpuinfo |
grep
"Hardware"
|
sed
's/^.*Allwinner //'
|
awk
'{print $1;}'
)
if
[[
$TARGET_BRANCH
==
"default"
]]
;
\
fi
then
TARGET_FAMILY
=
"sun4i"
;
TARGET_BRANCH
=
""
;
else
TARGET_FAMILY
=
"sunxi"
;
TARGET_BRANCH
=
"-"
$TARGET_BRANCH
;
fi
fi
;;
*
)
if
[[
$TARGET_BRANCH
==
"default"
]]
;
\
then
TARGET_BRANCH
=
""
;
else
TARGET_BRANCH
=
"-"
$TARGET_BRANCH
;
fi
esac
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment