python-pygame: Remove wildcards in macros

PATCH New Paul Cercueil 3 participants 11 messages Apr 8, 2014 – May 3, 2014

lore

Share & tools

lore

Paul Cercueil

author

2014-04-08 17:45 UTC #0 lore raw

PATCH 1/5 python-pygame: Remove wildcards in macros

Signed-off-by Paul Cercueil <[email protected]>

---
 package/python-pygame/python-pygame.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

package/python-pygame/python-pygame.mk +2 -2

index d9219b9..b6381a3 100644
@@ -83,13 +83,13 @@ define PYTHON_PYGAME_CONFIGURE_CMDS
 endef
 
 define PYTHON_PYGAME_REMOVE_DOC
-	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/docs
+	rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/pygame/docs
 endef
 
 PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_DOC
 
 define PYTHON_PYGAME_REMOVE_TESTS
-	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/tests
+	rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/pygame/tests
 endef
 
 PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_TESTS

Signature · 1 line

1.9.1

Paul Cercueil

author

2014-04-08 17:45 UTC #1 lore raw

PATCH 2/5 python-pygame: Make installation of examples optional

From: Maarten ter Huurne <[email protected]>

They take up 1.5 MB in the target file system.

Signed-off-by Maarten ter Huurne <[email protected]>

---
 package/python-pygame/Config.in        | 6 ++++++
 package/python-pygame/python-pygame.mk | 7 +++++++
 2 files changed, 13 insertions(+)

package/python-pygame/Config.in +6 -0

index b9a367d..f72ee31 100644
@@ -20,6 +20,12 @@ config BR2_PACKAGE_PYTHON_PYGAME_IMAGE
 	  pygame module for loading, saving and transfering images.
 	  Will autoselect sdl_image with png and jpeg support.
 
+config BR2_PACKAGE_PYTHON_PYGAME_EXAMPLES
+	bool "pygame.examples"
+	help
+	  Include examples.
+	  Selecting this option adds about 1.5 MB to the target file system.
+
 config BR2_PACKAGE_PYTHON_PYGAME_FONT
 	bool "pygame.font"
 	select BR2_PACKAGE_SDL_TTF

package/python-pygame/python-pygame.mk +7 -0

index b6381a3..dac9a82 100644
@@ -94,4 +94,11 @@ endef
 
 PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_TESTS
 
+ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_EXAMPLES),y)
+define PYTHON_PYGAME_REMOVE_EXAMPLES
+	rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/pygame/examples
+endef
+PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_EXAMPLES
+endif
+
 $(eval $(python-package))

Signature · 1 line

1.9.1

Peter Korsgaard

2014-04-11 20:12 UTC #2 lore raw

PATCH 2/5 python-pygame: Make installation of examples optional

Quoted 6 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Paul" == Paul Cercueil <[email protected]> writes:
From: Maarten ter Huurne <[email protected]>
They take up 1.5 MB in the target file system.
Signed-off-by Maarten ter Huurne <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Paul Cercueil

author

2014-04-08 17:45 UTC #3 lore raw

PATCH 3/5 libao: Remove OSS plugin when ALSA is enabled

In reply to Paul Cercueil

From: Maarten ter Huurne <[email protected]>

At runtime, libao will load all plugins, even ones that will never be used. Since libao will prefer ALSA over OSS by default anyway, it is pretty safe to exclude the OSS plugin.

There is no configure option for disabling the OSS plugin, so we remove the shared object in a post-install hook.

Signed-off-by Maarten ter Huurne <[email protected]>

---
 package/libao/libao.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

package/libao/libao.mk +7 -1

index 8e9ee35..3f7d166 100644
@@ -11,11 +11,17 @@ LIBAO_INSTALL_STAGING = YES
 LIBAO_LICENSE = GPLv2+
 LIBAO_LICENSE_FILES = COPYING
 LIBAO_CONF_OPT = --disable-esd --disable-wmm --disable-arts \
-			--disable-nas --disable-pulse
+			--disable-nas --disable-pulse --disable-broken-oss
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
 LIBAO_DEPENDENCIES += alsa-lib
 LIBAO_CONF_OPT += --enable-alsa --enable-alsa-mmap
+
+# Remove the OSS plugin if ALSA is enabled, as libao will prefer ALSA anyway
+define LIBAO_REMOVE_OSS_PLUGIN
+	rm -f $(TARGET_DIR)/usr/lib/ao/plugins-4/liboss.so
+endef
+LIBAO_POST_INSTALL_TARGET_HOOKS += LIBAO_REMOVE_OSS_PLUGIN
 else
 LIBAO_CONF_OPT += --disable-alsa
 endif

Signature · 1 line

1.9.1

Peter Korsgaard

2014-05-03 20:27 UTC #4 lore raw

PATCH 3/5 libao: Remove OSS plugin when ALSA is enabled

Quoted 11 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Paul" == Paul Cercueil <[email protected]> writes:
From: Maarten ter Huurne <[email protected]>
At runtime, libao will load all plugins, even ones that will never be used. Since libao will prefer ALSA over OSS by default anyway, it is pretty safe to exclude the OSS plugin.
There is no configure option for disabling the OSS plugin, so we remove the shared object in a post-install hook.
Signed-off-by Maarten ter Huurne <[email protected]>

Committed with a note explaining why we now pass --disable-broken-oss, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Paul Cercueil

author

2014-04-08 17:45 UTC #5 lore raw

PATCH 4/5 util-linux: Add config switches for some more binaries

In reply to Paul Cercueil

Signed-off-by Paul Cercueil <[email protected]>

---
 package/util-linux/Config.in     | 20 ++++++++++++++++++++
 package/util-linux/util-linux.mk |  6 +++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

package/util-linux/Config.in +20 -0

index b1db99a..cef8009 100644
@@ -56,6 +56,11 @@ config BR2_PACKAGE_UTIL_LINUX_ARCH
 	help
 	  Print machine architecture
 
+config BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH
+	bool "chfn/chsh"
+	help
+	  Change login shell, real user name and information
+
 config BR2_PACKAGE_UTIL_LINUX_CRAMFS
 	bool "cramfs utilities"
 	select BR2_PACKAGE_ZLIB

@@ -98,6 +103,11 @@ config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
 comment "login utilities needs a toolchain w/ locale"
 	depends on !BR2_ENABLE_LOCALE
 
+config BR2_PACKAGE_UTIL_LINUX_LOSETUP
+	bool "losetup"
+	help
+	  Set up and control loop devices
+
 config BR2_PACKAGE_UTIL_LINUX_MESG
 	bool "mesg"
 	help

@@ -108,6 +118,11 @@ config BR2_PACKAGE_UTIL_LINUX_MOUNT
 	help
 	  Mount/unmount filesystems
 
+config BR2_PACKAGE_UTIL_LINUX_NEWGRP
+	bool "newgrp"
+	help
+	  Log in to a new group
+
 config BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT
 	bool "pivot_root"
 	help

@@ -158,6 +173,11 @@ config BR2_PACKAGE_UTIL_LINUX_UUIDD
 	help
 	  UUID generation daemon
 
+config BR2_PACKAGE_UTIL_LINUX_VIPW
+	bool "vipw"
+	help
+	  Edit the password, group, shadow-password or shadow-group file
+
 config BR2_PACKAGE_UTIL_LINUX_WALL
 	bool "wall"
 	help

package/util-linux/util-linux.mk +5 -1

index f0ae3ae..cc57088 100644
@@ -54,6 +54,7 @@ UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_LINUX_PAM),linux-pam)
 UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_AGETTY),--enable-agetty,--disable-agetty) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_ARCH),--enable-arch,--disable-arch) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH),--enable-chfn-chsh,--disable-chfn-chsh) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_CRAMFS),--enable-cramfs,--disable-cramfs) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_DDATE),--enable-ddate,--disable-ddate) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_EJECT),--enable-eject,--disable-eject) \

@@ -64,9 +65,11 @@ UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),--enable-libmount,--disable-libmount) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),--enable-libuuid,--disable-libuuid) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-last --enable-login --enable-su --enable-sulogin,--disable-last --disable-login --disable-su --disable-sulogin) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_LOSETUP),--enable-losetup,--disable-losetup) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_MOUNT),--enable-mount,--disable-mount) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),,--disable-partx) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_NEWGRP),--enable-newgrp,--disable-newgrp) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),--enable-partx,--disable-partx) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT),--enable-pivot_root,--disable-pivot_root) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw,--disable-raw) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),--enable-rename,--disable-rename) \

@@ -76,6 +79,7 @@ UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_UNSHARE),--enable-unshare,--disable-unshare) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_UTMPDUMP),--enable-utmpdump,--disable-utmpdump) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_UUIDD),--enable-uuidd,--disable-uuidd) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_VIPW),--enable-vipw,--disable-vipw) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_WALL),--enable-wall,--disable-wall) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write)

Signature · 1 line

1.9.1

Thomas Petazzoni

Applied

2014-04-20 09:47 UTC #6 lore raw

PATCH 4/5 util-linux: Add config switches for some more binaries

Dear Paul Cercueil,

Quoted 5 lines · Paul Cercueil

Signed-off-by Paul Cercueil <[email protected]>

---
 package/util-linux/Config.in     | 20 ++++++++++++++++++++
 package/util-linux/util-linux.mk |  6 +++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

Applied, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Paul Cercueil

author

2014-04-08 17:45 UTC #7 lore raw

PATCH 5/5 stress: Patch to fix documentation source

In reply to Paul Cercueil

From: Maarten ter Huurne <[email protected]>

Some versions of "makeinfo" consider @itemx not immediately following @item an error. It is a violation of the texinfo syntax, but silently ignored on most systems, for some reason.

Signed-off-by Maarten ter Huurne <[email protected]>

---
 package/stress/stress-0002-Fix-doc-itemx.patch | 47 ++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/stress/stress-0002-Fix-doc-itemx.patch

package/stress/stress-0002-Fix-doc-itemx.patch new file +47 -0

new file mode 100644
index 0000000..8ef7fa4
@@ -0,0 +1,47 @@
+diff -ru stress-1.0.4.org/doc/stress.texi stress-1.0.4/doc/stress.texi
+--- stress-1.0.4.org/doc/stress.texi	2005-03-10 02:16:02.000000000 +0100
++++ stress-1.0.4/doc/stress.texi	2013-07-21 21:50:47.000000000 +0200
+@@ -65,7 +65,7 @@
+ @itemx --help
+ Show help information.
+ 
+- at itemx --version
++ at item --version
+ Show version information.
+ 
+ @item -v
+@@ -84,7 +84,7 @@
+ @itemx --timeout @var{secs}
+ Time out after @var{secs} seconds.
+ 
+- at itemx --backoff @var{usecs}
++ at item --backoff @var{usecs}
+ Wait for factor of @var{usecs} microseconds before starting work.
+ 
+ @item -c @var{forks}
+@@ -99,10 +99,10 @@
+ @itemx --vm @var{forks}
+ Spawn @var{forks} processes each spinning on @samp{malloc()}.
+ 
+- at itemx --vm-bytes @var{bytes}
++ at item --vm-bytes @var{bytes}
+ Allocate @var{bytes} number of bytes.  The default is 1.
+ 
+- at itemx --vm-hang
++ at item --vm-hang
+ Instruct each vm hog process to go to sleep after allocating memory.  This
+ contrasts with their normal behavior, which is to free the memory and
+ reallocate @emph{ad infinitum}.  This is useful for simulating low memory
+@@ -117,10 +117,10 @@
+ @itemx --hdd @var{forks}
+ Spawn @var{forks} processes each spinning on @samp{write()}.
+ 
+- at itemx --hdd-bytes @var{bytes}
++ at item --hdd-bytes @var{bytes}
+ Write @var{bytes} number of bytes.  The default is 1GB.
+ 
+- at itemx --hdd-noclean
++ at item --hdd-noclean
+ Do not unlink file(s) to which random ASCII data is written.
+ 
+ @end table

Signature · 1 line

1.9.1

Thomas Petazzoni

2014-04-12 14:14 UTC #8 lore raw

PATCH 5/5 stress: Patch to fix documentation source

Dear Paul Cercueil,

Quoted 11 lines · Paul Cercueil

From: Maarten ter Huurne <[email protected]>
Some versions of "makeinfo" consider @itemx not immediately following @item an error. It is a violation of the texinfo syntax, but silently ignored on most systems, for some reason.
Signed-off-by Maarten ter Huurne <[email protected]>
---
 package/stress/stress-0002-Fix-doc-itemx.patch | 47 ++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/stress/stress-0002-Fix-doc-itemx.patch

I don't think this patch is still necessary. Since commit dc7a9bb9f7e0ac096d79c47e9240c2eb7b08dce9 (October 2013), we pass MAKEINFO=: to avoid generating the stress documentation. So we should not hit such issues.

If you're really interested in having this fixed, please submit the patch to the upstream maintainer, apw at debian.org.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Peter Korsgaard

2014-04-10 21:07 UTC #9 lore raw

PATCH 1/5 python-pygame: Remove wildcards in macros

In reply to Paul Cercueil

Quoted 12 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Paul" == Paul Cercueil <[email protected]> writes:
Signed-off-by Paul Cercueil <[email protected]>
---
 package/python-pygame/python-pygame.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/python-pygame/python-pygame.mk +0 -0
index d9219b9..b6381a3 100644

package/python-pygame/python-pygame.mk define PYTHON_PYGAME_CONFIGURE_CMDS · line 86

Quoted 5 lines

package/python-pygame/python-pygame.mk +1 -1

@@ -83,13 +83,13 @@ define PYTHON_PYGAME_CONFIGURE_CMDS
 endef
 
 define PYTHON_PYGAME_REMOVE_DOC
-	rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/docs
+	rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/pygame/docs

What's the advantage of this? If pygame starts supporting python3.x then this breaks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

2014-04-20 09:58 UTC #10 lore raw

PATCH 1/5 python-pygame: Remove wildcards in macros

In reply to Paul Cercueil

Dear Paul Cercueil,

Quoted 4 lines · Paul Cercueil

Signed-off-by Paul Cercueil <[email protected]>
---
 package/python-pygame/python-pygame.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Following the comment from Peter, and some IRC discussion, I've marked this patch as Rejected.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com