xlib_libpthread-stubs: Rename package to libpthread-stubs
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v3 1/3 xlib_libpthread-stubs: Rename package to libpthread-stubs
v4: Config.in.legacy:
move BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS to 2014.02 (Arnout)
v3: rebased v2
libdrm: rename to libpthread-stubs as well for bisectability
v2: http://patchwork.ozlabs.org/patch/304117/ (Paul Cercueil)
v1: http://patchwork.ozlabs.org/patch/278296/ (Spenser Gilliland)
---
Config.in.legacy | 15 ++++++++++++---
package/Config.in | 1 +
package/libdrm/Config.in | 2 +-
package/libdrm/libdrm.mk | 2 +-
.../Config.in | 2 +-
package/libpthread-stubs/libpthread-stubs.mk | 20 ++++++++++++++++++++
package/x11r7/Config.in | 1 -
package/x11r7/libxcb/Config.in | 2 +-
package/x11r7/libxcb/libxcb.mk | 2 +-
.../xlib_libpthread-stubs/xlib_libpthread-stubs.mk | 20 --------------------
10 files changed, 38 insertions(+), 29 deletions(-)
rename package/{x11r7/xlib_libpthread-stubs => libpthread-stubs}/Config.in (88%)
create mode 100644 package/libpthread-stubs/libpthread-stubs.mk
delete mode 100644 package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mkConfig.in.legacy +12 -3
@@ -198,6 +198,16 @@ config BR2_PACKAGE_LUACJSON help The option has been renamed BR2_PACKAGE_LUA_CJSON. +config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS + bool "xlib-libpthread-stubs option has been renamed" + depends on BR2_PACKAGE_XORG7 + select BR2_LEGACY + select BR2_PACKAGE_LIBPTHREAD_STUBS + help + The pthread stubs do not depend on X11 nor Xlib. Thus the + package has been renamed + BR2_PACKAGE_LIBPTHREAD_STUBS + ############################################################################### comment "Legacy options removed in 2013.11"
@@ -482,11 +492,10 @@ config BR2_PACKAGE_XSERVER_tinyx config BR2_PACKAGE_PTHREAD_STUBS bool "pthread-stubs option has been renamed" select BR2_LEGACY - select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS - depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBPTHREAD_STUBS help For consistency reason, the pthread-stubs package has been - renamed to xlib_libpthread-stubs. + renamed to libpthread-stubs. ############################################################################### comment "Legacy options removed in 2012.08"
package/Config.in +1 -0
@@ -744,6 +744,7 @@ source "package/liblog4c-localtime/Config.in" source "package/libnspr/Config.in" source "package/libpfm4/Config.in" source "package/libplist/Config.in" +source "package/libpthread-stubs/Config.in" source "package/libpthsem/Config.in" source "package/libseccomp/Config.in" source "package/libsigc/Config.in"
package/libdrm/Config.in +1 -1
@@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBDRM bool "libdrm" - select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS + select BR2_PACKAGE_LIBPTHREAD_STUBS depends on BR2_PACKAGE_XORG7 depends on BR2_LARGEFILE help
package/libdrm/libdrm.mk +1 -1
@@ -12,7 +12,7 @@ LIBDRM_LICENSE = MIT LIBDRM_INSTALL_STAGING = YES LIBDRM_DEPENDENCIES = \ - xlib_libpthread-stubs \ + libpthread-stubs \ host-pkgconf LIBDRM_CONF_OPT = \
package/libpthread-stubs/Config.in renamed from package/x11r7/xlib_libpthread-stubs/Config.in +1 -1
@@ -1,4 +1,4 @@ -config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS +config BR2_PACKAGE_LIBPTHREAD_STUBS bool "libpthread-stubs" depends on BR2_TOOLCHAIN_HAS_THREADS help
package/libpthread-stubs/libpthread-stubs.mk new file +20 -0
@@ -0,0 +1,20 @@ +################################################################################ +# +# libpthread-stubs +# +################################################################################ + +LIBPTHREAD_STUBS_VERSION = 0.3 +LIBPTHREAD_STUBS_SOURCE = libpthread-stubs-$(LIBPTHREAD_STUBS_VERSION).tar.bz2 +LIBPTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/ +LIBPTHREAD_STUBS_LICENSE = MIT +LIBPTHREAD_STUBS_LICENSE_FILES = COPYING + +LIBPTHREAD_STUBS_INSTALL_STAGING = YES + +ifeq ($(BR2_PREFER_STATIC_LIB),y) +LIBPTHREAD_STUBS_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -pthread" +endif + +$(eval $(autotools-package)) +$(eval $(host-autotools-package))
package/x11r7/Config.in +0 -1
@@ -53,7 +53,6 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xlib_libxkbfile/Config.in source package/x11r7/xlib_xtrans/Config.in source package/x11r7/xlib_libpciaccess/Config.in - source package/x11r7/xlib_libpthread-stubs/Config.in endmenu menu "X11R7 Applications" source package/x11r7/xapp_appres/Config.in
package/x11r7/libxcb/Config.in +1 -1
@@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBXCB bool "libxcb" - select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS + select BR2_PACKAGE_LIBPTHREAD_STUBS select BR2_PACKAGE_XCB_PROTO select BR2_PACKAGE_XLIB_LIBXDMCP select BR2_PACKAGE_XLIB_LIBXAU
package/x11r7/libxcb/libxcb.mk +1 -1
@@ -13,7 +13,7 @@ LIBXCB_LICENSE_FILES = COPYING LIBXCB_INSTALL_STAGING = YES LIBXCB_DEPENDENCIES = \ - host-libxslt xlib_libpthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \ + host-libxslt libpthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \ host-xcb-proto host-python host-pkgconf LIBXCB_CONF_OPT = --disable-build-docs
package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk deleted +0 -20
@@ -1,20 +0,0 @@ -################################################################################ -# -# xlib_libpthread-stubs -# -################################################################################ - -XLIB_LIBPTHREAD_STUBS_VERSION = 0.3 -XLIB_LIBPTHREAD_STUBS_SOURCE = libpthread-stubs-$(XLIB_LIBPTHREAD_STUBS_VERSION).tar.bz2 -XLIB_LIBPTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/ -XLIB_LIBPTHREAD_STUBS_LICENSE = MIT -XLIB_LIBPTHREAD_STUBS_LICENSE_FILES = COPYING - -XLIB_LIBPTHREAD_STUBS_INSTALL_STAGING = YES - -ifeq ($(BR2_PREFER_STATIC_LIB),y) -XLIB_LIBPTHREAD_STUBS_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -pthread" -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package))
Signature · 1 line
1.7.9.5
PATCH v3 1/3 xlib_libpthread-stubs: Rename package to libpthread-stubs
Quoted 6 lines · Bernd Kuhls
v4: Config.in.legacy:
moveBR2_PACKAGE_XLIB_LIBPTHREAD_STUBSto 2014.02 (Arnout)
v3: rebased v2
libdrm: rename to libpthread-stubs as well for bisectability
v2: http://patchwork.ozlabs.org/patch/304117/ (Paul Cercueil)
v1: http://patchwork.ozlabs.org/patch/278296/ (Spenser Gilliland)
The patch changelog should go below the SoB and ---. See
buildroot.net/downloads/manual/manual.html#submitting-patches
Quoted 4 lines
Signed-off-by Bernd Kuhls <[email protected]>Signed-off-by Paul Cercueil <[email protected]>Signed-off-by Spenser Gilliland <[email protected]>
Regards,
Arnout
Quoted 191 lines
--- Config.in.legacy | 15 ++++++++++++--- package/Config.in | 1 + package/libdrm/Config.in | 2 +- package/libdrm/libdrm.mk | 2 +- .../Config.in | 2 +- package/libpthread-stubs/libpthread-stubs.mk | 20 ++++++++++++++++++++ package/x11r7/Config.in | 1 - package/x11r7/libxcb/Config.in | 2 +- package/x11r7/libxcb/libxcb.mk | 2 +- .../xlib_libpthread-stubs/xlib_libpthread-stubs.mk | 20 -------------------- 10 files changed, 38 insertions(+), 29 deletions(-) rename package/{x11r7/xlib_libpthread-stubs => libpthread-stubs}/Config.in (88%) create mode 100644 package/libpthread-stubs/libpthread-stubs.mk delete mode 100644 package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mkConfig.in.legacy +12
-3@@ -198,6 +198,16 @@ config BR2_PACKAGE_LUACJSON help The option has been renamed BR2_PACKAGE_LUA_CJSON. +config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS + bool "xlib-libpthread-stubs option has been renamed" + depends on BR2_PACKAGE_XORG7 + select BR2_LEGACY + select BR2_PACKAGE_LIBPTHREAD_STUBS + help + The pthread stubs do not depend on X11 nor Xlib. Thus the + package has been renamed + BR2_PACKAGE_LIBPTHREAD_STUBS + ############################################################################### comment "Legacy options removed in 2013.11"@@ -482,11 +492,10 @@ config BR2_PACKAGE_XSERVER_tinyx config BR2_PACKAGE_PTHREAD_STUBS bool "pthread-stubs option has been renamed" select BR2_LEGACY - select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS - depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBPTHREAD_STUBS help For consistency reason, the pthread-stubs package has been - renamed to xlib_libpthread-stubs. + renamed to libpthread-stubs. ############################################################################### comment "Legacy options removed in 2012.08"package/Config.in +1
-0@@ -744,6 +744,7 @@ source "package/liblog4c-localtime/Config.in" source "package/libnspr/Config.in" source "package/libpfm4/Config.in" source "package/libplist/Config.in" +source "package/libpthread-stubs/Config.in" source "package/libpthsem/Config.in" source "package/libseccomp/Config.in" source "package/libsigc/Config.in"package/libdrm/Config.in +1
-1@@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBDRM bool "libdrm" - select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS + select BR2_PACKAGE_LIBPTHREAD_STUBS depends on BR2_PACKAGE_XORG7 depends on BR2_LARGEFILE helppackage/libdrm/libdrm.mk +1
-1@@ -12,7 +12,7 @@ LIBDRM_LICENSE = MIT LIBDRM_INSTALL_STAGING = YES LIBDRM_DEPENDENCIES = \ - xlib_libpthread-stubs \ + libpthread-stubs \ host-pkgconf LIBDRM_CONF_OPT = \package/libpthread-stubs/Config.in renamed from package/x11r7/xlib_libpthread-stubs/Config.in +1
-1@@ -1,4 +1,4 @@ -config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS +config BR2_PACKAGE_LIBPTHREAD_STUBS bool "libpthread-stubs" depends on BR2_TOOLCHAIN_HAS_THREADS helppackage/libpthread-stubs/libpthread-stubs.mk new file +20
-0@@ -0,0 +1,20 @@ +################################################################################ +# +# libpthread-stubs +# +################################################################################ + +LIBPTHREAD_STUBS_VERSION = 0.3 +LIBPTHREAD_STUBS_SOURCE = libpthread-stubs-$(LIBPTHREAD_STUBS_VERSION).tar.bz2 +LIBPTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/ +LIBPTHREAD_STUBS_LICENSE = MIT +LIBPTHREAD_STUBS_LICENSE_FILES = COPYING + +LIBPTHREAD_STUBS_INSTALL_STAGING = YES + +ifeq ($(BR2_PREFER_STATIC_LIB),y) +LIBPTHREAD_STUBS_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -pthread" +endif + +$(eval $(autotools-package)) +$(eval $(host-autotools-package))package/x11r7/Config.in +0
-1@@ -53,7 +53,6 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xlib_libxkbfile/Config.in source package/x11r7/xlib_xtrans/Config.in source package/x11r7/xlib_libpciaccess/Config.in - source package/x11r7/xlib_libpthread-stubs/Config.in endmenu menu "X11R7 Applications" source package/x11r7/xapp_appres/Config.inpackage/x11r7/libxcb/Config.in +1
-1@@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBXCB bool "libxcb" - select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS + select BR2_PACKAGE_LIBPTHREAD_STUBS select BR2_PACKAGE_XCB_PROTO select BR2_PACKAGE_XLIB_LIBXDMCP select BR2_PACKAGE_XLIB_LIBXAUpackage/x11r7/libxcb/libxcb.mk +1
-1@@ -13,7 +13,7 @@ LIBXCB_LICENSE_FILES = COPYING LIBXCB_INSTALL_STAGING = YES LIBXCB_DEPENDENCIES = \ - host-libxslt xlib_libpthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \ + host-libxslt libpthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \ host-xcb-proto host-python host-pkgconf LIBXCB_CONF_OPT = --disable-build-docspackage/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk deleted +0
-20@@ -1,20 +0,0 @@ -################################################################################ -# -# xlib_libpthread-stubs -# -################################################################################ - -XLIB_LIBPTHREAD_STUBS_VERSION = 0.3 -XLIB_LIBPTHREAD_STUBS_SOURCE = libpthread-stubs-$(XLIB_LIBPTHREAD_STUBS_VERSION).tar.bz2 -XLIB_LIBPTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/ -XLIB_LIBPTHREAD_STUBS_LICENSE = MIT -XLIB_LIBPTHREAD_STUBS_LICENSE_FILES = COPYING - -XLIB_LIBPTHREAD_STUBS_INSTALL_STAGING = YES - -ifeq ($(BR2_PREFER_STATIC_LIB),y) -XLIB_LIBPTHREAD_STUBS_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -pthread" -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v3 2/3 libdrm: Remove dependency towards X11
In reply to a message not in the archivev4: remove unnecessary dependencies (Arnout)
v3: rebased v2
v2: http://patchwork.ozlabs.org/patch/304116/ (Paul Cercueil)
v1: http://patchwork.ozlabs.org/patch/278297/ (Spenser Gilliland)
--- package/libdrm/Config.in | 7 +------ package/libdrm/libdrm.mk | 3 --- 2 files changed, 1 insertion(+), 9 deletions(-)
package/libdrm/Config.in +1 -6
@@ -1,7 +1,6 @@ config BR2_PACKAGE_LIBDRM bool "libdrm" select BR2_PACKAGE_LIBPTHREAD_STUBS - depends on BR2_PACKAGE_XORG7 depends on BR2_LARGEFILE help Direct Rendering Manager
@@ -14,6 +13,7 @@ menu "DRM Drivers" config BR2_PACKAGE_LIBDRM_INTEL bool "intel" + depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBATOMIC_OPS select BR2_PACKAGE_XLIB_LIBPCIACCESS depends on BR2_i386 || BR2_x86_64
@@ -22,22 +22,18 @@ config BR2_PACKAGE_LIBDRM_INTEL config BR2_PACKAGE_LIBDRM_RADEON bool "radeon" - select BR2_PACKAGE_LIBATOMIC_OPS - select BR2_PACKAGE_XLIB_LIBPCIACCESS depends on BR2_i386 || BR2_x86_64 help install AMD/ATI graphics driver config BR2_PACKAGE_LIBDRM_NOUVEAU bool "nouveau" - select BR2_PACKAGE_XLIB_LIBPCIACCESS depends on BR2_i386 || BR2_x86_64 help install Nvidia graphics driver config BR2_PACKAGE_LIBDRM_VMWGFX bool "vmwgfx" - select BR2_PACKAGE_XLIB_LIBPCIACCESS depends on BR2_i386 || BR2_x86_64 help installs Vmware graphics driver
@@ -65,5 +61,4 @@ endmenu endif comment "libdrm needs a toolchain w/ largefile" - depends on BR2_PACKAGE_XORG7 depends on !BR2_LARGEFILE
package/libdrm/libdrm.mk +0 -3
@@ -28,21 +28,18 @@ endif ifeq ($(BR2_PACKAGE_LIBDRM_RADEON),y) LIBDRM_CONF_OPT += --enable-radeon -LIBDRM_DEPENDENCIES += xlib_libpciaccess else LIBDRM_CONF_OPT += --disable-radeon endif ifeq ($(BR2_PACKAGE_LIBDRM_NOUVEAU),y) LIBDRM_CONF_OPT += --enable-nouveau -LIBDRM_DEPENDENCIES += xlib_libpciaccess else LIBDRM_CONF_OPT += --disable-nouveau endif ifeq ($(BR2_PACKAGE_LIBDRM_VMWGFX),y) LIBDRM_CONF_OPT += --enable-vmwgfx -LIBDRM_DEPENDENCIES += xlib_libpciaccess else LIBDRM_CONF_OPT += --disable-vmwgfx endif
Signature · 1 line
1.7.9.5
PATCH v3 2/3 libdrm: Remove dependency towards X11
Quoted 4 lines · Bernd Kuhls
v4: remove unnecessary dependencies (Arnout)
v3: rebased v2
v2: http://patchwork.ozlabs.org/patch/304116/ (Paul Cercueil)
v1: http://patchwork.ozlabs.org/patch/278297/ (Spenser Gilliland)
Same comment about the place of the patch changelog.
Also, for this one you should put in the commit message your proof that
these dependencies can be removed. Basically, the body of the mail you sent earlier.
Quoted 4 lines
Signed-off-by Bernd Kuhls <[email protected]>Signed-off-by Paul Cercueil <[email protected]>Signed-off-by Spenser Gilliland <[email protected]>
Regards,
Arnout
Quoted 81 lines
--- package/libdrm/Config.in | 7 +------ package/libdrm/libdrm.mk | 3 --- 2 files changed, 1 insertion(+), 9 deletions(-)package/libdrm/Config.in +1
-6@@ -1,7 +1,6 @@ config BR2_PACKAGE_LIBDRM bool "libdrm" select BR2_PACKAGE_LIBPTHREAD_STUBS - depends on BR2_PACKAGE_XORG7 depends on BR2_LARGEFILE help Direct Rendering Manager@@ -14,6 +13,7 @@ menu "DRM Drivers" config BR2_PACKAGE_LIBDRM_INTEL bool "intel" + depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBATOMIC_OPS select BR2_PACKAGE_XLIB_LIBPCIACCESS depends on BR2_i386 || BR2_x86_64@@ -22,22 +22,18 @@ config BR2_PACKAGE_LIBDRM_INTEL config BR2_PACKAGE_LIBDRM_RADEON bool "radeon" - select BR2_PACKAGE_LIBATOMIC_OPS - select BR2_PACKAGE_XLIB_LIBPCIACCESS depends on BR2_i386 || BR2_x86_64 help install AMD/ATI graphics driver config BR2_PACKAGE_LIBDRM_NOUVEAU bool "nouveau" - select BR2_PACKAGE_XLIB_LIBPCIACCESS depends on BR2_i386 || BR2_x86_64 help install Nvidia graphics driver config BR2_PACKAGE_LIBDRM_VMWGFX bool "vmwgfx" - select BR2_PACKAGE_XLIB_LIBPCIACCESS depends on BR2_i386 || BR2_x86_64 help installs Vmware graphics driver@@ -65,5 +61,4 @@ endmenu endif comment "libdrm needs a toolchain w/ largefile" - depends on BR2_PACKAGE_XORG7 depends on !BR2_LARGEFILEpackage/libdrm/libdrm.mk +0
-3@@ -28,21 +28,18 @@ endif ifeq ($(BR2_PACKAGE_LIBDRM_RADEON),y) LIBDRM_CONF_OPT += --enable-radeon -LIBDRM_DEPENDENCIES += xlib_libpciaccess else LIBDRM_CONF_OPT += --disable-radeon endif ifeq ($(BR2_PACKAGE_LIBDRM_NOUVEAU),y) LIBDRM_CONF_OPT += --enable-nouveau -LIBDRM_DEPENDENCIES += xlib_libpciaccess else LIBDRM_CONF_OPT += --disable-nouveau endif ifeq ($(BR2_PACKAGE_LIBDRM_VMWGFX),y) LIBDRM_CONF_OPT += --enable-vmwgfx -LIBDRM_DEPENDENCIES += xlib_libpciaccess else LIBDRM_CONF_OPT += --disable-vmwgfx endif
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v3 3/3 libdrm: bump to version 2.4.52
In reply to a message not in the archive--- package/libdrm/libdrm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/libdrm/libdrm.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.46 +LIBDRM_VERSION = 2.4.52 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2 LIBDRM_SITE = http://dri.freedesktop.org/libdrm/ LIBDRM_LICENSE = MIT
Signature · 1 line
1.7.9.5