Resubmit converted gentargets
cover Resubmit converted gentargets
As Thomas pointed out, gentargets can use post patch hooks. I've changed these two packages to apply the debian patches in the post patch hooks.
[PATCH 1/2] input-tools: convert to gentargets [PATCH 2/2] mii-diag: convert to gentargets and bump to 2.11.3
PATCH 1/2 input-tools: convert to gentargets
Signed-off-by Martin Banky <[email protected]>
--- .../input-tools/input-tools-20051019-rint.patch | 18 ++++ package/input-tools/input-tools.mk | 88 ++++++++----------- package/input-tools/joystick-20051019-rint.patch | 18 ---- 3 files changed, 55 insertions(+), 69 deletions(-) create mode 100644 package/input-tools/input-tools-20051019-rint.patch delete mode 100644 package/input-tools/joystick-20051019-rint.patch
package/input-tools/input-tools-20051019-rint.patch new file +18 -0
@@ -0,0 +1,18 @@ +diff -urN joystick-20051019.orig/utils/jscal.c joystick-20051019/utils/jscal.c +--- joystick-20051019.orig/utils/jscal.c 2004-10-19 09:51:52.000000000 +0200 ++++ joystick-20051019/utils/jscal.c 2009-01-18 10:48:50.000000000 +0100 +@@ -141,10 +141,10 @@ + c = 32767.0 / (inputs.cmin[1] - inputs.cmax[0]); + d = 32767.0 / (inputs.cmin[2] - inputs.cmax[1]); + +- results[0] = rint(a); +- results[1] = rint(b); +- results[2] = rint(c*16384.0); +- results[3] = rint(d*16384.0); ++ results[0] = (int) (a + 0.5); ++ results[1] = (int) (b + 0.5); ++ results[2] = (int) (c*16384.0 + 0.5); ++ results[3] = (int) (d*16384.0 + 0.5); + + return 1; + }
package/input-tools/input-tools.mk +37 -51
101 lines not on this page · raw message
package/input-tools/joystick-20051019-rint.patch deleted +0 -18
@@ -1,18 +0,0 @@ -diff -urN joystick-20051019.orig/utils/jscal.c joystick-20051019/utils/jscal.c ---- joystick-20051019.orig/utils/jscal.c 2004-10-19 09:51:52.000000000 +0200 -+++ joystick-20051019/utils/jscal.c 2009-01-18 10:48:50.000000000 +0100 -@@ -141,10 +141,10 @@ - c = 32767.0 / (inputs.cmin[1] - inputs.cmax[0]); - d = 32767.0 / (inputs.cmin[2] - inputs.cmax[1]); - -- results[0] = rint(a); -- results[1] = rint(b); -- results[2] = rint(c*16384.0); -- results[3] = rint(d*16384.0); -+ results[0] = (int) (a + 0.5); -+ results[1] = (int) (b + 0.5); -+ results[2] = (int) (c*16384.0 + 0.5); -+ results[3] = (int) (d*16384.0 + 0.5); - - return 1; - }
Signature · 1 line
1.7.3.1
PATCH 1/2 input-tools: convert to gentargets
Quoted 1 line · On Tue, 5 Oct 2010 13:04:36 -0700 Martin Banky <[email protected]> wrote:
Signed-off-by Martin Banky <[email protected]>
Thanks, merged into one of my branch, for which I'll send a pull request soon.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 2/2 mii-diag: convert to gentargets and bump to 2.11.3
In reply to Martin BankySigned-off-by Martin Banky <[email protected]>
--- package/mii-diag/mii-diag.mk | 79 ++++++++++++++++-------------------------- 1 files changed, 30 insertions(+), 49 deletions(-)
package/mii-diag/mii-diag.mk +30 -49
@@ -3,59 +3,40 @@ # mii-diag # ############################################################# -MIIDIAG_VERSION:=2.11 -MIIDIAG_DEBIAN_PATCH_LEVEL:=2 -MIIDIAG_SOURCE:=mii-diag_$(MIIDIAG_VERSION).orig.tar.gz -MIIDIAG_PATCH_FILE=mii-diag_$(MIIDIAG_VERSION)-$(MIIDIAG_DEBIAN_PATCH_LEVEL).diff.gz -MIIDIAG_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mii-diag -MIIDIAG_DIR:=$(BUILD_DIR)/mii-diag-$(MIIDIAG_VERSION) -MIIDIAG_CAT:=$(ZCAT) -MIIDIAG_BINARY:=usr/sbin/mii-diag - -ifneq ($(MIIDIAG_PATCH_FILE),) -MIIDIAG_PATCH=$(DL_DIR)/$(MIIDIAG_PATCH_FILE) -$(MIIDIAG_PATCH): - $(call DOWNLOAD,$(MIIDIAG_SITE),$(MIIDIAG_PATCH_FILE)) -endif - -$(DL_DIR)/$(MIIDIAG_SOURCE): - $(call DOWNLOAD,$(MIIDIAG_SITE),$(MIIDIAG_SOURCE)) - -$(MIIDIAG_DIR)/.unpacked: $(DL_DIR)/$(MIIDIAG_SOURCE) $(MIIDIAG_PATCH) - mkdir -p $(MIIDIAG_DIR) - $(MIIDIAG_CAT) $(DL_DIR)/$(MIIDIAG_SOURCE) | tar --strip 1 -C $(MIIDIAG_DIR) $(TAR_OPTIONS) - -ifneq ($(MIIDIAG_PATCH_FILE),) - (cd $(MIIDIAG_DIR) && $(MIIDIAG_CAT) $(MIIDIAG_PATCH) | patch -p1) +MII_DIAG_VERSION = 2.11 +MII_DIAG_SOURCE = mii-diag_$(MII_DIAG_VERSION).orig.tar.gz +MII_DIAG_PATCH = mii-diag_$(MII_DIAG_VERSION)-3.diff.gz +MII_DIAG_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mii-diag + +ifneq ($(MII_DIAG_PATCH),) +define MII_DIAG_DEBIAN_PATCHES + if [ -d $(@D)/debian/patches ]; then \ + (cd $(@D)/debian/patches && for i in *; \ + do $(SED) 's,^\+\+\+ .*mii-diag-$(MII_DIAG_VERSION)/,+++ mii-diag-$(MII_DIAG_VERSION)/,' $$i; \ + done; \ + ); \ + toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \ + fi +endef endif - toolchain/patch-kernel.sh $(MIIDIAG_DIR) package/mii-diag/ mii-diag-\*.patch* - touch $@ - -$(MIIDIAG_DIR)/.configured: $(MIIDIAG_DIR)/.unpacked - touch $@ - -$(MIIDIAG_DIR)/mii-diag: $(MIIDIAG_DIR)/.configured - $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" -C $(MIIDIAG_DIR) -$(TARGET_DIR)/$(MIIDIAG_BINARY): $(MIIDIAG_DIR)/mii-diag - $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" -C $(MIIDIAG_DIR) DESTDIR=$(TARGET_DIR) install - $(STRIPCMD) $@ - touch $@ +MII_DIAG_POST_PATCH_HOOKS = MII_DIAG_DEBIAN_PATCHES -mii-diag: $(TARGET_DIR)/$(MIIDIAG_BINARY) +define MII_DIAG_BUILD_CMDS + $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) +endef -mii-diag-source: $(DL_DIR)/$(MIIDIAG_SOURCE) $(MIIDIAG_PATCH) +define MII_DIAG_INSTALL_TARGET_CMDS + $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install +endef -mii-diag-clean: - -$(MAKE) -C $(MIIDIAG_DIR) clean +define MII_DIAG_UNINSTALL_TARGET_CMDS + rm -f $(TARGET_DIR)/usr/sbin/mii-diag +endef -mii-diag-dirclean: - rm -rf $(MIIDIAG_DIR) +define MII_DIAG_CLEAN_CMDS + $(MAKE) -C $(@D) clean +endef -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_MIIDIAG),y) -TARGETS+=mii-diag -endif +$(eval $(call GENTARGETS,package,mii-diag))
Signature · 1 line
1.7.3.1
PATCH 2/2 mii-diag: convert to gentargets and bump to 2.11.3
Quoted 1 line · On Tue, 5 Oct 2010 13:04:37 -0700 Martin Banky <[email protected]> wrote:
Signed-off-by Martin Banky <[email protected]>
Thanks, merged into one of my branch.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com