acpid: convert to gentargets and bump to 2.0.6
PATCH 1/18 acpid: convert to gentargets and bump to 2.0.6
Also, added acpi_listen to the target. It was being stripped, but not copied.
acpi_listen is a simple shell-friendly tool which connects to acpid and listens for events. When an event occurs, acpi_listen will print it on stdout.
--- package/acpid/acpid.mk | 57 +++++++++++++++-------------------------------- 1 files changed, 18 insertions(+), 39 deletions(-)
package/acpid/acpid.mk +18 -39
@@ -3,46 +3,25 @@ # acpid # ############################################################# -ACPID_VERSION:=1.0.8 -ACPID_DIR=$(BUILD_DIR)/acpid-$(ACPID_VERSION) -ACPID_SOURCE=acpid_$(ACPID_VERSION).orig.tar.gz -ACPID_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/a/acpid - -$(DL_DIR)/$(ACPID_SOURCE): - $(call DOWNLOAD,$(ACPID_SITE),$(ACPID_SOURCE)) - -$(ACPID_DIR)/.unpacked: $(DL_DIR)/$(ACPID_SOURCE) - $(ZCAT) $(DL_DIR)/$(ACPID_SOURCE) | tar -C $(BUILD_DIR) -xvf - - toolchain/patch-kernel.sh $(ACPID_DIR) package/acpid/ acpid-$(ACPID_VERSION)\*.patch - touch $(ACPID_DIR)/.unpacked - -$(ACPID_DIR)/acpid: $(ACPID_DIR)/.unpacked - $(MAKE) CC="$(TARGET_CC)" -C $(ACPID_DIR) - $(STRIPCMD) $(STRIP_STRIP_ALL) $(ACPID_DIR)/acpid - $(STRIPCMD) $(STRIP_STRIP_ALL) $(ACPID_DIR)/acpi_listen - touch -c $(ACPID_DIR)/acpid $(ACPID_DIR)/acpi_listen - -$(TARGET_DIR)/usr/sbin/acpid: $(ACPID_DIR)/acpid - cp -a $(ACPID_DIR)/acpid $(TARGET_DIR)/usr/sbin/acpid +ACPID_VERSION = 2.0.6 +ACPID_SOURCE = acpid_$(ACPID_VERSION).orig.tar.gz +ACPID_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/a/acpid + +define ACPID_BUILD_CMDS + $(MAKE) CC="$(TARGET_CC)" -C $(@D) + $(STRIPCMD) $(STRIP_STRIP_ALL) $(@D)/acpid + $(STRIPCMD) $(STRIP_STRIP_ALL) $(@D)/acpi_listen +endef + +define ACPID_INSTALL_TARGET_CMDS + cp -a $(@D)/acpid $(TARGET_DIR)/usr/sbin/acpid + cp -a $(@D)/acpi_listen $(TARGET_DIR)/usr/bin/acpi_listen mkdir -p $(TARGET_DIR)/etc/acpi/events /bin/echo -e "event=button[ /]power\naction=/sbin/poweroff" > $(TARGET_DIR)/etc/acpi/events/powerbtn - touch -c $(TARGET_DIR)/usr/sbin/acpid - -acpid: $(TARGET_DIR)/usr/sbin/acpid - -acpid-source: $(DL_DIR)/$(ACPID_SOURCE) +endef -acpid-clean: - -$(MAKE) -C $(ACPID_DIR) clean +define ACPID_CLEAN_CMDS + -$(MAKE) -C $(@D) clean +endef -acpid-dirclean: - rm -rf $(ACPID_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_ACPID),y) -TARGETS+=acpid -endif +$(eval $(call GENTARGETS,package,acpid))
Signature · 1 line
1.7.3
PATCH 2/18 axel: convert to gentargets and bump to 2.4
--- package/axel/axel.mk | 67 ++++++++++++++++++++----------------------------- 1 files changed, 27 insertions(+), 40 deletions(-)
package/axel/axel.mk +27 -40
@@ -3,53 +3,40 @@ # axel # ############################################################# -AXEL_VERSION:=1.1 -AXEL_SOURCE:=axel-$(AXEL_VERSION).tar.gz -AXEL_SITE:=http://alioth.debian.org/frs/download.php/2287 -AXEL_CAT:=$(ZCAT) -AXEL_DIR:=$(BUILD_DIR)/axel-$(AXEL_VERSION) -AXEL_BINARY:=axel -AXEL_TARGET_BINARY:=usr/bin/axel +AXEL_VERSION = 2.4 +AXEL_SOURCE = axel-$(AXEL_VERSION).tar.gz +AXEL_SITE = https://alioth.debian.org/frs/download.php/3015 -$(DL_DIR)/$(AXEL_SOURCE): - $(call DOWNLOAD,$(AXEL_SITE),$(AXEL_SOURCE)) - -axel-source: $(DL_DIR)/$(AXEL_SOURCE) - -$(AXEL_DIR)/.unpacked: $(DL_DIR)/$(AXEL_SOURCE) - $(AXEL_CAT) $(DL_DIR)/$(AXEL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - #toolchain/patch-kernel.sh $(AXEL_DIR) package/axel axel\*.patch - touch $@ +ifneq ($(BR2_ENABLE_LOCALE),y) +AXEL_DISABLE_I18N=--i18n=0 +endif -$(AXEL_DIR)/Makefile.settings: $(AXEL_DIR)/.unpacked - (cd $(AXEL_DIR); \ - ./configure --i18n=0 --prefix=/usr \ +define AXEL_CONFIGURE_CMDS + (cd $(@D); \ + ./configure \ + --prefix=/usr \ + $(AXEL_DISABLE_I18N) \ ) - touch $@ +endef -$(AXEL_DIR)/$(AXEL_BINARY): $(AXEL_DIR)/Makefile.settings - $(MAKE) CC="$(TARGET_CC)" STRIP="$(TARGET_STRIP)" -C $(AXEL_DIR) +define AXEL_BUILD_CMDS + $(MAKE) CC="$(TARGET_CC)" STRIP="$(TARGET_STRIP)" -C $(@D) +endef -$(TARGET_DIR)/$(AXEL_TARGET_BINARY): $(AXEL_DIR)/$(AXEL_BINARY) - $(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) install-bin ifeq ($(BR2_HAVE_DOCUMENTATION),y) - $(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) install-man +define AXEL_INSTALL_DOCUMENTATION + $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install-man +endef endif -axel: $(TARGET_DIR)/$(AXEL_TARGET_BINARY) +define AXEL_INSTALL_TARGET_CMDS + $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install-bin + $(AXEL_INSTALL_DOCUMENTATION) +endef -axel-clean: - $(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) uninstall - -$(MAKE) -C $(AXEL_DIR) clean +define AXEL_CLEAN_CMDS + $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) uninstall + -$(MAKE) -C $(@D) clean +endef -axel-dirclean: - rm -rf $(AXEL_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_AXEL),y) -TARGETS+=axel -endif +$(eval $(call GENTARGETS,package,axel))
Signature · 1 line
1.7.3
PATCH 2/18 axel: convert to gentargets and bump to 2.4
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Signed-off-by: Martin Banky <[email protected]>
Thanks, committed with small tweaks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/18 boa: convert to gentargets
In reply to Martin Banky--- package/boa/boa.mk | 61 ++++++++++++++------------------------------------- 1 files changed, 17 insertions(+), 44 deletions(-)
package/boa/boa.mk +17 -44
@@ -3,33 +3,19 @@ # boa # ############################################################# +BOA_VERSION = 0.94.14rc21 +BOA_SOURCE = boa-$(BOA_VERSION).tar.gz +BOA_SITE = http://www.boa.org/ +BOA_WORKDIR = $(BUILD_DIR)/boa_workdir -BOA_VERSION=0.94.14rc21 - -# Don't alter below this line unless you (think) you know -# what you are doing! Danger, Danger! - -BOA_SOURCE=boa-$(BOA_VERSION).tar.gz -BOA_CAT:=$(ZCAT) -BOA_SITE=http://www.boa.org/ -BOA_DIR=$(BUILD_DIR)/boa-$(BOA_VERSION) -BOA_WORKDIR=$(BUILD_DIR)/boa_workdir - -$(DL_DIR)/$(BOA_SOURCE): - $(call DOWNLOAD,$(BOA_SITE),$(BOA_SOURCE)) - -$(BOA_DIR)/.unpacked: $(DL_DIR)/$(BOA_SOURCE) - $(BOA_CAT) $(DL_DIR)/$(BOA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $(BOA_DIR)/.unpacked - -$(BOA_WORKDIR)/Makefile: $(BOA_DIR)/.unpacked +define BOA_CONFIGURE_CMDS rm -f $(BOA_WORKDIR)/Makefile mkdir -p $(BOA_WORKDIR) #CONFIG_SITE=package/boa/boa-config.site-$(ARCH) - (cd $(BOA_WORKDIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ + (cd $(BOA_WORKDIR); \ $(TARGET_CONFIGURE_ARGS) \ - $(BOA_DIR)/configure $(QUIET) \ + $(TARGET_CONFIGURE_OPTS) \ + $(@D)/configure $(QUIET) \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \
@@ -46,14 +32,14 @@ $(BOA_WORKDIR)/Makefile: $(BOA_DIR)/.unpacked --infodir=/usr/info \ $(DISABLE_NLS) \ ) - touch $(BOA_WORKDIR)/Makefile +endef -$(BOA_WORKDIR)/src/boa $(BOA_WORKDIR)/src/boa_indexer: $(BOA_WORKDIR)/Makefile - rm -f $@ +define BOA_BUILD_CMDS + rm -f $(BOA_WORKDIR)/src/boa $(MAKE) -C $(BOA_WORKDIR) +endef -$(BOA_WORKDIR)/.installed: $(BOA_WORKDIR)/src/boa $(BOA_WORKDIR)/src/boa_indexer - mkdir -p $(TARGET_DIR)/usr/sbin +define BOA_INSTALL_TARGET_CMDS cp -f $(BOA_WORKDIR)/src/boa $(TARGET_DIR)/usr/sbin/boa mkdir -p $(TARGET_DIR)/usr/lib/boa cp -f $(BOA_WORKDIR)/src/boa_indexer $(TARGET_DIR)/usr/lib/boa/boa_indexer
@@ -61,26 +47,13 @@ $(BOA_WORKDIR)/.installed: $(BOA_WORKDIR)/src/boa $(BOA_WORKDIR)/src/boa_indexer cp -f package/boa/boa.conf $(TARGET_DIR)/etc/boa cp -f package/boa/mime.types $(TARGET_DIR)/etc/mime.types $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/sbin/boa $(TARGET_DIR)/usr/lib/boa/boa_indexer - touch $(BOA_WORKDIR)/.installed +endef -boa: $(BOA_WORKDIR)/.installed - -boa-source: $(DL_DIR)/$(BOA_SOURCE) - -boa-clean: +define BOA_CLEAN_CMDS -$(MAKE) -C $(BOA_WORKDIR) clean rm -rf $(TARGET_DIR)/usr/sbin/boa \ $(TARGET_DIR)/usr/lib/boa/boa_indexer \ $(TARGET_DIR)/etc/mime.types $(TARGET_DIR)/etc/boa +endef -boa-dirclean: - rm -rf $(BOA_DIR) $(BOA_WORKDIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_BOA),y) -TARGETS+=boa -endif +$(eval $(call GENTARGETS,package,boa))
Signature · 1 line
1.7.3
PATCH 3/18 boa: convert to gentargets
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Signed-off-by: Martin Banky <[email protected]>
Thanks, but I think it makes more sense to convert to autotargets, so I did that instead.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 4/18 bsdiff: convert to gentargets
In reply to Martin Banky--- package/bsdiff/bsdiff.mk | 51 +++++++++++++-------------------------------- 1 files changed, 15 insertions(+), 36 deletions(-)
package/bsdiff/bsdiff.mk +15 -36
@@ -3,23 +3,13 @@ # bsdiff # ############################################################# -BSDIFF_VERSION:=4.3 -BSDIFF_SOURCE:=bsdiff-$(BSDIFF_VERSION).tar.gz -BSDIFF_SITE:=http://www.daemonology.net/bsdiff -BSDIFF_DIR:=$(BUILD_DIR)/bsdiff-$(BSDIFF_VERSION) -BSDIFF_BINARY:=bsdiff -BSDIFF_TARGET_BINARY:=usr/bin/bsdiff -BSDIFF_ZCAT=$(ZCAT) +BSDIFF_VERSION = 4.3 +BSDIFF_SOURCE = bsdiff-$(BSDIFF_VERSION).tar.gz +BSDIFF_SITE = http://www.daemonology.net/bsdiff +BSDIFF_DEPENDENCIES = bzip2 -$(DL_DIR)/$(BSDIFF_SOURCE): - $(call DOWNLOAD,$(BSDIFF_SITE),$(BSDIFF_SOURCE)) - -$(BSDIFF_DIR)/.source: $(DL_DIR)/$(BSDIFF_SOURCE) - $(BSDIFF_ZCAT) $(DL_DIR)/$(BSDIFF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $(BSDIFF_DIR)/.source - -$(BSDIFF_DIR)/$(BSDIFF_BINARY): $(BSDIFF_DIR)/.source - (cd $(BSDIFF_DIR); \ +define BSDIFF_BUILD_CMDS + (cd $(@D); \ $(TARGET_CONFIGURE_ARGS) \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CC) -L $(STAGING_DIR)/lib -lbz2 \
@@ -28,27 +18,16 @@ $(BSDIFF_DIR)/$(BSDIFF_BINARY): $(BSDIFF_DIR)/.source $(TARGET_CC) -L $(STAGING_DIR)/lib -lbz2 \ $(TARGET_CFLAGS) bspatch.c -o bspatch; \ ) +endef -$(TARGET_DIR)/$(BSDIFF_TARGET_BINARY): $(BSDIFF_DIR)/$(BSDIFF_BINARY) - cp -dpf $(BSDIFF_DIR)/bsdiff $(TARGET_DIR)/usr/bin/. - cp -dpf $(BSDIFF_DIR)/bspatch $(TARGET_DIR)/usr/bin/. - -bsdiff: bzip2 $(TARGET_DIR)/$(BSDIFF_TARGET_BINARY) +define BSDIFF_INSTALL_TARGET_CMDS + cp -dpf $(@D)/bsdiff $(TARGET_DIR)/usr/bin/bsdiff + cp -dpf $(@D)/bspatch $(TARGET_DIR)/usr/bin/bspatch +endef -bsdiff-source: $(DL_DIR)/$(BSDIFF_SOURCE) - -bsdiff-clean: +define BSDIFF_CLEAN_CMDS -rm $(TARGET_DIR)/usr/bin/{bsdiff,bspatch} - -rm $(BSDIFF_DIR)/{bsdiff,bspatch} - -bsdiff-dirclean: - rm -rf $(BSDIFF_DIR) + -rm $(@D)/{bsdiff,bspatch} +endef -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_BSDIFF),y) -TARGETS+=bsdiff -endif +$(eval $(call GENTARGETS,package,bsdiff))
Signature · 1 line
1.7.3
PATCH 4/18 bsdiff: convert to gentargets
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Signed-off-by: Martin Banky <[email protected]>
Thanks, committed with minor tweaks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 5/18 boa: convert to autotargets
In reply to Martin Banky--- package/boa/boa.mk | 38 +++----------------------------------- 1 files changed, 3 insertions(+), 35 deletions(-)
package/boa/boa.mk +3 -35
@@ -6,43 +6,11 @@ BOA_VERSION = 0.94.14rc21 BOA_SOURCE = boa-$(BOA_VERSION).tar.gz BOA_SITE = http://www.boa.org/ -BOA_WORKDIR = $(BUILD_DIR)/boa_workdir - -define BOA_CONFIGURE_CMDS - rm -f $(BOA_WORKDIR)/Makefile - mkdir -p $(BOA_WORKDIR) - #CONFIG_SITE=package/boa/boa-config.site-$(ARCH) - (cd $(BOA_WORKDIR); \ - $(TARGET_CONFIGURE_ARGS) \ - $(TARGET_CONFIGURE_OPTS) \ - $(@D)/configure $(QUIET) \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libdir=/lib \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - $(DISABLE_NLS) \ - ) -endef - -define BOA_BUILD_CMDS - rm -f $(BOA_WORKDIR)/src/boa - $(MAKE) -C $(BOA_WORKDIR) -endef define BOA_INSTALL_TARGET_CMDS - cp -f $(BOA_WORKDIR)/src/boa $(TARGET_DIR)/usr/sbin/boa + cp -f $(@D)/src/boa $(TARGET_DIR)/usr/sbin/boa mkdir -p $(TARGET_DIR)/usr/lib/boa - cp -f $(BOA_WORKDIR)/src/boa_indexer $(TARGET_DIR)/usr/lib/boa/boa_indexer + cp -f $(@D)/src/boa_indexer $(TARGET_DIR)/usr/lib/boa/boa_indexer mkdir -p $(TARGET_DIR)/etc/boa cp -f package/boa/boa.conf $(TARGET_DIR)/etc/boa cp -f package/boa/mime.types $(TARGET_DIR)/etc/mime.types
@@ -56,4 +24,4 @@ define BOA_CLEAN_CMDS $(TARGET_DIR)/etc/mime.types $(TARGET_DIR)/etc/boa endef -$(eval $(call GENTARGETS,package,boa)) +$(eval $(call AUTOTARGETS,package,boa))
Signature · 1 line
1.7.3
PATCH 5/18 boa: convert to autotargets
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Signed-off-by: Martin Banky <[email protected]> Martin> ---
Martin> package/boa/boa.mk | 38 +++-----------------------------------
Ahh, missed this one - Would probably have made more sense if you had merged it with the gentargets one.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 5/18 boa: convert to autotargets
Peter,
Sorry, I missed that when I was putting the patch set together. I meant
to merge the two, when I was cherry picking them into a new branch. It was the end of my night when I put this together. One question, does the stripping happen automatically for gentargets? I was under the impression that you had to specify it. I'm still trying to get a grasp on all the different things that happen behind the scenes.
Martin
Quoted 4 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Signed-off-by: Martin Banky <[email protected]> Martin> ---
Quoted 8 lines
Martin> package/boa/boa.mk | 38 +++-----------------------------------Ahh, missed this one - Would probably have made more sense if you had merged it with the gentargets one.
--
Bye, Peter Korsgaard
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100926/f4af7583/attachment.html>
PATCH 5/18 boa: convert to autotargets
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Peter,
Martin> ???? Sorry, I missed that when I was putting the patch set together. I meant to Martin> merge the two, when I was cherry picking them into a new branch. It was the end Martin> of my night when I put this together.
No problem.
Martin> One question, does the stripping happen automatically for Martin> gentargets? I was under the impression that you had to specify Martin> it. I'm still trying to get a grasp on all the different things Martin> that happen behind the scenes.
Yes, it happens globally just before building the filesystems in the toplevel Makefile:
target-finalize:
ifeq ($(BR2_HAVE_DEVFILES),y)
( scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) ) else rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/aclocal find $(TARGET_DIR)/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f find $(TARGET_DIR)/usr/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f endif ifneq ($(BR2_PACKAGE_GDB),y) rm -rf $(TARGET_DIR)/usr/share/gdb endif ifneq ($(BR2_HAVE_DOCUMENTATION),y) rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/man rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/share/info rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc rm -rf $(TARGET_DIR)/usr/share/gtk-doc endif find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true
Signature · 1 line
Bye, Peter Korsgaard
PATCH 6/18 cvs: convert to autotargets
In reply to Martin Banky--- package/cvs/cvs.mk | 92 +++++++++++++++------------------------------------ 1 files changed, 27 insertions(+), 65 deletions(-)
package/cvs/cvs.mk +27 -65
@@ -3,16 +3,17 @@ # cvs # ############################################################# -CVS_VERSION:=1.12.13 -CVS_SOURCE:=cvs_$(CVS_VERSION).orig.tar.gz -CVS_PATCH:=cvs_$(CVS_VERSION)-8.diff.gz -CVS_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/c/cvs/ -CVS_DIR:=$(BUILD_DIR)/cvs-$(CVS_VERSION) -CVS_CAT:=$(ZCAT) -CVS_BINARY:=src/cvs -CVS_TARGET_BINARY:=usr/bin/cvs +CVS_VERSION = 1.12.13 +CVS_SOURCE = cvs_$(CVS_VERSION).orig.tar.gz +CVS_PATCH = cvs_$(CVS_VERSION)-12.diff.gz +CVS_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/c/cvs/ +CVS_DEPENDENCIES = ncurses +CVS_BINARY = src/cvs +CVS_TARGET_BINARY = usr/bin/cvs -CVS_CONFIGURE_ARGS:=--disable-old-info-format-support +CVS_CONF_ENV = cvs_cv_func_printf_ptr=yes + +CVS_CONFIGURE_ARGS=--disable-old-info-format-support ifeq ($(BR2_PACKAGE_CVS_SERVER),y) CVS_CONFIGURE_ARGS+=--enable-server else
@@ -22,73 +23,34 @@ ifeq ($(BR2_PACKAGE_ZLIB),y) CVS_CONFIGURE_ARGS+=--with-external-zlib endif -$(DL_DIR)/$(CVS_SOURCE): - $(call DOWNLOAD,$(CVS_SITE),$(CVS_SOURCE)) +CVS_CONF_OPT = $(CVS_CONFIGURE_ARGS) -ifneq ($(CVS_PATCH),) -CVS_PATCH_FILE=$(DL_DIR)/$(CVS_PATCH) -$(CVS_PATCH_FILE): - $(call DOWNLOAD,$(CVS_SITE),$(CVS_PATCH)) -endif -cvs-source: $(DL_DIR)/$(CVS_SOURCE) $(CVS_PATCH_FILE) +define CVS_BZIP_UNPACK + $(BZCAT) $(@D)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + rm -f $(@D)/cvs-$(CVS_VERSION).tar.bz2 +endef + +CVS_POST_PATCH_HOOKS += CVS_BZIP_UNPACK -$(CVS_DIR)/.unpacked: $(DL_DIR)/$(CVS_SOURCE) $(CVS_PATCH_FILE) - -mkdir $(CVS_DIR) - $(CVS_CAT) $(DL_DIR)/$(CVS_SOURCE) | tar -C $(CVS_DIR) $(TAR_OPTIONS) - - $(BZCAT) $(CVS_DIR)/cvs-$(CVS_VERSION)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - rm -rf $(CVS_DIR)/cvs-$(CVS_VERSION) - $(CONFIG_UPDATE) $(CVS_DIR) - $(CONFIG_UPDATE) $(CVS_DIR)/build-aux - toolchain/patch-kernel.sh $(CVS_DIR) package/cvs \*$(CVS_VERSION)\*.patch ifneq ($(CVS_PATCH),) - toolchain/patch-kernel.sh $(CVS_DIR) $(DL_DIR) $(CVS_PATCH) - if [ -d $(CVS_DIR)/debian/patches ]; then \ - (cd $(CVS_DIR)/debian/patches && for i in *; \ +define CVS_DEBIAN_PATCHES + if [ -d $(@D)/debian/patches ]; then \ + (cd $(@D)/debian/patches && for i in *; \ do $(SED) 's,^\+\+\+ .*cvs-$(CVS_VERSION)/,+++ cvs-$(CVS_VERSION)/,' $$i; \ done; \ ); \ - toolchain/patch-kernel.sh $(CVS_DIR) $(CVS_DIR)/debian/patches \*; \ + toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*; \ fi +endef endif - touch $@ - -$(CVS_DIR)/.configured: $(CVS_DIR)/.unpacked - (cd $(CVS_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - cvs_cv_func_printf_ptr=yes \ - ./configure $(QUIET) \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - $(CVS_CONFIGURE_ARGS) \ - ) - touch $@ -$(CVS_DIR)/$(CVS_BINARY): $(CVS_DIR)/.configured - $(MAKE) -C $(CVS_DIR) +CVS_POST_PATCH_HOOKS += CVS_DEBIAN_PATCHES -$(TARGET_DIR)/$(CVS_TARGET_BINARY): $(CVS_DIR)/$(CVS_BINARY) - install -D $(CVS_DIR)/$(CVS_BINARY) $(TARGET_DIR)/$(CVS_TARGET_BINARY) +define CVS_INSTALL_TARGET_CMDS + install -D $(@D)/$(CVS_BINARY) $(TARGET_DIR)/$(CVS_TARGET_BINARY) $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(CVS_TARGET_BINARY) +endef -cvs: ncurses $(TARGET_DIR)/$(CVS_TARGET_BINARY) - -cvs-clean: - -$(MAKE) -C $(CVS_DIR) clean - rm -f $(TARGET_DIR)/$(CVS_TARGET_BINARY) +$(eval $(call AUTOTARGETS,package,cvs)) -cvs-dirclean: - rm -rf $(CVS_DIR) -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_CVS),y) -TARGETS+=cvs -endif
Signature · 1 line
1.7.3
PATCH 6/18 cvs: convert to autotargets
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Signed-off-by: Martin Banky <[email protected]>
Committed with minor tweaks, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 7/18 dosfstools: convert to gentargets and bump to 3.0.10
In reply to Martin Banky--- package/dosfstools/dosfstools.mk | 104 +++++++++++-------------------------- 1 files changed, 31 insertions(+), 73 deletions(-)
package/dosfstools/dosfstools.mk +31 -73
@@ -3,76 +3,34 @@ # dosfstools # ############################################################# -DOSFSTOOLS_VERSION:=3.0.3 -DOSFSTOOLS_SOURCE:=dosfstools-$(DOSFSTOOLS_VERSION).tar.gz -DOSFSTOOLS_SITE:=http://www.daniel-baumann.ch/software/dosfstools -DOSFSTOOLS_DIR:=$(BUILD_DIR)/dosfstools-$(DOSFSTOOLS_VERSION) -DOSFSTOOLS_CAT:=$(ZCAT) -MKDOSFS_BINARY:=mkdosfs -MKDOSFS_TARGET_BINARY:=sbin/mkdosfs -DOSFSCK_BINARY:=dosfsck -DOSFSCK_TARGET_BINARY:=sbin/dosfsck -DOSFSLABEL_BINARY:=dosfslabel -DOSFSLABEL_TARGET_BINARY:=sbin/dosfslabel - -$(DL_DIR)/$(DOSFSTOOLS_SOURCE): - $(call DOWNLOAD,$(DOSFSTOOLS_SITE),$(DOSFSTOOLS_SOURCE)) - -dosfstools-source: $(DL_DIR)/$(DOSFSTOOLS_SOURCE) - -$(DOSFSTOOLS_DIR)/.unpacked: $(DL_DIR)/$(DOSFSTOOLS_SOURCE) $(wildcard local/dosfstools/dosfstools*.patch) - $(DOSFSTOOLS_CAT) $(DL_DIR)/$(DOSFSTOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(DOSFSTOOLS_DIR) package/dosfstools/ dosfstools\*.patch - touch $(DOSFSTOOLS_DIR)/.unpacked - -$(DOSFSTOOLS_DIR)/.built : $(DOSFSTOOLS_DIR)/.unpacked - $(MAKE) CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" -C $(DOSFSTOOLS_DIR) - $(STRIPCMD) $(DOSFSTOOLS_DIR)/$(MKDOSFS_BINARY) - $(STRIPCMD) $(DOSFSTOOLS_DIR)/$(DOSFSCK_BINARY) - $(STRIPCMD) $(DOSFSTOOLS_DIR)/$(DOSFSLABEL_BINARY) - touch $@ - -$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY): $(DOSFSTOOLS_DIR)/.built - cp -a $(DOSFSTOOLS_DIR)/$(MKDOSFS_BINARY) $@ - touch -c $@ - -$(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY): $(DOSFSTOOLS_DIR)/.built - cp -a $(DOSFSTOOLS_DIR)/$(DOSFSCK_BINARY) $@ - touch -c $@ - -$(TARGET_DIR)/$(DOSFSLABEL_TARGET_BINARY): $(DOSFSTOOLS_DIR)/.built - cp -a $(DOSFSTOOLS_DIR)/$(DOSFSLABEL_BINARY) $@ - touch -c $@ - -DOSFSTOOLS= -ifeq ($(BR2_PACKAGE_DOSFSTOOLS_MKDOSFS),y) -DOSFSTOOLS+=$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY) -endif - -ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSCK),y) -DOSFSTOOLS+=$(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY) -endif - -ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL),y) -DOSFSTOOLS+=$(TARGET_DIR)/$(DOSFSLABEL_TARGET_BINARY) -endif - -dosfstools: $(DOSFSTOOLS) - -dosfstools-clean: - rm -f $(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY) - rm -f $(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY) - rm -f $(TARGET_DIR)/$(DOSFSLABEL_TARGET_BINARY) - -$(MAKE) -C $(DOSFSTOOLS_DIR) clean - -dosfstools-dirclean: - rm -rf $(DOSFSTOOLS_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_DOSFSTOOLS),y) -TARGETS+=dosfstools -endif +DOSFSTOOLS_VERSION = 3.0.10 +DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.gz +DOSFSTOOLS_SITE = http://www.daniel-baumann.ch/software/dosfstools +MKDOSFS_BINARY = mkdosfs +DOSFSCK_BINARY = dosfsck +DOSFSLABEL_BINARY = dosfslabel + +define DOSFSTOOLS_BUILD_CMDS + $(MAKE) CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" -C $(@D) + $(STRIPCMD) $(@D)/$(MKDOSFS_BINARY) + $(STRIPCMD) $(@D)/$(DOSFSCK_BINARY) + $(STRIPCMD) $(@D)/$(DOSFSLABEL_BINARY) +endef + +DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_MKDOSFS)+=$(MKDOSFS_BINARY) +DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_DOSFSCK)+=$(DOSFSCK_BINARY) +DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL)+=$(DOSFSLABEL_BINARY) + +define DOSFSTOOLS_INSTALL_TARGET_CMDS + test -z "$(DOSFSTOOLS_INSTALL_BIN_FILES_y)" || \ + install -m 755 $(addprefix $(@D)/,$(DOSFSTOOLS_INSTALL_BIN_FILES_y)) $(TARGET_DIR)/sbin/ +endef + +define DOSFSTOOLS_CLEAN_CMDS + rm -f $(TARGET_DIR)/sbin/$(MKDOSFS_BINARY) + rm -f $(TARGET_DIR)/sbin/$(DOSFSCK_BINARY) + rm -f $(TARGET_DIR)/sbin/$(DOSFSLABEL_BINARY) + -$(MAKE) -C $(@D) clean +endef + +$(eval $(call GENTARGETS,package,dosfstools))
Signature · 1 line
1.7.3
PATCH 7/18 dosfstools: convert to gentargets and bump to 3.0.10
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Signed-off-by: Martin Banky <[email protected]>
Committed with minor tweaks, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 8/18 ezxml: convert to gentargets
In reply to Martin Banky--- package/ezxml/ezxml.mk | 52 +++++++++++++---------------------------------- 1 files changed, 15 insertions(+), 37 deletions(-)
package/ezxml/ezxml.mk +15 -37
@@ -3,45 +3,23 @@ # ezxml # ############################################################# +EZXML_VERSION = 0.8.6 +EZXML_SOURCE = ezxml-$(EZXML_VERSION).tar.gz +EZXML_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ezxml/ +EZXML_INSTALL_STAGING=YES -EZXML_VERSION:=0.8.6 -EZXML_SOURCE:=ezxml-$(EZXML_VERSION).tar.gz -EZXML_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ezxml/ -EZXML_DIR:=$(BUILD_DIR)/ezxml - -$(DL_DIR)/$(EZXML_SOURCE): - $(call DOWNLOAD,$(EZXML_SITE),$(EZXML_SOURCE)) - -$(EZXML_DIR)/.unpacked: $(DL_DIR)/$(EZXML_SOURCE) - $(ZCAT) $(DL_DIR)/$(EZXML_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(EZXML_DIR) package/ezxml/ ezxml-$(EZXML_VERSION)\*.patch - touch $@ - -$(EZXML_DIR)/.configured: $(EZXML_DIR)/.unpacked - touch $@ - -$(EZXML_DIR)/libezxml.a: $(EZXML_DIR)/.configured +define EZXML_BUILD_CMDS $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" AR=$(TARGET_AR) \ - -f GNUmakefile -C $(EZXML_DIR) - -$(STAGING_DIR)/usr/lib/libezxml.a: $(EZXML_DIR)/libezxml.a - cp $(EZXML_DIR)/ezxml.h $(STAGING_DIR)/usr/include - cp $(EZXML_DIR)/libezxml.a $(STAGING_DIR)/usr/lib + -f GNUmakefile -C $(@D) +endef -ezxml: $(STAGING_DIR)/usr/lib/libezxml.a +define EZXML_INSTALL_STAGING_CMDS + cp $(@D)/ezxml.h $(STAGING_DIR)/usr/include + cp $(@D)/libezxml.a $(STAGING_DIR)/usr/lib +endef -ezxml-source: $(DL_DIR)/$(EZXML_SOURCE) +define EZXML_CLEAN_CMDS + -$(MAKE) -C $(@D) -f GNUmakefile clean +endef -ezxml-clean: - -$(MAKE) -C $(EZXML_DIR) -f GNUmakefile clean - -ezxml-dirclean: - rm -rf $(EZXML_DIR) -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_EZXML),y) -TARGETS+=ezxml -endif +$(eval $(call GENTARGETS,package,ezxml))
Signature · 1 line
1.7.3
PATCH 8/18 ezxml: convert to gentargets
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Signed-off-by: Martin Banky <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 9/18 fbset: convert to gentargets
In reply to Martin Banky--- package/fbset/fbset.mk | 59 +++++++++++++---------------------------------- 1 files changed, 17 insertions(+), 42 deletions(-)
package/fbset/fbset.mk +17 -42
@@ -3,49 +3,24 @@ # fbset # ############################################################# -FBSET_VERSION:=2.1 -FBSET_SOURCE:=fbset-$(FBSET_VERSION).tar.gz -FBSET_SITE:=http://users.telenet.be/geertu/Linux/fbdev -FBSET_DIR:=$(BUILD_DIR)/fbset-$(FBSET_VERSION) -FBSET_CAT:=$(ZCAT) -FBSET_BINARY:=fbset -FBSET_TARGET_BINARY:=usr/sbin/$(FBSET_BINARY) - -$(DL_DIR)/$(FBSET_SOURCE): - $(call DOWNLOAD,$(FBSET_SITE),$(FBSET_SOURCE)) - -$(FBSET_DIR)/.unpacked: $(DL_DIR)/$(FBSET_SOURCE) - $(FBSET_CAT) $(DL_DIR)/$(FBSET_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(FBSET_DIR) package/fbset/ \ - fbset-$(FBSET_VERSION)\*.patch \ - fbset-$(FBSET_VERSION)\*.patch.$(ARCH) - touch $@ - -$(FBSET_DIR)/$(FBSET_BINARY): $(FBSET_DIR)/.unpacked - $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(FBSET_DIR) - touch -c $@ - -$(TARGET_DIR)/$(FBSET_TARGET_BINARY): $(FBSET_DIR)/$(FBSET_BINARY) - $(INSTALL) -m 755 $(FBSET_DIR)/$(FBSET_BINARY) $(TARGET_DIR)/$(FBSET_TARGET_BINARY) +FBSET_VERSION = 2.1 +FBSET_SOURCE = fbset-$(FBSET_VERSION).tar.gz +FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev +FBSET_BINARY = fbset +FBSET_TARGET_BINARY = usr/sbin/$(FBSET_BINARY) + +define FBSET_BUILD_CMDS + $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) +endef + +define FBSET_INSTALL_TARGET_CMDS + $(INSTALL) -m 755 $(@D)/$(FBSET_BINARY) $(TARGET_DIR)/$(FBSET_TARGET_BINARY) -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBSET_TARGET_BINARY) - touch -c $@ - -fbset: $(TARGET_DIR)/$(FBSET_TARGET_BINARY) - -fbset-source: $(DL_DIR)/$(FBSET_SOURCE) +endef -fbset-clean: +define FBSET_CLEAN_CMDS rm -f $(TARGET_DIR)/$(FBSET_TARGET_BINARY) - -$(MAKE) -C $(FBSET_DIR) clean + -$(MAKE) -C $(@D) clean +endef -fbset-dirclean: - rm -rf $(FBSET_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_FBSET),y) -TARGETS+=fbset -endif +$(eval $(call GENTARGETS,package,fbset))
Signature · 1 line
1.7.3
PATCH 9/18 fbset: convert to gentargets
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Signed-off-by: Martin Banky <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 10/18 fconfig: convert to gentargets and bump to 20080329
In reply to Martin Banky--- package/fconfig/fconfig-listmode.patch | 177 -------------------------------- package/fconfig/fconfig.mk | 55 +++------- 2 files changed, 17 insertions(+), 215 deletions(-) delete mode 100644 package/fconfig/fconfig-listmode.patch
package/fconfig/fconfig-listmode.patch deleted +0 -177
@@ -1,177 +0,0 @@ -diff -x.svn -u fconfig/crunchfc.c ../../../snapgear_avila/user/fconfig/crunchfc.c ---- fconfig/crunchfc.c 2006-03-15 01:18:17.000000000 +1100 -+++ ../../../snapgear_avila/user/fconfig/crunchfc.c 2007-09-06 13:48:38.000000000 +1000 -@@ -320,6 +320,48 @@ - } - - /* -+ * List known keys. -+ */ -+int8_t list_keys(struct config_data *data) -+{ -+ struct fconfig_key key; -+ uint32_t len = data->reallen; -+ uint8_t *keyptr = NULL; -+ uint8_t *ptr = data->buf+8; -+ uint8_t *ptrend = data->buf+len-9; -+ printer_t printer; -+ -+ while (ptr < ptrend-4) { -+ keyptr = ptr; -+ ptr = get_key(ptr, &key); -+ if (ptr == NULL) { -+ MESSAGE(VERB_LOW, "Error in structure\n"); -+ return -1; -+ } -+ if (ptr > ptrend) { -+ MESSAGE(VERB_LOW, "Parser went out of struct!\n"); -+ return -1; -+ } -+ -+ if ((key.type == 0) && (key.namelen==0)) { -+ MESSAGE(VERB_NORMAL, "EOF reached - key not found\n"); -+ return -1; -+ } -+ -+ print_key(&key, VERB_HIGH, data->swab); -+ -+ printf("%s: ", key.keyname); -+ printer = TYPE_PRINTER(key.type); -+ if (printer == NULL) { -+ MESSAGE(VERB_LOW, "Printer missing for type %d\n", key.type); -+ return -1; -+ } -+ printer(key.dataval); -+ printf("\n"); -+ } -+} -+ -+/* - * Find a key with given nickname, check its type and set value - * Assumes that verify_fconfig() has been called on 'data' before. - */ -diff -x.svn -u fconfig/crunchfc.h ../../../snapgear_avila/user/fconfig/crunchfc.h ---- fconfig/crunchfc.h 2006-03-15 01:18:17.000000000 +1100 -+++ ../../../snapgear_avila/user/fconfig/crunchfc.h 2007-09-06 13:48:38.000000000 +1000 -@@ -31,6 +31,7 @@ - int8_t verify_fconfig(struct config_data *data); - int8_t get_key_value(struct config_data *data, uint8_t *nickname); - int8_t set_key_value(struct config_data *data, uint8_t *nickname, void *value); -+int8_t list_keys(struct config_data *data); - void recalculate_crc(struct config_data *data); - - #endif //CRUNCHFC_H -diff -x.svn -u fconfig/fconfig.c ../../../snapgear_avila/user/fconfig/fconfig.c ---- fconfig/fconfig.c 2006-03-15 01:18:18.000000000 +1100 -+++ ../../../snapgear_avila/user/fconfig/fconfig.c 2007-09-06 13:48:38.000000000 +1000 -@@ -35,8 +35,9 @@ - #include <string.h> - #include <unistd.h> - #include <fcntl.h> -+#include <getopt.h> - - #include "debug.h" - #include "ftypes.h" - #include "crunchfc.h" - -@@ -72,7 +73,7 @@ - } - - fputs("Read or write Redboot configuration\n", stdout); -- fputs("usage: fconfig [-r|-w] -d dev -n nickname -x value\n", stdout); -+ fputs("usage: fconfig [-r|-w|-l] -d dev -n nickname -x value\n", stdout); - fputs("'dev' may be a char device, block device or a file\n", stdout); - fputs("Supported types: \n", stdout); - for (i = 0; i < NUM_TYPES; i++) { -@@ -181,7 +182,33 @@ - close_fconfig_handle(data); - return 0; - --exit_fail: -+exit_fail: -+ close_fconfig_handle(data); -+ return 1; -+} -+ -+/* -+ * List mode of operation: list parameter values from the configuration. -+ */ -+static int list_mode(struct config_data *data, uint8_t *device) -+{ -+ if (get_fconfig_handle(data, device, O_RDONLY) == NULL) { -+ MESSAGE(VERB_LOW, "Could not get a config data handle!\n"); -+ return 1; -+ } -+ if (verify_fconfig(data)) { -+ MESSAGE(VERB_LOW, "Config verification failed!\n"); -+ goto exit_fail; -+ } -+ -+ if (list_keys(data)) { -+ goto exit_fail; -+ } -+ -+ close_fconfig_handle(data); -+ return 0; -+ -+exit_fail: - close_fconfig_handle(data); - return 1; - } -@@ -189,6 +216,7 @@ - #define MODE_NONE 0 - #define MODE_WRITE 1 - #define MODE_READ 2 -+#define MODE_LIST 3 - - /* - * main(). ...nuff said. -@@ -202,14 +230,17 @@ - uint8_t *value = NULL; - uint8_t *device = NULL; - -- while ((c = getopt(argc, argv, "hrwvsd:n:x:")) != -1) { -+ while ((c = getopt(argc, argv, "hrwlvsd:n:x:")) != -1) { - switch (c) { - case 'r': - mode = MODE_READ; - break; -- case 'w': -+ case 'w': - mode = MODE_WRITE; - break; -+ case 'l': -+ mode = MODE_LIST; -+ break; - case 'n': - nickname = optarg; - break; -@@ -240,7 +271,7 @@ - MESSAGE(VERB_NORMAL, "Normal verbosity messages are printed.\n"); - MESSAGE(VERB_HIGH, "High verbosity messages are printed.\n"); - -- if (nickname == NULL) { -+ if (nickname == NULL && mode != MODE_LIST) { - usage(); - exit(1); - } -@@ -251,13 +282,16 @@ - } - - switch (mode) { -- case MODE_WRITE : -+ case MODE_WRITE : - ret = write_mode(&data, device, nickname, value); - break; -- case MODE_READ : -+ case MODE_READ : - ret = read_mode(&data, device, nickname); - break; -- default : -+ case MODE_LIST : -+ ret = list_mode(&data, device); -+ break; -+ default : - MESSAGE(VERB_LOW, "Unknown mode of operation\n"); - usage(); - ret = 1;
package/fconfig/fconfig.mk +17 -38
65 lines not on this page · raw message
Signature · 1 line
1.7.3
PATCH 10/18 fconfig: convert to gentargets and bump to 20080329
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Signed-off-by: Martin Banky <[email protected]>
Committed with minor tweaks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 11/18 gadgets-test: convert to gentargets
In reply to Martin Banky--- package/gadgetfs-test/gadgetfs-test.mk | 46 +++++++++----------------------- 1 files changed, 13 insertions(+), 33 deletions(-)
package/gadgetfs-test/gadgetfs-test.mk +13 -33
@@ -5,47 +5,27 @@ ############################################################# GADGETFS_TEST_SOURCE=gadgetfs-test.tar.bz2 GADGETFS_TEST_SITE=http://avr32linux.org/twiki/pub/Main/GadgetFsTest/ -GADGETFS_TEST_DIR=$(BUILD_DIR)/gadgetfs-test - -GADGETFS_TEST_MAKEOPTS:=CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" ifeq ($(BR2_PACKAGE_GADGETFS_TEST_USE_AIO),y) -GADGETFS_TEST_MAKEOPTS+=USE_AIO=y +GADGETFS_DEPENDENCIES = libaio endif -$(DL_DIR)/$(GADGETFS_TEST_SOURCE): - $(call DOWNLOAD,$(GADGETFS_TEST_SITE),$(GADGETFS_TEST_SOURCE)) - -$(GADGETFS_TEST_DIR)/.unpacked: $(DL_DIR)/$(GADGETFS_TEST_SOURCE) - $(BZCAT) $(DL_DIR)/$(GADGETFS_TEST_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(GADGETFS_TEST_DIR) package/gadgetfs-test gadgetfs-test\*.patch - touch $@ - -$(GADGETFS_TEST_DIR)/gadgetfs-test: $(GADGETFS_TEST_DIR)/.unpacked - $(MAKE) -C $(GADGETFS_TEST_DIR) $(GADGETFS_TEST_MAKEOPTS) - -$(TARGET_DIR)/usr/bin/gadgetfs-test: $(GADGETFS_TEST_DIR)/gadgetfs-test - $(MAKE) -C $(GADGETFS_TEST_DIR) DESTDIR=$(TARGET_DIR) prefix=/usr install +GADGETFS_TEST_MAKEOPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" ifeq ($(BR2_PACKAGE_GADGETFS_TEST_USE_AIO),y) -gadgetfs-test: libaio $(TARGET_DIR)/usr/bin/gadgetfs-test -else -gadgetfs-test: $(TARGET_DIR)/usr/bin/gadgetfs-test +GADGETFS_TEST_MAKEOPTS+=USE_AIO=y endif -gadgetfs-test-source: $(DL_DIR)/$(GADGETFS_TEST_SOURCE) +define GADGETFS_TEST_BUILD_CMDS + $(MAKE) -C $(@D) $(GADGETFS_TEST_MAKEOPTS) +endef -gadgetfs-test-clean: - -$(MAKE) -C $(GADGETFS_TEST_DIR) $(GADGETFS_TEST_MAKEOPTS) clean +define GADGETFS_TEST_INSTALL_TARGET_CMDS + $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) prefix=/usr install +endef -gadgetfs-test-dirclean: - rm -rf $(GADGETFS_TEST_DIR) +define GADGETFS_TEST_CLEAN_CMDS + -$(MAKE) -C $(@D) $(GADGETFS_TEST_MAKEOPTS) clean +endef -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_GADGETFS_TEST),y) -TARGETS+=gadgetfs-test -endif +$(eval $(call GENTARGETS,package,gadgetfs-test))
Signature · 1 line
1.7.3
PATCH 11/18 gadgets-test: convert to gentargets
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Signed-off-by: Martin Banky <[email protected]>
Committed with minor tweaks, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 12/18 hotplug: convert to gentargets
In reply to Martin BankyThere is one caveat with this, diethotplug-0.5.tar needs to be hosted some place. It's not available anywhere that I can find. It's a custome version written for buildroot.
--- package/hotplug/hotplug.mk | 47 +++++++++++++------------------------------ 1 files changed, 14 insertions(+), 33 deletions(-)
package/hotplug/hotplug.mk +14 -33
@@ -3,43 +3,24 @@ # hotplug support # ############################################################# -HOTPLUG_VERSION:=0.5 -HOTPLUG_SOURCE=package/hotplug/diethotplug-$(HOTPLUG_VERSION).tar -HOTPLUG_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/ -HOTPLUG_DIR=$(BUILD_DIR)/diethotplug-$(HOTPLUG_VERSION) -HOTPLUG_CAT=cat +HOTPLUG_VERSION = 0.5 +HOTPLUG_SOURCE = package/hotplug/diethotplug-$(HOTPLUG_VERSION).tar +HOTPLUG_SITE = $(BR2_KERNEL_MIRROR)linux/utils/kernel/hotplug -$(HOTPLUG_DIR): $(HOTPLUG_SOURCE) - $(HOTPLUG_CAT) $(HOTPLUG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(HOTPLUG_DIR) package/hotplug/ hotplug\*.patch - -$(HOTPLUG_DIR)/hotplug: $(HOTPLUG_DIR) +define HOTPLUG_BUILD_CMDS $(MAKE) CROSS=$(TARGET_CROSS) DEBUG=false KLIBC=false \ KERNEL_INCLUDE_DIR=$(STAGING_DIR)/usr/include \ - TARGET_DIR=$(TARGET_DIR) -C $(HOTPLUG_DIR) - $(STRIPCMD) $(HOTPLUG_DIR)/hotplug - touch -c $(HOTPLUG_DIR)/hotplug - -$(TARGET_DIR)/sbin/hotplug: $(HOTPLUG_DIR)/hotplug - cp $(HOTPLUG_DIR)/hotplug $(TARGET_DIR)/sbin/hotplug - touch -c $(TARGET_DIR)/sbin/hotplug + TARGET_DIR=$(TARGET_DIR) -C $(@D) + $(STRIPCMD) $(@D)/hotplug +endef -hotplug: $(TARGET_DIR)/sbin/hotplug +define HOTPLUG_INSTALL_TARGET_CMDS + cp $(@D)/hotplug $(TARGET_DIR)/sbin/hotplug +endef -hotplug-source: $(HOTPLUG_SOURCE) - -hotplug-clean: +define HOTPLUG_CLEAN_CMDS rm -f $(TARGET_DIR)/sbin/hotplug - -$(MAKE) -C $(HOTPLUG_DIR) clean - -hotplug-dirclean: - rm -rf $(HOTPLUG_DIR) + -$(MAKE) -C $(@D) clean +endef -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_HOTPLUG),y) -TARGETS+=hotplug -endif +$(eval $(call GENTARGETS,package,hotplug))
Signature · 1 line
1.7.3
PATCH 12/18 hotplug: convert to gentargets
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> There is one caveat with this, diethotplug-0.5.tar needs to be hosted some Martin> place. It's not available anywhere that I can find. It's a custome version Martin> written for buildroot.
I think we should just deprecate the package and remove it after 2010.11 instead.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 13/18 hdparm: convert to gentargets and bump to 9.32
In reply to Martin Banky--- package/hdparm/hdparm.mk | 61 +++++++++++++++--------------------------- package/hdparm/hdparm.patch | 12 -------- 2 files changed, 22 insertions(+), 51 deletions(-) delete mode 100644 package/hdparm/hdparm.patch
package/hdparm/hdparm.mk +22 -39
@@ -3,51 +3,34 @@ # hdparm # ############################################################# -HDPARM_VERSION:=7.7 -HDPARM_SOURCE:=hdparm-$(HDPARM_VERSION).tar.gz -HDPARM_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/hdparm -HDPARM_CAT:=$(ZCAT) -HDPARM_DIR:=$(BUILD_DIR)/hdparm-$(HDPARM_VERSION) -HDPARM_BINARY:=hdparm -HDPARM_TARGET_BINARY:=sbin/hdparm - -$(DL_DIR)/$(HDPARM_SOURCE): - $(call DOWNLOAD,$(HDPARM_SITE),$(HDPARM_SOURCE)) - -hdparm-source: $(DL_DIR)/$(HDPARM_SOURCE) - -$(HDPARM_DIR)/.unpacked: $(DL_DIR)/$(HDPARM_SOURCE) - $(HDPARM_CAT) $(DL_DIR)/$(HDPARM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(HDPARM_DIR) package/hdparm \*.patch - touch $@ - -$(HDPARM_DIR)/$(HDPARM_BINARY): $(HDPARM_DIR)/.unpacked - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(HDPARM_DIR) \ +HDPARM_VERSION = 9.32 +HDPARM_SOURCE = hdparm-$(HDPARM_VERSION).tar.gz +HDPARM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/hdparm +HDPARM_BINARY = hdparm +HDPARM_TARGET_BINARY = sbin/hdparm + +define HDPARM_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" +endef -$(TARGET_DIR)/$(HDPARM_TARGET_BINARY): $(HDPARM_DIR)/$(HDPARM_BINARY) - rm -f $(TARGET_DIR)/$(HDPARM_TARGET_BINARY) - $(INSTALL) -D -m 0755 $(HDPARM_DIR)/$(HDPARM_BINARY) $(TARGET_DIR)/$(HDPARM_TARGET_BINARY) ifeq ($(BR2_HAVE_DOCUMENTATION),y) - $(INSTALL) -D $(HDPARM_DIR)/hdparm.8 $(TARGET_DIR)/usr/share/man/man8/hdparm.8 +define HDPARM_INSTALL_DOCUMENTATION + $(INSTALL) -D $(@D)/hdparm.8 $(TARGET_DIR)/usr/share/man/man8/hdparm.8 +endef endif - $(STRIPCMD) $(STRIP_STRIP_ALL) $@ - -hdparm: $(TARGET_DIR)/$(HDPARM_TARGET_BINARY) -hdparm-clean: - -$(MAKE) -C $(HDPARM_DIR) clean +define HDPARM_INSTALL_TARGET_CMDS rm -f $(TARGET_DIR)/$(HDPARM_TARGET_BINARY) + $(INSTALL) -D -m 0755 $(@D)/$(HDPARM_BINARY) $(TARGET_DIR)/$(HDPARM_TARGET_BINARY) + $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(HDPARM_TARGET_BINARY) + $(HDPARM_INSTALL_DOCUMENTATION) +endef -hdparm-dirclean: - rm -rf $(HDPARM_DIR) +define HDPARM_CLEAN_CMDS + -$(MAKE) -C $(@D) clean + rm -f $(TARGET_DIR)/$(HDPARM_TARGET_BINARY) +endef -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_HDPARM),y) -TARGETS+=hdparm -endif +$(eval $(call GENTARGETS,package,hdparm))
package/hdparm/hdparm.patch deleted +0 -12
@@ -1,12 +0,0 @@ -diff -ur hdparm-7.6/Makefile hdparm-7.6-patched/Makefile ---- hdparm-7.6/Makefile 2007-06-07 12:39:24.000000000 -0500 -+++ hdparm-7.6-patched/Makefile 2007-07-19 12:11:03.000000000 -0500 -@@ -28,7 +28,7 @@ - - hdparm: hdparm.h $(OBJS) - $(CC) $(LDFLAGS) -o hdparm $(OBJS) -- strip hdparm -+ $(STRIP) hdparm - - install: all hdparm.8 - if [ ! -z $(DESTDIR) ]; then $(INSTALL_DIR) $(DESTDIR) ; fi
Signature · 1 line
1.7.3
PATCH 13/18 hdparm: convert to gentargets and bump to 9.32
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Signed-off-by: Martin Banky <[email protected]>
Thanks, committed with minor tweaks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 14/18 hwdata: convert to gentargets and bump to 0.230
In reply to Martin Banky--- package/hwdata/hwdata.mk | 54 ++++++++++++---------------------------------- 1 files changed, 14 insertions(+), 40 deletions(-)
package/hwdata/hwdata.mk +14 -40
@@ -3,48 +3,22 @@ # hwdata # ############################################################# -HWDATA_VERSION:=0.191 -HWDATA_SOURCE:=hwdata_$(HWDATA_VERSION).orig.tar.gz -HWDATA_PATCH:=hwdata_$(HWDATA_VERSION)-1.diff.gz -HWDATA_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/h/hwdata/ -HWDATA_CAT:=$(ZCAT) -HWDATA_DIR:=$(BUILD_DIR)/hwdata-$(HWDATA_VERSION) -HWDATA_BINARY:=pci.ids -HWDATA_TARGET_BINARY:=usr/share/hwdata/pci.ids - -$(DL_DIR)/$(HWDATA_SOURCE): - $(call DOWNLOAD,$(HWDATA_SITE),$(HWDATA_SOURCE)) - -$(DL_DIR)/$(HWDATA_PATCH): - $(call DOWNLOAD,$(HWDATA_SITE),$(HWDATA_PATCH)) - -hwdata-source: $(DL_DIR)/$(HWDATA_SOURCE) $(DL_DIR)/$(HWDATA_PATCH) - -$(HWDATA_DIR)/.unpacked: $(DL_DIR)/$(HWDATA_SOURCE) $(DL_DIR)/$(HWDATA_PATCH) - $(HWDATA_CAT) $(DL_DIR)/$(HWDATA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(HWDATA_DIR) $(DL_DIR) $(HWDATA_PATCH) - touch $(HWDATA_DIR)/.unpacked - -$(TARGET_DIR)/$(HWDATA_TARGET_BINARY): $(HWDATA_DIR)/.unpacked +HWDATA_VERSION = 0.230 +HWDATA_SOURCE = hwdata_$(HWDATA_VERSION).orig.tar.gz +HWDATA_PATCH = hwdata_$(HWDATA_VERSION)-1.diff.gz +HWDATA_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/h/hwdata/ +HWDATA_BINARY = pci.ids +HWDATA_TARGET_BINARY = usr/share/hwdata/pci.ids + +define HWDATA_INSTALL_TARGET_CMDS mkdir -p -m 755 $(TARGET_DIR)/usr/share/hwdata - cp -a $(HWDATA_DIR)/pci.ids $(TARGET_DIR)/usr/share/hwdata - cp -a $(HWDATA_DIR)/usb.ids $(TARGET_DIR)/usr/share/hwdata - -touch -c $(TARGET_DIR)/usr/share/hwdata/* - -hwdata: $(TARGET_DIR)/$(HWDATA_TARGET_BINARY) + cp -a $(@D)/pci.ids $(TARGET_DIR)/usr/share/hwdata + cp -a $(@D)/usb.ids $(TARGET_DIR)/usr/share/hwdata +endef -hwdata-clean: +define HWDATA_CLEAN_CMDS rm -rf $(TARGET_DIR)/usr/share/hwdata rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share +endef -hwdata-dirclean: - rm -rf $(HWDATA_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_HWDATA),y) -TARGETS+=hwdata -endif +$(eval $(call GENTARGETS,package,hwdata))
Signature · 1 line
1.7.3
PATCH 14/18 hwdata: convert to gentargets and bump to 0.230
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Signed-off-by: Martin Banky <[email protected]>
Committed with small tweaks, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 15/18 liberation: convert to gentargets and bump to 1.06.0.20100721
In reply to Martin Banky--- package/liberation/liberation.mk | 39 ++++++++----------------------------- 1 files changed, 9 insertions(+), 30 deletions(-)
package/liberation/liberation.mk +9 -30
@@ -3,40 +3,19 @@ # liberation # ############################################################# -LIBERATION_VERSION = 1.04 +LIBERATION_VERSION = 1.06.0.20100721 LIBERATION_SITE = http://www.fedorahosted.org/releases/l/i/liberation-fonts -LIBERATION_SOURCE = liberation-fonts-$(LIBERATION_VERSION).tar.gz -LIBERATION_DIR = $(BUILD_DIR)/liberation-fonts-$(LIBERATION_VERSION) -LIBERATION_CAT:=$(ZCAT) -LIBERATION_TARGET_DIR:=$(TARGET_DIR)/usr/share/fonts/liberation +LIBERATION_SOURCE = liberation-fonts-ttf-$(LIBERATION_VERSION).tar.gz -$(DL_DIR)/$(LIBERATION_SOURCE): - $(call DOWNLOAD,$(LIBERATION_SITE),$(LIBERATION_SOURCE)) +LIBERATION_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/liberation -liberation-source: $(DL_DIR)/$(LIBERATION_SOURCE) - -$(LIBERATION_DIR)/.unpacked: $(DL_DIR)/$(LIBERATION_SOURCE) - $(LIBERATION_CAT) $(DL_DIR)/$(LIBERATION_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $@ - -$(LIBERATION_TARGET_DIR)/LiberationMono-Bold.ttf: $(LIBERATION_DIR)/.unpacked +define LIBERATION_INSTALL_TARGET_CMDS mkdir -p $(LIBERATION_TARGET_DIR) - $(INSTALL) -m0644 $(LIBERATION_DIR)/*.ttf $(LIBERATION_TARGET_DIR) - touch -c $@ + $(INSTALL) -m0644 $(@D)/*.ttf $(LIBERATION_TARGET_DIR) +endef -liberation: $(LIBERATION_TARGET_DIR)/LiberationMono-Bold.ttf - -liberation-clean: +define LIBERATION_CLEAN_CMDS rm -rf $(LIBERATION_TARGET_DIR) +endef -liberation-dirclean: - rm -rf $(LIBERATION_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_LIBERATION),y) -TARGETS+=liberation -endif +$(eval $(call GENTARGETS,package,liberation))
Signature · 1 line
1.7.3
PATCH 15/18 liberation: convert to gentargets and bump to 1.06.0.20100721
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Signed-off-by: Martin Banky <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 16/18 lm-sensors: convert to gentargets and bump to 3.1.2
In reply to Martin Banky--- package/lm-sensors/lm-sensors.mk | 65 +++++++++++-------------------------- 1 files changed, 20 insertions(+), 45 deletions(-)
package/lm-sensors/lm-sensors.mk +20 -45
@@ -3,58 +3,33 @@ # lm-sensors # ############################################################# -LM_SENSORS_VERSION:=3.0.2 -LM_SENSORS_SOURCE:=lm_sensors-$(LM_SENSORS_VERSION).tar.bz2 -LM_SENSORS_SITE:=http://dl.lm-sensors.org/lm-sensors/releases -LM_SENSORS_DIR:=$(BUILD_DIR)/lm_sensors-$(LM_SENSORS_VERSION) -LM_SENSORS_CAT:=$(BZCAT) -LM_SENSORS_BINARY:=prog/sensors/sensors -LM_SENSORS_TARGET_BINARY:=usr/bin/sensors +LM_SENSORS_VERSION = 3.1.2 +LM_SENSORS_SOURCE = lm_sensors-$(LM_SENSORS_VERSION).tar.bz2 +LM_SENSORS_SITE = http://dl.lm-sensors.org/lm-sensors/releases +LM_SENSORS_BINARY = prog/sensors/sensors +LM_SENSORS_TARGET_BINARY = usr/bin/sensors -$(DL_DIR)/$(LM_SENSORS_SOURCE): - $(call DOWNLOAD,$(LM_SENSORS_SITE),$(LM_SENSORS_SOURCE)) +define LM_SENSORS_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) MACHINE=$(KERNEL_ARCH) -C $(@D) +endef -$(LM_SENSORS_DIR)/.unpacked: $(DL_DIR)/$(LM_SENSORS_SOURCE) - $(LM_SENSORS_CAT) $(DL_DIR)/$(LM_SENSORS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(LM_SENSORS_DIR) package/lm-sensors/ lm-sensors\*.patch - touch $@ - -$(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY): $(LM_SENSORS_DIR)/.unpacked - $(MAKE) $(TARGET_CONFIGURE_OPTS) MACHINE=$(KERNEL_ARCH)\ - -C $(LM_SENSORS_DIR) - -$(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY): $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY) +define LM_SENSORS_INSTALL_TARGET_CMDS if [ ! -f $(TARGET_DIR)/etc/sensors.conf ]; then \ - cp -dpf $(LM_SENSORS_DIR)/etc/sensors.conf.eg \ - $(TARGET_DIR)/etc/sensors.conf; \ - $(SED) '/^#/d' -e '/^[[:space:]]*$$/d' \ - $(TARGET_DIR)/etc/sensors.conf; \ + cp -dpf $(@D)/etc/sensors.conf.eg $(TARGET_DIR)/etc/sensors.conf; \ + $(SED) '/^#/d' -e '/^[[:space:]]*$$/d' $(TARGET_DIR)/etc/sensors.conf; \ fi - cp -dpf $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY) $@ - cp -dpf $(LM_SENSORS_DIR)/lib/libsensors.so* \ - $(LM_SENSORS_DIR)/lib/libsensors.a $(TARGET_DIR)/usr/lib/ + cp -dpf $(@D)/$(LM_SENSORS_BINARY) $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY) + cp -dpf $(@D)/lib/libsensors.so* \ + $(@D)/lib/libsensors.a $(TARGET_DIR)/usr/lib/ -$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/lib/libsensors.so* - $(STRIPCMD) $(STRIP_STRIP_ALL) $@ - -lm-sensors-source: $(DL_DIR)/$(LM_SENSORS_SOURCE) $(LM_SENSORS_PATCH_FILE) - -lm-sensors-unpacked: $(LM_SENSORS_DIR)/.unpacked - -lm-sensors: $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY) + $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY) +endef -lm-sensors-clean: - -$(MAKE) -C $(LM_SENSORS_DIR) clean +define LM_SENSORS_CLEAN_CMDS + -$(MAKE) -C $(@D) clean rm -f $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY) \ $(TARGET_DIR)/usr/lib/libsensors* \ $(TARGET_DIR)/etc/sensors.conf +endef -lm-sensors-dirclean: - rm -rf $(LM_SENSORS_DIR) -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_LM_SENSORS),y) -TARGETS+=lm-sensors -endif +$(eval $(call GENTARGETS,package,lm-sensors))
Signature · 1 line
1.7.3
PATCH 16/18 lm-sensors: convert to gentargets and bump to 3.1.2
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Signed-off-by: Martin Banky <[email protected]> Martin> ---
Martin> package/lm-sensors/lm-sensors.mk | 65 +++++++++++--------------------------
Thanks, committed with minor tweaks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 17/18 lockfile-progs: convert to gentargets and bump to 0.1.15
In reply to Martin Banky--- .../lockfile-progs-0.1.11-sus3v-legacy.patch | 11 ----- .../lockfile-progs-0.1.15-sus3v-legacy.patch | 11 +++++ package/lockfile-progs/lockfile-progs.mk | 47 ++++++-------------- 3 files changed, 25 insertions(+), 44 deletions(-) delete mode 100644 package/lockfile-progs/lockfile-progs-0.1.11-sus3v-legacy.patch create mode 100644 package/lockfile-progs/lockfile-progs-0.1.15-sus3v-legacy.patch
package/lockfile-progs/lockfile-progs-0.1.11-sus3v-legacy.patch deleted +0 -11
@@ -1,11 +0,0 @@ ---- /lockfile-progs.orig.c 2007-10-11 10:32:09.000000000 -0300 -+++ /lockfile-progs.c 2007-10-11 10:32:28.000000000 -0300 -@@ -93,7 +93,7 @@ - { NULL, 0, NULL, 0 } - }; - -- char *cmd_name = rindex(argv[0], '/'); -+ char *cmd_name = strrchr(argv[0], '/'); - int mail_cmd_p = 0; - - if(cmd_name != NULL) {
package/lockfile-progs/lockfile-progs-0.1.15-sus3v-legacy.patch new file +11 -0
@@ -0,0 +1,11 @@ +--- /lockfile-progs.orig.c 2007-10-11 10:32:09.000000000 -0300 ++++ /lockfile-progs.c 2007-10-11 10:32:28.000000000 -0300 +@@ -93,7 +93,7 @@ + { NULL, 0, NULL, 0 } + }; + +- char *cmd_name = rindex(argv[0], '/'); ++ char *cmd_name = strrchr(argv[0], '/'); + int mail_cmd_p = 0; + + if(cmd_name != NULL) {
package/lockfile-progs/lockfile-progs.mk +14 -33
56 lines not on this page · raw message
Signature · 1 line
1.7.3
PATCH 17/18 lockfile-progs: convert to gentargets and bump to 0.1.15
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Signed-off-by: Martin Banky <[email protected]>
Committed with minor tweaks, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 18/18 logrotate: convert to gentargets and bump to 3.7.9
In reply to Martin Banky--- package/logrotate/logrotate.mk | 57 +++++++++++++++++----------------------- 1 files changed, 24 insertions(+), 33 deletions(-)
package/logrotate/logrotate.mk +24 -33
@@ -1,42 +1,33 @@ -LOGROTATE_VERSION:=3.7.7 -LOGROTATE_SOURCE:=logrotate-$(LOGROTATE_VERSION).tar.gz -LOGROTATE_SITE:=https://fedorahosted.org/releases/l/o/logrotate/ -LOGROTATE_DIR:=$(BUILD_DIR)/logrotate-$(LOGROTATE_VERSION) -LOGROTATE_BINARY:=logrotate -LOGROTATE_TARGET_BINARY:=usr/sbin/$(LOGROTATE_BINARY) - -$(DL_DIR)/$(LOGROTATE_SOURCE): - $(call DOWNLOAD,$(LOGROTATE_SITE),$(LOGROTATE_SOURCE)) - -$(LOGROTATE_DIR)/.source: $(DL_DIR)/$(LOGROTATE_SOURCE) - $(ZCAT) $(DL_DIR)/$(LOGROTATE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(LOGROTATE_DIR) package/logrotate/ logrotate\*.patch - touch $@ - -$(LOGROTATE_DIR)/$(LOGROTATE_BINARY): $(LOGROTATE_DIR)/.source - $(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS)" -C $(LOGROTATE_DIR) - -$(TARGET_DIR)/$(LOGROTATE_TARGET_BINARY): $(LOGROTATE_DIR)/$(LOGROTATE_BINARY) - $(MAKE) PREFIX=$(TARGET_DIR) -C $(LOGROTATE_DIR) install +############################################################# +# +# logrotate +# +############################################################# +LOGROTATE_VERSION = 3.7.9 +LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.gz +LOGROTATE_SITE = https://fedorahosted.org/releases/l/o/logrotate/ +LOGROTATE_BINARY = logrotate +LOGROTATE_TARGET_BINARY = usr/sbin/$(LOGROTATE_BINARY) + +LOGROTATE_DEPENDENCIES = popt + +define LOGROTATE_BUILD_CMDS + $(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS)" -C $(@D) +endef + +define LOGROTATE_INSTALL_TARGET_CMDS + $(MAKE) PREFIX=$(TARGET_DIR) -C $(@D) install if [ ! -f $(TARGET_DIR)/etc/logrotate.conf ]; then \ $(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf; \ fi $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/logrotate.d +endef -logrotate: popt $(TARGET_DIR)/$(LOGROTATE_TARGET_BINARY) - -logrotate-source: $(DL_DIR)/$(LOGROTATE_SOURCE) - -logrotate-clean: +define LOGROTATE_CLEAN_CMDS rm -f $(TARGET_DIR)/$(LOGROTATE_TARGET_BINARY) rm -f $(TARGET_DIR)/etc/logrotate.conf -rmdir $(TARGET_DIR)/etc/logrotate.d - -$(MAKE) -C $(LOGROTATE_DIR) clean - -logrotate-dirclean: - rm -rf $(LOGROTATE_DIR) - -ifeq ($(BR2_PACKAGE_LOGROTATE),y) -TARGETS+=logrotate -endif + -$(MAKE) -C $(@D) clean +endef +$(eval $(call GENTARGETS,package,logrotate))
Signature · 1 line
1.7.3
PATCH 18/18 logrotate: convert to gentargets and bump to 3.7.9
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Signed-off-by: Martin Banky <[email protected]>
Thanks, committed with small tweaks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/18 acpid: convert to gentargets and bump to 2.0.6
In reply to Martin BankyQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Also, added acpi_listen to the target. It was being stripped, but not copied. Martin> acpi_listen is a simple shell-friendly tool which connects to acpid and listens Martin> for events. When an event occurs, acpi_listen will print it on stdout.
Martin> Signed-off-by: Martin Banky <[email protected]>
Committed with minor tweaks, thanks.
Signature · 1 line
Bye, Peter Korsgaard