Skip to content

【修改】不去除非软件包 _PATH 和 _VER 后缀的选项 #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
armink merged 2 commits into from
Oct 30, 2019
Merged

【修改】不去除非软件包 _PATH 和 _VER 后缀的选项 #103

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2e0e4a
【修改】不去除非软件包 _PATH 和 _VER 后缀的选项
SummerGift Oct 30, 2019
d02bb06
Merge pull request #102 from SummerGGift/develop
armink Oct 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions cmds/cmd_menuconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,24 @@
# Date Author Notes
# 2018-05-28 SummerGift Add copyright information
# 2019-01-07 SummerGift The prompt supports utf-8 encoding
# 2019-10-30 SummerGift fix bug when generate some config item
#

import os
import platform
from vars import Import, Export

'''menuconfig for system configuration'''

# make rtconfig.h from .config
# judge if it's CONFIG_PKG_XX_PATH or CONFIG_PKG_XX_VER
def is_pkg_special_config(config_str):
if type(config_str) == type('a'):
if config_str.startswith("PKG_") and (config_str.endswith('_PATH') or config_str.endswith('_VER')):
return True
return False


def mk_rtconfig(filename):
"""make rtconfig.h from .config."""

try:
config = file(filename)
except:
Expand Down Expand Up @@ -76,8 +82,7 @@ def mk_rtconfig(filename):
if setting[0].startswith('CONFIG_'):
setting[0] = setting[0][7:]

# remove CONFIG_PKG_XX_PATH or CONFIG_PKG_XX_VER
if type(setting[0]) == type('a') and (setting[0].endswith('_PATH') or setting[0].endswith('_VER')):
if is_pkg_special_config(setting[0]):
continue

if setting[1] == 'y':
Expand All @@ -92,8 +97,7 @@ def mk_rtconfig(filename):
if setting[0].startswith('CONFIG_'):
setting[0] = setting[0][7:]

# remove CONFIG_PKG_XX_PATH or CONFIG_PKG_XX_VER
if type(setting[0]) == type('a') and (setting[0].endswith('_PATH') or setting[0].endswith('_VER')):
if is_pkg_special_config(setting[0]):
continue

rtconfig.write('#define %s %s\n' % (setting[0], alt_data))
Expand Down