Message ID | 20220104200904.1422985-1-aduskett@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [1/1] package/gdb: remove python2 support | expand |
Hello Adam, Le 04/01/2022 à 21:09, Adam Duskett a écrit : > According to the GDB 9.2 changelog, python3 has been supported since at least > 2019. > > - Remove BR2_PACKAGE_HOST_GDB_PYTHON in package/gdb/Config.in.host > > - Add BR2_PACKAGE_HOST_GDB_PYTHON to Config.in.legacy > > - Change depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 to > depends on BR2_PACKAGE_PYTHON3 in package/gdb/Config.in Agree on the principle but it seems that the gdb for csky is still based on gdb 7.12. https://github.com/c-sky/binutils-gdb/blob/4ecb98fbc2f94dbe01b69384afbc515107de73df/gdb/version.in But since csky toolchain has been removed recently, I guess we can remove the before applying your patch. For ARC, gdb is based on 10.x https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb/blob/arc-2020.09-release-gdb/gdb/version.in Best regards, Romain > > Signed-off-by: Adam Duskett <aduskett@gmail.com> > --- > Config.in.legacy | 7 +++++++ > package/gdb/Config.in | 2 +- > package/gdb/Config.in.host | 5 ----- > package/gdb/gdb.mk | 10 +--------- > 4 files changed, 9 insertions(+), 15 deletions(-) > > diff --git a/Config.in.legacy b/Config.in.legacy > index 5994d94487..a126d56052 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,13 @@ endif > > comment "Legacy options removed in 2022.02" > > +config BR2_PACKAGE_HOST_GDB_PYTHON > + bool "GDB Python2 support removed" > + select BR2_LEGACY > + help > + Python2 is deprecated and no longer supported. > + Please migrate to Python3. > + > config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE > bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" > select BR2_LEGACY > diff --git a/package/gdb/Config.in b/package/gdb/Config.in > index 6f1a883de7..daad6c910d 100644 > --- a/package/gdb/Config.in > +++ b/package/gdb/Config.in > @@ -77,7 +77,7 @@ config BR2_PACKAGE_GDB_TUI > > config BR2_PACKAGE_GDB_PYTHON > bool "Python support" > - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 > + depends on BR2_PACKAGE_PYTHON3 > help > This option enables Python support in the target gdb. > > diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host > index a6e1d7f53c..2c6c78f20a 100644 > --- a/package/gdb/Config.in.host > +++ b/package/gdb/Config.in.host > @@ -41,11 +41,6 @@ config BR2_PACKAGE_HOST_GDB_NOPYTHON > help > This option disables Python support in the cross gdb. > > -config BR2_PACKAGE_HOST_GDB_PYTHON > - bool "Python 2" > - help > - This option enables the Python 2 support in the cross gdb. > - > config BR2_PACKAGE_HOST_GDB_PYTHON3 > bool "Python 3" > help > diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk > index 4ff498230a..2929eaf058 100644 > --- a/package/gdb/gdb.mk > +++ b/package/gdb/gdb.mk > @@ -206,11 +206,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) > GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) > GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) > GDB_DEPENDENCIES += python3 > -else > -# CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure. > -GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) > -GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) > -GDB_DEPENDENCIES += python > endif > GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config > else > @@ -287,10 +282,7 @@ else > HOST_GDB_CONF_OPTS += --disable-tui > endif > > -ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON),y) > -HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python2 > -HOST_GDB_DEPENDENCIES += host-python > -else ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) > +ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) > HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python3 > HOST_GDB_DEPENDENCIES += host-python3 > else >
Le 06/01/2022 à 22:10, Romain Naour a écrit : > Hello Adam, > > Le 04/01/2022 à 21:09, Adam Duskett a écrit : >> According to the GDB 9.2 changelog, python3 has been supported since at least >> 2019. Actually python3 support is available since gdb 7.8 for Linux: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=9a27f2c60d760a95a27e336750f26f69f91dd156 It's gdb python3 support for windows that is available since version 9.2. Best regards, Romain >> >> - Remove BR2_PACKAGE_HOST_GDB_PYTHON in package/gdb/Config.in.host >> >> - Add BR2_PACKAGE_HOST_GDB_PYTHON to Config.in.legacy >> >> - Change depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 to >> depends on BR2_PACKAGE_PYTHON3 in package/gdb/Config.in > > Agree on the principle but it seems that the gdb for csky is still based on gdb > 7.12. > > https://github.com/c-sky/binutils-gdb/blob/4ecb98fbc2f94dbe01b69384afbc515107de73df/gdb/version.in > > But since csky toolchain has been removed recently, I guess we can remove the > before applying your patch. > > For ARC, gdb is based on 10.x > > https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb/blob/arc-2020.09-release-gdb/gdb/version.in > > Best regards, > Romain > >> >> Signed-off-by: Adam Duskett <aduskett@gmail.com> >> --- >> Config.in.legacy | 7 +++++++ >> package/gdb/Config.in | 2 +- >> package/gdb/Config.in.host | 5 ----- >> package/gdb/gdb.mk | 10 +--------- >> 4 files changed, 9 insertions(+), 15 deletions(-) >> >> diff --git a/Config.in.legacy b/Config.in.legacy >> index 5994d94487..a126d56052 100644 >> --- a/Config.in.legacy >> +++ b/Config.in.legacy >> @@ -146,6 +146,13 @@ endif >> >> comment "Legacy options removed in 2022.02" >> >> +config BR2_PACKAGE_HOST_GDB_PYTHON >> + bool "GDB Python2 support removed" >> + select BR2_LEGACY >> + help >> + Python2 is deprecated and no longer supported. >> + Please migrate to Python3. >> + >> config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE >> bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" >> select BR2_LEGACY >> diff --git a/package/gdb/Config.in b/package/gdb/Config.in >> index 6f1a883de7..daad6c910d 100644 >> --- a/package/gdb/Config.in >> +++ b/package/gdb/Config.in >> @@ -77,7 +77,7 @@ config BR2_PACKAGE_GDB_TUI >> >> config BR2_PACKAGE_GDB_PYTHON >> bool "Python support" >> - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 >> + depends on BR2_PACKAGE_PYTHON3 >> help >> This option enables Python support in the target gdb. >> >> diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host >> index a6e1d7f53c..2c6c78f20a 100644 >> --- a/package/gdb/Config.in.host >> +++ b/package/gdb/Config.in.host >> @@ -41,11 +41,6 @@ config BR2_PACKAGE_HOST_GDB_NOPYTHON >> help >> This option disables Python support in the cross gdb. >> >> -config BR2_PACKAGE_HOST_GDB_PYTHON >> - bool "Python 2" >> - help >> - This option enables the Python 2 support in the cross gdb. >> - >> config BR2_PACKAGE_HOST_GDB_PYTHON3 >> bool "Python 3" >> help >> diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk >> index 4ff498230a..2929eaf058 100644 >> --- a/package/gdb/gdb.mk >> +++ b/package/gdb/gdb.mk >> @@ -206,11 +206,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) >> GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) >> GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) >> GDB_DEPENDENCIES += python3 >> -else >> -# CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure. >> -GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) >> -GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) >> -GDB_DEPENDENCIES += python >> endif >> GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config >> else >> @@ -287,10 +282,7 @@ else >> HOST_GDB_CONF_OPTS += --disable-tui >> endif >> >> -ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON),y) >> -HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python2 >> -HOST_GDB_DEPENDENCIES += host-python >> -else ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) >> +ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) >> HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python3 >> HOST_GDB_DEPENDENCIES += host-python3 >> else >> >
Hello, On Tue, 4 Jan 2022 12:09:04 -0800 Adam Duskett <aduskett@gmail.com> wrote: > According to the GDB 9.2 changelog, python3 has been supported since at least > 2019. > > - Remove BR2_PACKAGE_HOST_GDB_PYTHON in package/gdb/Config.in.host > > - Add BR2_PACKAGE_HOST_GDB_PYTHON to Config.in.legacy > > - Change depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 to > depends on BR2_PACKAGE_PYTHON3 in package/gdb/Config.in > > Signed-off-by: Adam Duskett <aduskett@gmail.com> I have applied your patch, after some changes. See below. > diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host > index a6e1d7f53c..2c6c78f20a 100644 > --- a/package/gdb/Config.in.host > +++ b/package/gdb/Config.in.host > @@ -41,11 +41,6 @@ config BR2_PACKAGE_HOST_GDB_NOPYTHON > help > This option disables Python support in the cross gdb. > > -config BR2_PACKAGE_HOST_GDB_PYTHON > - bool "Python 2" > - help > - This option enables the Python 2 support in the cross gdb. > - > config BR2_PACKAGE_HOST_GDB_PYTHON3 > bool "Python 3" > help The choice ... endchoice here was no longer needed, so I have only kept BR2_PACKAGE_HOST_GDB_PYTHON3 as an option. > diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk > index 4ff498230a..2929eaf058 100644 > --- a/package/gdb/gdb.mk > +++ b/package/gdb/gdb.mk > @@ -206,11 +206,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) This ifeq ($(BR2_PACKAGE_PYTHON3),y) was no longer needed: we know it's always going to be python3. Applied with those changes. Thanks! Thomas
diff --git a/Config.in.legacy b/Config.in.legacy index 5994d94487..a126d56052 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.02" +config BR2_PACKAGE_HOST_GDB_PYTHON + bool "GDB Python2 support removed" + select BR2_LEGACY + help + Python2 is deprecated and no longer supported. + Please migrate to Python3. + config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE bool "Bootlin riscv64 glibc bleeding-edge toolchain removed" select BR2_LEGACY diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 6f1a883de7..daad6c910d 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -77,7 +77,7 @@ config BR2_PACKAGE_GDB_TUI config BR2_PACKAGE_GDB_PYTHON bool "Python support" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help This option enables Python support in the target gdb. diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index a6e1d7f53c..2c6c78f20a 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -41,11 +41,6 @@ config BR2_PACKAGE_HOST_GDB_NOPYTHON help This option disables Python support in the cross gdb. -config BR2_PACKAGE_HOST_GDB_PYTHON - bool "Python 2" - help - This option enables the Python 2 support in the cross gdb. - config BR2_PACKAGE_HOST_GDB_PYTHON3 bool "Python 3" help diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 4ff498230a..2929eaf058 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -206,11 +206,6 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) GDB_DEPENDENCIES += python3 -else -# CONF_ENV: for top-level configure; MAKE_ENV: for sub-projects' configure. -GDB_CONF_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) -GDB_MAKE_ENV += BR_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) -GDB_DEPENDENCIES += python endif GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config else @@ -287,10 +282,7 @@ else HOST_GDB_CONF_OPTS += --disable-tui endif -ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON),y) -HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python2 -HOST_GDB_DEPENDENCIES += host-python -else ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) +ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON3),y) HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python3 HOST_GDB_DEPENDENCIES += host-python3 else
According to the GDB 9.2 changelog, python3 has been supported since at least 2019. - Remove BR2_PACKAGE_HOST_GDB_PYTHON in package/gdb/Config.in.host - Add BR2_PACKAGE_HOST_GDB_PYTHON to Config.in.legacy - Change depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 to depends on BR2_PACKAGE_PYTHON3 in package/gdb/Config.in Signed-off-by: Adam Duskett <aduskett@gmail.com> --- Config.in.legacy | 7 +++++++ package/gdb/Config.in | 2 +- package/gdb/Config.in.host | 5 ----- package/gdb/gdb.mk | 10 +--------- 4 files changed, 9 insertions(+), 15 deletions(-)