This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 4f01f8676413898aad51e027fe126078e139c02d (commit) via 814a60a3b0d68b7514a785583835e3e8c12fe028 (commit) via 624165645060fb8d30bd059bdda2519eace3fb6e (commit) via f2ef55baa2fe2fbe0cd38250df293011fb314217 (commit) from 02914abf99a505671fc5307736dee886dba71886 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 4f01f8676413898aad51e027fe126078e139c02d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 6 11:12:26 2011 +0200
Cleanup of various makefiles for automatic configure detection.
commit 814a60a3b0d68b7514a785583835e3e8c12fe028 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 6 11:11:51 2011 +0200
build-essentials: Automatic detection for configure script.
That makes the makefiles a little bit shorter.
commit 624165645060fb8d30bd059bdda2519eace3fb6e Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 6 10:36:20 2011 +0200
udev: Remove automatic generation of network rules.
We do that on our own in the network package.
commit f2ef55baa2fe2fbe0cd38250df293011fb314217 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Aug 5 10:58:02 2011 +0200
cups: Link against libtasn1.
-----------------------------------------------------------------------
Summary of changes: pkgs/btrfs-progs/btrfs-progs.nm | 6 +----- pkgs/build-essentials/build-essentials.nm | 2 +- pkgs/build-essentials/buildsystem/Functions | 2 +- pkgs/cpufrequtils/cpufrequtils.nm | 7 +------ pkgs/cups/cups.nm | 6 +++--- pkgs/dmidecode/dmidecode.nm | 7 +------ pkgs/dracut/dracut.nm | 6 +----- pkgs/etherwake/etherwake.nm | 6 +----- pkgs/iana-etc/iana-etc.nm | 6 +----- pkgs/iproute2/iproute2.nm | 6 +++--- pkgs/iputils/iputils.nm | 6 +----- pkgs/iw/iw.nm | 6 +----- pkgs/linux-firmware/linux-firmware.nm | 5 ++--- pkgs/multipath-tools/multipath-tools.nm | 6 +----- pkgs/pakfire/pakfire.nm | 6 +----- pkgs/powertop/powertop.nm | 4 ---- pkgs/pptp/pptp.nm | 6 +----- pkgs/rstp/rstp.nm | 6 +----- pkgs/traceroute/traceroute.nm | 6 +----- pkgs/udev/udev.nm | 5 ++++- pkgs/usb-modemswitch/usb-modeswitch.nm | 6 +----- 21 files changed, 28 insertions(+), 88 deletions(-)
Difference in files: diff --git a/pkgs/btrfs-progs/btrfs-progs.nm b/pkgs/btrfs-progs/btrfs-progs.nm index 1f08786..610a443 100644 --- a/pkgs/btrfs-progs/btrfs-progs.nm +++ b/pkgs/btrfs-progs/btrfs-progs.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = btrfs-progs PKG_VER = 0.19 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUPS = System/Filesystems @@ -43,10 +43,6 @@ endef
PKG_TARBALL = $(THISAPP).tar.bz2
-define STAGE_BUILD - cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(PARALLELISMFLAGS) -endef - define STAGE_INSTALL cd $(DIR_APP) && make bindir=$(BUILDROOT)/sbin mandir=$(BUILDROOT)/usr/share install endef diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index dc8251d..03650f4 100644 --- a/pkgs/build-essentials/build-essentials.nm +++ b/pkgs/build-essentials/build-essentials.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = build-essentials -PKG_VER = 1.2 +PKG_VER = 1.3 PKG_REL = 1 PKG_EPOCH = 2 PKG_ARCH = noarch diff --git a/pkgs/build-essentials/buildsystem/Functions b/pkgs/build-essentials/buildsystem/Functions index 90776ff..d929450 100644 --- a/pkgs/build-essentials/buildsystem/Functions +++ b/pkgs/build-essentials/buildsystem/Functions @@ -183,7 +183,7 @@ endef STAGE_BUILD_TARGETS =
define STAGE_BUILD - cd $(DIR_APP) && \ + cd $(DIR_APP) && [ ! -e "configure" ] || \ $(CONFIGURE_ENVIRONMENT) \ ./configure \ $(CONFIGURE_OPTIONS) diff --git a/pkgs/cpufrequtils/cpufrequtils.nm b/pkgs/cpufrequtils/cpufrequtils.nm index 487dc45..e291e8b 100644 --- a/pkgs/cpufrequtils/cpufrequtils.nm +++ b/pkgs/cpufrequtils/cpufrequtils.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = cpufrequtils PKG_VER = 008 -PKG_REL = 3 +PKG_REL = 4
PKG_MAINTAINER = PKG_GROUPS = Base Applications/System @@ -44,10 +44,5 @@ PKG_TARBALL = $(THISAPP).tar.gz
PKG_PACKAGES += $(PKG_NAME)-devel
-# Package doesn't provide a configure script -define STAGE_BUILD - cd $(DIR_APP) && make $(PARALELLISMFLAGS) -endef - STAGE_INSTALL_TARGETS += mandir=/usr/share/man
diff --git a/pkgs/cups/cups.nm b/pkgs/cups/cups.nm index 0261298..42569af 100644 --- a/pkgs/cups/cups.nm +++ b/pkgs/cups/cups.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = cups PKG_VER = 1.4.5 -PKG_REL = 4 +PKG_REL = 5
PKG_MAINTAINER = PKG_GROUPS = Applications/Printing @@ -36,8 +36,8 @@ PKG_SUMMARY = The common UNIX printing system.
PKG_BUILD_DEPS+= audit-devel autoconf automake avahi-devel cyrus-sasl-devel \ gcc-c++ ghostscript gnutls-devel libgcrypt-devel libjpeg-devel libpng-devel \ - libselinux-devel libtiff-devel openldap-devel pam-devel perl pkg-config \ - python zlib-devel + libselinux-devel libtasn1-devel libtiff-devel openldap-devel pam-devel \ + perl python zlib-devel PKG_DEPS += ghostscript
define PKG_DESCRIPTION diff --git a/pkgs/dmidecode/dmidecode.nm b/pkgs/dmidecode/dmidecode.nm index 3293a51..7b7db9a 100644 --- a/pkgs/dmidecode/dmidecode.nm +++ b/pkgs/dmidecode/dmidecode.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = dmidecode PKG_VER = 2.10 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUPS = Applications/System @@ -45,11 +45,6 @@ endef
PKG_TARBALL = $(THISAPP).tar.bz2
-define STAGE_BUILD - $(DO_FIX_LIBTOOL) - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef - define STAGE_INSTALL cd $(DIR_APP) && make install-bin install-man prefix=/usr DESTDIR=$(BUILDROOT) endef diff --git a/pkgs/dracut/dracut.nm b/pkgs/dracut/dracut.nm index dffd2a4..2875355 100644 --- a/pkgs/dracut/dracut.nm +++ b/pkgs/dracut/dracut.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = dracut PKG_VER = 010 -PKG_REL = 2 +PKG_REL = 3 PKG_ARCH = noarch
PKG_MAINTAINER = @@ -69,10 +69,6 @@ define STAGE_PREPARE_CMDS -e "/.*man.*/d" endef
-define STAGE_BUILD - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef - define STAGE_INSTALL cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) \ sbindir=/sbin sysconfdir=/etc mandir=/usr/share/man diff --git a/pkgs/etherwake/etherwake.nm b/pkgs/etherwake/etherwake.nm index 425b99b..4389725 100644 --- a/pkgs/etherwake/etherwake.nm +++ b/pkgs/etherwake/etherwake.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = etherwake PKG_VER = 1.09 -PKG_REL = 0 +PKG_REL = 2
PKG_MAINTAINER = PKG_GROUPS = Networking/Tools @@ -46,10 +46,6 @@ define STAGE_PREPARE_CMDS cd $(DIR_APP) && sed -e "s/^CFLAGS.*/CFLAGS = $(CFLAGS)/" -i Makefile endef
-define STAGE_BUILD - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef - define STAGE_INSTALL -mkdir -pv $(BUILDROOT)/usr/sbin cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) diff --git a/pkgs/iana-etc/iana-etc.nm b/pkgs/iana-etc/iana-etc.nm index b3a40ea..39ad986 100644 --- a/pkgs/iana-etc/iana-etc.nm +++ b/pkgs/iana-etc/iana-etc.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = iana-etc PKG_VER = 2.30 -PKG_REL = 0 +PKG_REL = 1 PKG_ARCH = noarch
PKG_MAINTAINER = @@ -45,7 +45,3 @@ define PKG_DESCRIPTION endef
PKG_TARBALL = $(THISAPP).tar.bz2 - -define STAGE_BUILD - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef diff --git a/pkgs/iproute2/iproute2.nm b/pkgs/iproute2/iproute2.nm index c936bd8..ae6e407 100644 --- a/pkgs/iproute2/iproute2.nm +++ b/pkgs/iproute2/iproute2.nm @@ -49,9 +49,9 @@ define STAGE_PREPARE_CMDS -e "s@/share/@/usr/share/@g" Makefile endef
-define STAGE_BUILD - cd $(DIR_APP) && make OPT_FLAGS="$(CFLAGS)" #$(PARALLELISMFLAGS) -endef +#define STAGE_BUILD +# cd $(DIR_APP) && make OPT_FLAGS="$(CFLAGS)" #$(PARALLELISMFLAGS) +#endef
define STAGE_INSTALL cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) diff --git a/pkgs/iputils/iputils.nm b/pkgs/iputils/iputils.nm index 618b9f7..ae82eda 100644 --- a/pkgs/iputils/iputils.nm +++ b/pkgs/iputils/iputils.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = iputils PKG_VER = s20071127 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUPS = Base Networking/Tools @@ -58,10 +58,6 @@ PKG_PATCHES += $(THISAPP)-traffic_class.patch PKG_PATCHES += $(THISAPP)-warnings.patch PKG_PATCHES += $(THISAPP)-output.patch
-define STAGE_BUILD - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef - define STAGE_INSTALL -mkdir -pv $(BUILDROOT)/{bin,sbin} $(BUILDROOT)/usr/sbin
diff --git a/pkgs/iw/iw.nm b/pkgs/iw/iw.nm index 41f5e9d..9202180 100644 --- a/pkgs/iw/iw.nm +++ b/pkgs/iw/iw.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = iw PKG_VER = 0.9.17 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUPS = System/Base @@ -45,10 +45,6 @@ endef
PKG_TARBALL = $(THISAPP).tar.bz2
-define STAGE_BUILD - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef - define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/sbin mv -v $(BUILDROOT)/usr/sbin/iw $(BUILDROOT)/sbin/iw diff --git a/pkgs/linux-firmware/linux-firmware.nm b/pkgs/linux-firmware/linux-firmware.nm index c460fb7..0cccc26 100644 --- a/pkgs/linux-firmware/linux-firmware.nm +++ b/pkgs/linux-firmware/linux-firmware.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = linux-firmware PKG_VER = 20110311 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = Arne Fitzenreiter arne.fitzenreiter@ipfire.org PKG_GROUPS = System/Libraries @@ -45,8 +45,7 @@ PKG_TARBALL = $(THISAPP).tar.gz
PKG_BUILD_DEPS =
-define STAGE_BUILD -endef +STAGE_BUILD = # Nothing to do.
define STAGE_INSTALL -mkdir -pv $(BUILDROOT)/lib/firmware diff --git a/pkgs/multipath-tools/multipath-tools.nm b/pkgs/multipath-tools/multipath-tools.nm index 783c7ce..aa2bbfb 100644 --- a/pkgs/multipath-tools/multipath-tools.nm +++ b/pkgs/multipath-tools/multipath-tools.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = multipath-tools PKG_VER = 0.4.9 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUPS = System/Base @@ -47,10 +47,6 @@ PKG_PACKAGES += $(PKG_NAME)-devel
DIR_APP = $(DIR_SRC)/$(PKG_NAME)
-define STAGE_BUILD - cd $(DIR_APP) && make -endef - define STAGE_INSTALL_CMDS rm -rf $(BUILDROOT)/etc/rc.d endef diff --git a/pkgs/pakfire/pakfire.nm b/pkgs/pakfire/pakfire.nm index a79d350..c0e14c2 100644 --- a/pkgs/pakfire/pakfire.nm +++ b/pkgs/pakfire/pakfire.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = pakfire PKG_VER = 0.9.4 -PKG_REL = 1 +PKG_REL = 2
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUPS = Base System/Packaging @@ -56,10 +56,6 @@ PKG_TARBALL = $(THISAPP).tar.gz
export CFLAGS += -fno-strict-aliasing
-define STAGE_BUILD - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef - # Build package
PKG_PACKAGES += $(PKG_NAME)-build diff --git a/pkgs/powertop/powertop.nm b/pkgs/powertop/powertop.nm index 3c2b1b2..2c5bc57 100644 --- a/pkgs/powertop/powertop.nm +++ b/pkgs/powertop/powertop.nm @@ -42,7 +42,3 @@ define PKG_DESCRIPTION endef
PKG_TARBALL = $(THISAPP).tar.gz - -define STAGE_BUILD - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef diff --git a/pkgs/pptp/pptp.nm b/pkgs/pptp/pptp.nm index 9ddc0b2..da9f53f 100644 --- a/pkgs/pptp/pptp.nm +++ b/pkgs/pptp/pptp.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = pptp PKG_VER = 1.7.2 -PKG_REL = 0 +PKG_REL = 2
PKG_MAINTAINER = PKG_GROUPS = Networking/Dialin @@ -52,10 +52,6 @@ define STAGE_PREPARE_CMDS -e "s/^IP.*/IP=/sbin/ip/" endef
-define STAGE_BUILD - cd $(DIR_APP) && make -endef - define STAGE_INSTALL_CMDS rm -rvf $(BUILDROOT)/etc endef diff --git a/pkgs/rstp/rstp.nm b/pkgs/rstp/rstp.nm index e51c362..986f579 100644 --- a/pkgs/rstp/rstp.nm +++ b/pkgs/rstp/rstp.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = rstp PKG_VER = 0.21 -PKG_REL = 4 +PKG_REL = 5
PKG_MAINTAINER = PKG_GROUPS = Networking/Tools @@ -46,10 +46,6 @@ define STAGE_PREPARE_CMDS -e "s/^CFLAGS =/CFLAGS = $(CFLAGS)/g" endef
-define STAGE_BUILD - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef - define STAGE_INSTALL cd $(DIR_APP) && make install INSTALLPREFIX=$(BUILDROOT) install -v -m 755 $(DIR_SOURCE)/bridge-stp $(BUILDROOT)/sbin/bridge-stp diff --git a/pkgs/traceroute/traceroute.nm b/pkgs/traceroute/traceroute.nm index 48e42ce..77312cc 100644 --- a/pkgs/traceroute/traceroute.nm +++ b/pkgs/traceroute/traceroute.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = traceroute PKG_VER = 2.0.12 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUPS = Application/Internet @@ -50,10 +50,6 @@ define STAGE_PREPARE_CMDS cd $(DIR_APP) && echo "CFLAGS += $(CFLAGS)" >> Make.defines endef
-define STAGE_BUILD - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef - define STAGE_INSTALL cd $(DIR_APP) && make install prefix=$(BUILDROOT)/usr chmod 755 $(BUILDROOT)/usr/bin/traceroute diff --git a/pkgs/udev/udev.nm b/pkgs/udev/udev.nm index 515d7cd..272d1fe 100644 --- a/pkgs/udev/udev.nm +++ b/pkgs/udev/udev.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = udev PKG_VER = 172 -PKG_REL = 1 +PKG_REL = 2
PKG_MAINTAINER = PKG_GROUPS = Base System/Base @@ -73,4 +73,7 @@ define STAGE_INSTALL_CMDS $(BUILDROOT)/usr/lib/ConsoleKit/run-seat.d/udev-acl.ck
install -m 755 $(DIR_SOURCE)/console_init $(BUILDROOT)/lib/udev/ + + # Remove network rules. We have our own in the network package. + rm -v $(BUILDROOT)/lib/udev/{write_net_rules,rules.d/75-persistent-net-generator.rules} endef diff --git a/pkgs/usb-modemswitch/usb-modeswitch.nm b/pkgs/usb-modemswitch/usb-modeswitch.nm index be8bbb1..62551ad 100644 --- a/pkgs/usb-modemswitch/usb-modeswitch.nm +++ b/pkgs/usb-modemswitch/usb-modeswitch.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = usb-modeswitch PKG_VER = 1.1.7 -PKG_REL = 1 +PKG_REL = 2
PKG_MAINTAINER = PKG_GROUPS = Applications/System @@ -42,7 +42,3 @@ define PKG_DESCRIPTION endef
PKG_TARBALL = $(THISAPP).tar.bz2 - -define STAGE_BUILD - cd $(DIR_APP) && make -endef
hooks/post-receive -- IPFire 3.x development tree