Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] svn commit: trunk/buildroot/package/openntpd
@ 2007-06-26 16:18 aldot at uclibc.org
  0 siblings, 0 replies; 5+ messages in thread
From: aldot at uclibc.org @ 2007-06-26 16:18 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2007-06-26 09:18:00 -0700 (Tue, 26 Jun 2007)
New Revision: 18942

Log:
- bump version


Modified:
   trunk/buildroot/package/openntpd/openntpd.mk


Changeset:
Modified: trunk/buildroot/package/openntpd/openntpd.mk
===================================================================
--- trunk/buildroot/package/openntpd/openntpd.mk	2007-06-26 15:59:37 UTC (rev 18941)
+++ trunk/buildroot/package/openntpd/openntpd.mk	2007-06-26 16:18:00 UTC (rev 18942)
@@ -3,7 +3,7 @@
 # OpenNTPD
 #
 #############################################################
-OPENNTPD_VERSION:=3.6.1p1
+OPENNTPD_VERSION:=3.9p1
 OPENNTPD_SOURCE:=openntpd-$(OPENNTPD_VERSION).tar.gz
 OPENNTPD_SITE:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD
 OPENNTPD_DIR:=$(BUILD_DIR)/openntpd-$(OPENNTPD_VERSION)
@@ -16,13 +16,12 @@
 
 $(OPENNTPD_DIR)/.source: $(DL_DIR)/$(OPENNTPD_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(OPENNTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(OPENNTPD_DIR)/.source
+	#mv $(BUILD_DIR)/ntpd $(OPENNTPD_DIR)
+	touch $@
 
 $(OPENNTPD_DIR)/.configured: $(OPENNTPD_DIR)/.source
 	(cd $(OPENNTPD_DIR); \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -35,6 +34,17 @@
 
 $(OPENNTPD_DIR)/$(OPENNTPD_BINARY): $(OPENNTPD_DIR)/.configured
 	$(MAKE) CC=$(TARGET_CC) -C $(OPENNTPD_DIR)
+	#(cd $(OPENNTPD_DIR) ; \
+	# $(YACC) parse.y ; \
+	# $(TARGET_CC) $(TARGET_CFLAGS) $(CFLAGS_COMBINE) \
+	# 	$(CFLAGS_WHOLE_PROGRAM) -I$(OPENNTPD_DIR) \
+	#	-D__dead="__attribute((__noreturn__))" -DHAVE_INTXX_T=1 \
+	#	-include defines.h \
+	#	-o $@ \
+	#	ntpd.c buffer.c log.c imsg.c ntp.c ntp_msg.c y.tab.c config.c \
+	#	server.c client.c sensors.c util.c ; \
+	#)
+	$(STRIP) -s $@
 
 $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY): $(OPENNTPD_DIR)/$(OPENNTPD_BINARY)
 	$(MAKE) DESTDIR=$(TARGET_DIR) STRIP_OPT="" -C $(OPENNTPD_DIR) install
@@ -47,8 +57,8 @@
 ntpd-source: $(DL_DIR)/$(OPENNTPD_SOURCE)
 
 ntpd-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(OPENNTPD_DIR) uninstall
-	rm -f $(TARGET_DIR)/etc/ntpd.conf
+	-$(MAKE) DESTDIR=$(TARGET_DIR) -C $(OPENNTPD_DIR) uninstall
+	rm -f $(TARGET_DIR)/etc/ntpd.conf $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY)
 	-$(MAKE) -C $(OPENNTPD_DIR) clean
 
 ntpd-dirclean:

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/package/openntpd
@ 2007-07-16 10:58 ulf at uclibc.org
  0 siblings, 0 replies; 5+ messages in thread
From: ulf at uclibc.org @ 2007-07-16 10:58 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-07-16 03:58:58 -0700 (Mon, 16 Jul 2007)
New Revision: 19110

Log:
Avoid rebuild of openntpd

Modified:
   trunk/buildroot/package/openntpd/openntpd.mk


Changeset:
Modified: trunk/buildroot/package/openntpd/openntpd.mk
===================================================================
--- trunk/buildroot/package/openntpd/openntpd.mk	2007-07-16 10:00:29 UTC (rev 19109)
+++ trunk/buildroot/package/openntpd/openntpd.mk	2007-07-16 10:58:58 UTC (rev 19110)
@@ -9,7 +9,7 @@
 OPENNTPD_DIR:=$(BUILD_DIR)/openntpd-$(OPENNTPD_VERSION)
 OPENNTPD_CAT:=$(ZCAT)
 OPENNTPD_BINARY:=ntpd
-OPENNTPD_TARGET_BINARY:=usr/sbin/foo
+OPENNTPD_TARGET_BINARY:=usr/sbin/ntpd
 
 $(DL_DIR)/$(OPENNTPD_SOURCE):
 	$(WGET) -P $(DL_DIR) $(OPENNTPD_SITE)/$(OPENNTPD_SOURCE)
@@ -48,9 +48,10 @@
 	$(STRIP) -s $@
 
 $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY): $(OPENNTPD_DIR)/$(OPENNTPD_BINARY)
+	rm -f $(TARGET_DIR)/etc/ntpd.conf
 	$(MAKE) DESTDIR=$(TARGET_DIR) STRIP_OPT="" -C $(OPENNTPD_DIR) install
-	-$(STRIP) $(TARGET_DIR)/usr/sbin/ntpd
-	cp $(OPENNTPD_DIR)/ntpd.conf $(TARGET_DIR)/etc
+	-$(STRIP) $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY)
+	cp -af $(OPENNTPD_DIR)/ntpd.conf $(TARGET_DIR)/etc/ntpd.conf
 	rm -Rf $(TARGET_DIR)/usr/man
 
 ntpd: uclibc $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/package/openntpd
@ 2007-08-19 21:13 ulf at uclibc.org
  2007-08-20 16:10 ` Bernhard Fischer
  0 siblings, 1 reply; 5+ messages in thread
From: ulf at uclibc.org @ 2007-08-19 21:13 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-08-19 14:13:08 -0700 (Sun, 19 Aug 2007)
New Revision: 19569

Log:
openntpd cleanup

Modified:
   trunk/buildroot/package/openntpd/openntpd.mk


Changeset:
Modified: trunk/buildroot/package/openntpd/openntpd.mk
===================================================================
--- trunk/buildroot/package/openntpd/openntpd.mk	2007-08-19 21:11:15 UTC (rev 19568)
+++ trunk/buildroot/package/openntpd/openntpd.mk	2007-08-19 21:13:08 UTC (rev 19569)
@@ -29,9 +29,11 @@
 		--build=$(GNU_HOST_NAME) \
 		--prefix=/usr \
 		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--mandir=/usr/share/man \
 		--with-builtin-arc4random \
-	);
-	touch $(OPENNTPD_DIR)/.configured;
+	)
+	touch $@
 
 $(OPENNTPD_DIR)/$(OPENNTPD_BINARY): $(OPENNTPD_DIR)/.configured
 	$(MAKE) CC=$(TARGET_CC) -C $(OPENNTPD_DIR)
@@ -45,22 +47,24 @@
 	#	ntpd.c buffer.c log.c imsg.c ntp.c ntp_msg.c y.tab.c config.c \
 	#	server.c client.c sensors.c util.c ; \
 	#)
-	$(STRIP) -s $@
+	$(STRIP) $@
 
 $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY): $(OPENNTPD_DIR)/$(OPENNTPD_BINARY)
 	rm -f $(TARGET_DIR)/etc/ntpd.conf
 	$(MAKE) DESTDIR=$(TARGET_DIR) STRIP_OPT="" -C $(OPENNTPD_DIR) install
 	-$(STRIP) $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY)
 	cp -af $(OPENNTPD_DIR)/ntpd.conf $(TARGET_DIR)/etc/ntpd.conf
-	rm -Rf $(TARGET_DIR)/usr/man
+	# Why in earth do we wipe the whole man directory here?
+	#rm -Rf $(TARGET_DIR)/usr/man
 
 ntpd: uclibc $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY)
 
 ntpd-source: $(DL_DIR)/$(OPENNTPD_SOURCE)
 
 ntpd-clean:
-	-$(MAKE) DESTDIR=$(TARGET_DIR) -C $(OPENNTPD_DIR) uninstall
-	rm -f $(TARGET_DIR)/etc/ntpd.conf $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY)
+	rm -f $(addprefix $(TARGET_DIR)/,etc/ntpd.conf \
+					 usr/share/man/man?/ntpd.conf* \
+					 $(OPENNTPD_TARGET_BINARY))
 	-$(MAKE) -C $(OPENNTPD_DIR) clean
 
 ntpd-dirclean:

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/package/openntpd
  2007-08-19 21:13 [Buildroot] svn commit: trunk/buildroot/package/openntpd ulf at uclibc.org
@ 2007-08-20 16:10 ` Bernhard Fischer
  2007-08-20 18:14   ` Cristian Ionescu-Idbohrn
  0 siblings, 1 reply; 5+ messages in thread
From: Bernhard Fischer @ 2007-08-20 16:10 UTC (permalink / raw)
  To: buildroot

On Sun, Aug 19, 2007 at 02:13:09PM -0700, ulf at uclibc.org wrote:
>Author: ulf
>Date: 2007-08-19 14:13:08 -0700 (Sun, 19 Aug 2007)
>New Revision: 19569
>
>Log:
>openntpd cleanup
>
>Modified:
>   trunk/buildroot/package/openntpd/openntpd.mk
>
>
>Changeset:
>Modified: trunk/buildroot/package/openntpd/openntpd.mk
>===================================================================
>--- trunk/buildroot/package/openntpd/openntpd.mk	2007-08-19 21:11:15 UTC (rev 19568)
>+++ trunk/buildroot/package/openntpd/openntpd.mk	2007-08-19 21:13:08 UTC (rev 19569)
>@@ -29,9 +29,11 @@
> 		--build=$(GNU_HOST_NAME) \
> 		--prefix=/usr \
> 		--sysconfdir=/etc \
>+		--datadir=/usr/share \
>+		--mandir=/usr/share/man \
> 		--with-builtin-arc4random \
>-	);
>-	touch $(OPENNTPD_DIR)/.configured;
>+	)
>+	touch $@
> 
> $(OPENNTPD_DIR)/$(OPENNTPD_BINARY): $(OPENNTPD_DIR)/.configured
> 	$(MAKE) CC=$(TARGET_CC) -C $(OPENNTPD_DIR)
>@@ -45,22 +47,24 @@
> 	#	ntpd.c buffer.c log.c imsg.c ntp.c ntp_msg.c y.tab.c config.c \
> 	#	server.c client.c sensors.c util.c ; \
> 	#)
>-	$(STRIP) -s $@
>+	$(STRIP) $@
> 
> $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY): $(OPENNTPD_DIR)/$(OPENNTPD_BINARY)
> 	rm -f $(TARGET_DIR)/etc/ntpd.conf
> 	$(MAKE) DESTDIR=$(TARGET_DIR) STRIP_OPT="" -C $(OPENNTPD_DIR) install
> 	-$(STRIP) $(TARGET_DIR)/$(OPENNTPD_TARGET_BINARY)
> 	cp -af $(OPENNTPD_DIR)/ntpd.conf $(TARGET_DIR)/etc/ntpd.conf
>-	rm -Rf $(TARGET_DIR)/usr/man
>+	# Why in earth do we wipe the whole man directory here?

The phrase is "why on earth", i think.

We do that in alot of places. I'd like to introduce a
BR2_TARGET_MANPAGES
BR2_TARGET_INFOPAGES
sometime in the future.. Feel free to go ahead and add this.

cheers,

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/package/openntpd
  2007-08-20 16:10 ` Bernhard Fischer
@ 2007-08-20 18:14   ` Cristian Ionescu-Idbohrn
  0 siblings, 0 replies; 5+ messages in thread
From: Cristian Ionescu-Idbohrn @ 2007-08-20 18:14 UTC (permalink / raw)
  To: buildroot

On Mon, 20 Aug 2007, Bernhard Fischer wrote:

> >+	# Why in earth do we wipe the whole man directory here?
>
> The phrase is "why on earth", i think.

Right, thanks.  Should I submit a patch? :)

> We do that in alot of places. I'd like to introduce a
> BR2_TARGET_MANPAGES
> BR2_TARGET_INFOPAGES
> sometime in the future.. Feel free to go ahead and add this.

I like that.


Cheers,

-- 
Cristian

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2007-08-20 18:14 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-19 21:13 [Buildroot] svn commit: trunk/buildroot/package/openntpd ulf at uclibc.org
2007-08-20 16:10 ` Bernhard Fischer
2007-08-20 18:14   ` Cristian Ionescu-Idbohrn
  -- strict thread matches above, loose matches on Subject: below --
2007-07-16 10:58 ulf at uclibc.org
2007-06-26 16:18 aldot at uclibc.org

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox