Skip to contentSkip to conversation

screen: add support for 256 colors

PATCH Superseded Thierry Bultel 3 participants 4 messages Dec 9, 2014 – Dec 10, 2014

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 screen: add support for 256 colors

---
 package/screen/Config.in | 7 +++++++
 package/screen/screen.mk | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)
package/screen/Config.in +7 -0
index b5876e8..bae4be3 100644
@@ -11,3 +11,10 @@ config BR2_PACKAGE_SCREEN
 	  and support for multiple character sets).
 
 	  http://www.gnu.org/software/screen/
+
+if BR2_PACKAGE_SCREEN
+config BR2_PACKAGE_SCREEN_COLORS256
+	bool "screen 256 colors"
+	help
+	  enable support for 256 colors
+endif
package/screen/screen.mk +7 -1
index 827e776..8056c31 100644
@@ -14,8 +14,14 @@ SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)"
 SCREEN_MAKE = $(MAKE1)
 SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin
 
+ifeq ($(BR2_PACKAGE_SCREEN_COLORS256),y)
+SCREEN_CONF_OPTS += --enable-colors256
+endif
+
 define SCREEN_INSTALL_SCREENRC
-	$(INSTALL) -m 0755 -D $(@D)/etc/screenrc $(TARGET_DIR)/etc/screenrc
+	if [ ! -f $(TARGET_DIR)/etc/screenrc ]; then \
+		$(INSTALL) -m 0755 -D $(@D)/etc/screenrc $(TARGET_DIR)/etc/screenrc; \
+	fi
 endef
 
 SCREEN_POST_INSTALL_TARGET_HOOKS += SCREEN_INSTALL_SCREENRC
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 screen: add support for 256 colors

Dear Thierry Bultel,

package/screen/screen.mk SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)" · line 27

Quoted 8 lines · Thierry Bultel

define SCREEN_INSTALL_SCREENRC

package/screen/screen.mk +3 -1
-	$(INSTALL) -m 0755 -D $(@D)/etc/screenrc $(TARGET_DIR)/etc/screenrc
+	if [ ! -f $(TARGET_DIR)/etc/screenrc ]; then \
+		$(INSTALL) -m 0755 -D $(@D)/etc/screenrc $(TARGET_DIR)/etc/screenrc; \
+	fi
 endef
 
 SCREEN_POST_INSTALL_TARGET_HOOKS += SCREEN_INSTALL_SCREENRC

This part is not related with adding support for 256 colors, so, why don't you send a separate patch for it? Or at least, state in your commit message you are fixing a little issue with the 'screenrc' file installation. But I would say that a separate patch would be better.

Best regards,

Signature · 5 lines
Vicente Olivert Riera
Graduate Software Engineer, MIPS Platforms
Imagination Technologies Limited
t: +44 (0)113 2429814
www.imgtec.com
#2 lore raw

PATCH 1/1 screen: add support for 256 colors

Hi Vicente, Thierry,

Quoted 9 lines · Vicente Olivert Riera
Quoted 7 lines · Thierry Bultel

define SCREEN_INSTALL_SCREENRC

package/screen/screen.mk +3 -1
-	$(INSTALL) -m 0755 -D $(@D)/etc/screenrc $(TARGET_DIR)/etc/screenrc
+	if [ ! -f $(TARGET_DIR)/etc/screenrc ]; then \
+		$(INSTALL) -m 0755 -D $(@D)/etc/screenrc $(TARGET_DIR)/etc/screenrc; \
+	fi
 endef
Quoted 6 lines
Quoted 1 line

SCREEN_POST_INSTALL_TARGET_HOOKS += SCREEN_INSTALL_SCREENRC

This part is not related with adding support for 256 colors, so, why don't you send a separate patch for it? Or at least, state in your commit message you are fixing a little issue with the 'screenrc' file installation. But I would say that a separate patch would be better.

I don't think the change in this separate patch is desired. We have just recently (commit 963bbf266bfebc [screen: install configuration file unconditionally]) switched to unconditional install of the config file.

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
#3 lore raw

PATCH 1/1 screen: add support for 256 colors

Dear Baruch Siach, Thierry Bultel,

Quoted 3 lines · Baruch Siach

I don't think the change in this separate patch is desired. We have just recently (commit 963bbf266bfebc [screen: install configuration file unconditionally]) switched to unconditional install of the config file.

That's right. It's trying to revert this commit:

http://git.buildroot.net/buildroot/commit/?id=963bbf266bfebc240888cf8bce502a2fadb38c48

Please don't do that. Remove that from your patch, send a new version and mark this one as 'superseded' in patchwork.

Thanks,

Signature · 5 lines
Vicente Olivert Riera
Graduate Software Engineer, MIPS Platforms
Imagination Technologies Limited
t: +44 (0)113 2429814
www.imgtec.com