Skip to contentSkip to conversation

docker: change into generic-package

PATCH Superseded Arnout Vandecappelle (Essensium/Mind) 2 participants 4 messages Oct 23, 2013

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 docker: change into generic-package

docker is using autotools-package while it is in fact just a plain make package.

Remove docker-1.5-skip-configure.patch which was just a hack to avoid calling the non-existent configure script.

Remove docker-1.5-pkgconfig.patch which is not needed when PATH is set appropriately.

Add a XLIBPATH option to the command line to avoid linking with /usr/X11R6/lib.

---
I discovered this while testing Fabio's parallel make patches: the changed dependency on .stamp_configured made the build fail.

v2: darn, missing S on _CMDS... How did that one slip through?

---
 package/docker/docker-1.5-pkgconfig.patch      | 23 -----------------------
 package/docker/docker-1.5-skip-configure.patch |  4 ----
 package/docker/docker.mk                       | 19 +++++++++----------
 3 files changed, 9 insertions(+), 37 deletions(-)
 delete mode 100644 package/docker/docker-1.5-pkgconfig.patch
 delete mode 100644 package/docker/docker-1.5-skip-configure.patch
package/docker/docker-1.5-pkgconfig.patch deleted +0 -23
deleted file mode 100644
index 1b56b1b..0000000
@@ -1,23 +0,0 @@
---- a/Makefile	2002-11-20 05:20:49.000000000 -0500
-+++ b/Makefile	2008-04-28 12:36:23.000000000 -0400
-@@ -20,7 +20,6 @@ CFLAGS=-pedantic -Wall -W -O
- 
- PACKAGE=docker
- VERSION=1.5
--
- target=docker
- sources=docker.c kde.c icons.c xproperty.c net.c
- headers=docker.h kde.h icons.h xproperty.h net.h version.h
-@@ -31,10 +30,10 @@ all: $(target) $(sources) $(headers)
- 
- $(target): $(sources:.c=.o)
- 	$(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \
--		`pkg-config --libs glib-2.0` $^ -o $@
-+		`$(PKG_CONFIG) --libs glib-2.0` $^ -o $@
- 
- %.o: %.c
--	$(CC) -c $(CFLAGS) `pkg-config --cflags glib-2.0` $<
-+	$(CC) -c $(CFLAGS) `$(PKG_CONFIG) --cflags glib-2.0` $<
- 
- version.h: version.h.in Makefile
- 	sed -e "s/@VERSION@/$(VERSION)/" version.h.in > $@
package/docker/docker-1.5-skip-configure.patch deleted +0 -4
deleted file mode 100644
index 441f9b0..0000000
@@ -1,4 +0,0 @@
---- a/.stamp_configured	2008-03-19 03:34:24.425005162 -0400
-+++ b/.stamp_configured	2008-03-19 14:25:33.000000000 -0400
-@@ -0,0 +1 @@
-+ 
package/docker/docker.mk +9 -10
index 82cabec..c1c8efd 100644
@@ -7,15 +7,14 @@
 DOCKER_VERSION = 1.5
 DOCKER_SITE = http://icculus.org/openbox/2/docker
 
-DOCKER_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_LD)" \
-					CFLAGS="-I$(STAGING_DIR)/usr/include \
-						-I$(STAGING_DIR)/usr/include/glib-2.0 \
-						-I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
-					PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-					LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
+define DOCKER_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		XLIBPATH=$(STAGING_DIR)/usr/lib
+endef
 
-DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
+define DOCKER_INSTALL_TARGET_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		XLIBPATH=$(STAGING_DIR)/usr/lib PREFIX=$(TARGET_DIR)/usr install
+endef
 
-DOCKER_DEPENDENCIES = host-pkgconf libglib2 xlib_libX11
-
-$(eval $(autotools-package))
+$(eval $(generic-package))
Signature · 1 line
1.8.4.rc3
#1 lore raw

PATCH v2 2/2 docker: add license info

---
v2: no change

---
 package/docker/docker.mk | 5 +++++
 1 file changed, 5 insertions(+)
package/docker/docker.mk +5 -0
index c1c8efd..4b597d1 100644
@@ -7,6 +7,11 @@
 DOCKER_VERSION = 1.5
 DOCKER_SITE = http://icculus.org/openbox/2/docker
 
+DOCKER_DEPENDENCIES = host-pkgconf libglib2 xlib_libX11
+DOCKER_LICENSE = GPLv2+
+# The 'or later' is specified at the end of the README, so include that one too.
+DOCKER_LICENSE_FILES = COPYING README
+
 define DOCKER_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
 		XLIBPATH=$(STAGING_DIR)/usr/lib
Signature · 1 line
1.8.4.rc3
#2 lore raw

PATCH v2 2/2 docker: add license info

Arnout, All,

On 2013-10-23 22:28 +0200, Arnout Vandecappelle (Essensium/Mind) spake thusly:

Quoted 14 lines

---
v2: no change

---
 package/docker/docker.mk | 5 +++++
 1 file changed, 5 insertions(+)
package/docker/docker.mk +0 -0
index c1c8efd..4b597d1 100644

package/docker/docker.mk line 10

Quoted 4 lines
package/docker/docker.mk +1 -0
@@ -7,6 +7,11 @@
 DOCKER_VERSION = 1.5
 DOCKER_SITE = http://icculus.org/openbox/2/docker
 
+DOCKER_DEPENDENCIES = host-pkgconf libglib2 xlib_libX11

Shouldn't this go in the previous patch?

package/docker/docker.mk line 17

Quoted 7 lines
package/docker/docker.mk +4 -0
+DOCKER_LICENSE = GPLv2+
+# The 'or later' is specified at the end of the README, so include that one too.
+DOCKER_LICENSE_FILES = COPYING README
+
 define DOCKER_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
 		XLIBPATH=$(STAGING_DIR)/usr/lib

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH v2 2/2 docker: add license info

Quoted 20 lines · Yann E. MORIN

Arnout, All,

On 2013-10-23 22:28 +0200, Arnout Vandecappelle (Essensium/Mind) spake thusly:

Quoted 17 lines

---
v2: no change

---
  package/docker/docker.mk | 5 +++++
  1 file changed, 5 insertions(+)
package/docker/docker.mk +0 -0
index c1c8efd..4b597d1 100644
@@ -7,6 +7,11 @@
  DOCKER_VERSION = 1.5
  DOCKER_SITE = http://icculus.org/openbox/2/docker
 
Quoted 3 lines

package/docker/docker.mk line 10

Quoted 1 line
package/docker/docker.mk +1 -0
+DOCKER_DEPENDENCIES = host-pkgconf libglib2 xlib_libX11

Shouldn't this go in the previous patch?

Crap.

I first had only one patch, then I thought there would be complaints
that the patch should be split so I split it, but of course didn't check carefully enough...

Regards,
Arnout

Quoted 12 lines

package/docker/docker.mk line 17

Quoted 8 lines
package/docker/docker.mk +4 -0
+DOCKER_LICENSE = GPLv2+
+# The 'or later' is specified at the end of the README, so include that one too.
+DOCKER_LICENSE_FILES = COPYING README
+
  define DOCKER_BUILD_CMDS
  	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
  		XLIBPATH=$(STAGING_DIR)/usr/lib

Regards,
Yann E. MORIN.

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