Skip to contentSkip to conversation

netkitftp: added package with Makefile.autotools.in support

PATCH New Hugues Hiegel 3 participants 13 messages Oct 26, 2009 – Oct 27, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 netkitftp: added package with Makefile.autotools.in support

I think the NETKITFTP_HOOK_POST_BUILD should be corrected, but I don't know which way would be better..
I considered making a patch for the ./ftp/Makefile into netkitftp sources folder, but I thought it was a bit too heavy ?

Feel free to give any comments.

Best Regards,
Hugues Hiegel.

#1 lore raw

PATCH 1/1 netkitftp: added package with Makefile.autotools.in support

From: Hugues Hiegel <[email protected]>

---
 package/netkitftp/Config.in                        |    9 +++++
 package/netkitftp/netkitftp-configure-noexit.patch |   13 +++++++
 package/netkitftp/netkitftp-configure.patch        |   37 ++++++++++++++++++++
 package/netkitftp/netkitftp.mk                     |   23 ++++++++++++
 4 files changed, 82 insertions(+), 0 deletions(-)
 create mode 100644 package/netkitftp/Config.in
 create mode 100644 package/netkitftp/netkitftp-configure-noexit.patch
 create mode 100644 package/netkitftp/netkitftp-configure.patch
 create mode 100644 package/netkitftp/netkitftp.mk
package/netkitftp/Config.in new file +9 -0
new file mode 100644
index 0000000..9b37d6e
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_NETKITFTP
+	bool "netkitftp"
+	default n
+	help
+	  ftp client.
+	  ftp client version 0.17-16 with debian patch.
+	            ftp://ftp.debian.org/debian/pool/main/netkit-ftp/
+
+	  ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
package/netkitftp/netkitftp-configure-noexit.patch new file +13 -0
new file mode 100644
index 0000000..f588a46
@@ -0,0 +1,13 @@
+diff --git a/configure b/configure
+index 0440527..54a5278 100755
+--- a/configure
++++ b/configure
+@@ -39,7 +39,7 @@ EOF
+ 	--manmode=*) MANMODE=`echo $1 | sed 's/^[^=]*=//'` ;;
+ 	--with-c-compiler=*) CC=`echo $1 | sed 's/^[^=]*=//'` ;;
+ 	--without-readline|--disable-readline) WITHOUT_READLINE=1;;
+-	*) echo "Unrecognized option: $1"; exit 1;;
++	*) echo "Unrecognized option: $1";;
+ esac 
+ shift
+ done
package/netkitftp/netkitftp-configure.patch new file +37 -0
new file mode 100644
index 0000000..65eb84f
@@ -0,0 +1,37 @@
+diff -aur old/configure new/configure
+--- old/configure	2007-02-23 10:09:31.974440552 +0100
++++ new/configure	2007-02-23 10:03:49.164555576 +0100
+@@ -86,7 +86,7 @@
+     echo -n 'Checking if C compiler works... '
+     if (
+           $CC __conftest.c -o __conftest || exit 1
+-          ./__conftest || exit 1
++          #./__conftest || exit 1
+        ) >/dev/null 2>&1; then
+          echo 'yes'
+      else
+@@ -166,13 +166,13 @@
+ EOF
+ if (
+       $CC $CFLAGS  __conftest.c  -o __conftest || exit 1
+-      ./__conftest || exit 1
++      #./__conftest || exit 1
+    ) >/dev/null 2>&1; then
+     echo 'yes'
+ else
+     if (
+           $CC $CFLAGS -D__USE_BSD_SIGNAL __conftest.c  -o __conftest || exit 1
+-          ./__conftest || exit 1
++          #./__conftest || exit 1
+        ) >/dev/null 2>&1; then
+         echo '-D__USE_BSD_SIGNAL'
+         CFLAGS="$CFLAGS -D__USE_BSD_SIGNAL"
+@@ -379,7 +379,7 @@
+ EOF
+ if (
+       $CC $CFLAGS  __conftest.c $LIBBSD -o __conftest || exit 1
+-      ./__conftest || exit 1
++      #./__conftest || exit 1
+    ) >/dev/null 2>&1; then
+     echo 'ok'
+ else
package/netkitftp/netkitftp.mk new file +23 -0
new file mode 100644
index 0000000..fce9585
@@ -0,0 +1,23 @@
+#############################################################
+#
+# netkitftp
+#
+#############################################################
+NETKITFTP_VERSION:=0.17
+NETKITFTP_SOURCE:=netkit-ftp_$(NETKITFTP_VERSION).orig.tar.gz
+NETKITFTP_PATCH:=netkit-ftp_0.17-16.diff.gz
+NETKITFTP_SITE:=ftp://ftp.debian.org/debian/pool/main/n/netkit-ftp/
+
+NETKITFTP_CONF_OPT = --installroot=$(TARGET_DIR) \
+					--without-readline
+NETKITFTP_MAKE_ENV = SUB=ftp
+NETKITFTP_INSTALL_TARGET_OPT = INSTALL_PREFIX=$(TARGET_DIR) install
+
+$(eval $(call AUTOTARGETS,package,netkitftp))
+
+$(NETKITFTP_HOOK_POST_BUILD):
+	[ ! -d $(TARGET_DIR)/usr/man/man1 ] && install -d $(TARGET_DIR)/usr/man/man1 || true
+	[ ! -d $(TARGET_DIR)/usr/man/man5 ] && install -d $(TARGET_DIR)/usr/man/man5 ||??true
+
+$(NETKITFTP_HOOK_POST_INSTALL):
+	rm -vfr $(TARGET_DIR)/usr/man
Signature · 1 line
1.6.2.BigFiles
#2 lore raw

PATCH 1/1 netkitftp: added package with Makefile.autotools.in support

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Hugues" == Hugues Hiegel <[email protected]> writes:

Hi,

Thanks for the patch - A few comments:

Hugues> From: Hugues Hiegel <[email protected]> Hugues> ---

 Hugues>  package/netkitftp/Config.in                        |    9 +++++
 Hugues>  package/netkitftp/netkitftp-configure-noexit.patch |   13 +++++++
 Hugues>  package/netkitftp/netkitftp-configure.patch        |   37 ++++++++++++++++++++
 Hugues>  package/netkitftp/netkitftp.mk                     |   23 ++++++++++++
 Hugues>  4 files changed, 82 insertions(+), 0 deletions(-)
 Hugues>  create mode 100644 package/netkitftp/Config.in
 Hugues>  create mode 100644 package/netkitftp/netkitftp-configure-noexit.patch
 Hugues>  create mode 100644 package/netkitftp/netkitftp-configure.patch
 Hugues>  create mode 100644 package/netkitftp/netkitftp.mk

Hugues> diff --git a/package/netkitftp/Config.in b/package/netkitftp/Config.in Hugues> new file mode 100644
Hugues> index 0000000..9b37d6e
Hugues> --- /dev/null
Hugues> +++ b/package/netkitftp/Config.in
Hugues> @@ -0,0 +1,9 @@
Hugues> +config BR2_PACKAGE_NETKITFTP
Hugues> + bool "netkitftp"
Hugues> + default n

'n' is default, so no need to explictly list that.

Hugues> + help
Hugues> + ftp client.
Hugues> + ftp client version 0.17-16 with debian patch.
Hugues> + ftp://ftp.debian.org/debian/pool/main/netkit-ftp/

That's not a good help text. We generally don't list version numbers in the help text as they tend to get out of sync with the .mk files fast.

Hugues> +
Hugues> + ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
Hugues> diff --git a/package/netkitftp/netkitftp-configure-noexit.patch b/package/netkitftp/netkitftp-configure-noexit.patch Hugues> new file mode 100644
Hugues> index 0000000..f588a46
Hugues> --- /dev/null
Hugues> +++ b/package/netkitftp/netkitftp-configure-noexit.patch
Hugues> @@ -0,0 +1,13 @@
Hugues> +diff --git a/configure b/configure
Hugues> +index 0440527..54a5278 100755
Hugues> +--- a/configure
Hugues> ++++ b/configure
Hugues> +@@ -39,7 +39,7 @@ EOF
Hugues> + --manmode=*) MANMODE=echo $1 | sed 's/^[^=]*=//' ;;
Hugues> + --with-c-compiler=*) CC=echo $1 | sed 's/^[^=]*=//' ;;
Hugues> + --without-readline|--disable-readline) WITHOUT_READLINE=1;;
Hugues> +- *) echo "Unrecognized option: $1"; exit 1;;
Hugues> ++ *) echo "Unrecognized option: $1";;

Please document patches. Why is this needed, and is this something that should get submitted upstream?

Hugues> diff --git a/package/netkitftp/netkitftp-configure.patch b/package/netkitftp/netkitftp-configure.patch

That one as well.

Hugues> +++ b/package/netkitftp/netkitftp.mk
Hugues> @@ -0,0 +1,23 @@
Hugues> +############################################################# Hugues> +#
Hugues> +# netkitftp
Hugues> +#
Hugues> +############################################################# Hugues> +NETKITFTP_VERSION:=0.17
Hugues> +NETKITFTP_SOURCE:=netkit-ftp_$(NETKITFTP_VERSION).orig.tar.gz Hugues> +NETKITFTP_PATCH:=netkit-ftp_0.17-16.diff.gz
Hugues> +NETKITFTP_SITE:=ftp://ftp.debian.org/debian/pool/main/n/netkit-ftp/

We have BR2_DEBIAN_MIRROR, which should be used.
Is that a stable URL? Would something on snapshot.debian.net be better?

Hugues> +
Hugues> +NETKITFTP_CONF_OPT = --installroot=$(TARGET_DIR) \

Something regarding TARGET_DIR at configure time? Doesn't that leak paths on the build host to the installed binaries?

Hugues> + --without-readline
Hugues> +NETKITFTP_MAKE_ENV = SUB=ftp

A comment to why would be good.

Hugues> +NETKITFTP_INSTALL_TARGET_OPT = INSTALL_PREFIX=$(TARGET_DIR) install Hugues> +
Hugues> +$(eval $(call AUTOTARGETS,package,netkitftp))
Hugues> +
Hugues> +$(NETKITFTP_HOOK_POST_BUILD):

 Hugues> +	[ ! -d $(TARGET_DIR)/usr/man/man1 ] && install -d $(TARGET_DIR)/usr/man/man1 || true
 Hugues> +	[ ! -d $(TARGET_DIR)/usr/man/man5 ] && install -d $(TARGET_DIR)/usr/man/man5 ||?true

You have _true at the man5 line. Simply doing mkdir -p $(TARGET_DIR)/usr/man/man1 $(TARGET_DIR)/usr/man/man5 would be simpler to read.

Also don't forget to touch $@ so the target isn't always considered out of date.

A comment to why the above is needed in the first place would also be good.

Hugues> +
Hugues> +$(NETKITFTP_HOOK_POST_INSTALL):
Hugues> + rm -vfr $(TARGET_DIR)/usr/man

Why verbose? That uninstall would also remove all other man pages, so don't do that.

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH 1/1 netkitftp: added package with Makefile.autotools.in support

Hello,

Thanks for the comments,
I've got some questions ;

Ce cher Peter Korsgaard <[email protected]> a dit :

Quoted 16 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Hugues" == Hugues Hiegel <[email protected]> writes:

Hi,

Thanks for the patch - A few comments:

Hugues> diff --git a/package/netkitftp/Config.in b/package/netkitftp/Config.in Hugues> new file mode 100644
Hugues> index 0000000..9b37d6e
Hugues> --- /dev/null
Hugues> +++ b/package/netkitftp/Config.in
Hugues> @@ -0,0 +1,9 @@
Hugues> +config BR2_PACKAGE_NETKITFTP
Hugues> + bool "netkitftp"
Hugues> + default n

Quoted 1 line

'n' is default, so no need to explictly list that.

Ok.

Quoted 7 lines

Hugues> + help
Hugues> + ftp client.
Hugues> + ftp client version 0.17-16 with debian patch.
Hugues> + ftp://ftp.debian.org/debian/pool/main/netkit-ftp/

That's not a good help text. We generally don't list version numbers in the help text as they tend to get out of sync with the .mk files fast.

Yup, I just translated the french text that was there just before, I didn't thought about this way :)

I'll correct this.

Quoted 19 lines

Hugues> +
Hugues> + ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
Hugues> diff --git a/package/netkitftp/netkitftp-configure-noexit.patch b/package/netkitftp/netkitftp-configure-noexit.patch Hugues> new file mode 100644
Hugues> index 0000000..f588a46
Hugues> --- /dev/null
Hugues> +++ b/package/netkitftp/netkitftp-configure-noexit.patch
Hugues> @@ -0,0 +1,13 @@
Hugues> +diff --git a/configure b/configure
Hugues> +index 0440527..54a5278 100755
Hugues> +--- a/configure
Hugues> ++++ b/configure
Hugues> +@@ -39,7 +39,7 @@ EOF
Hugues> + --manmode=*) MANMODE=echo $1 | sed 's/^[^=]*=//' ;;
Hugues> + --with-c-compiler=*) CC=echo $1 | sed 's/^[^=]*=//' ;;
Hugues> + --without-readline|--disable-readline) WITHOUT_READLINE=1;;
Hugues> +- *) echo "Unrecognized option: $1"; exit 1;;
Hugues> ++ *) echo "Unrecognized option: $1";;

Quoted 2 lines

Please document patches. Why is this needed, and is this something that should get submitted upstream?

Good remark. I'll correct this asap.

Quoted 3 lines

Hugues> diff --git a/package/netkitftp/netkitftp-configure.patch b/package/netkitftp/netkitftp-configure.patch

That one as well.

Well... This one was already packaged with the package I've got, I don't have any idea why it is needed. I'll check this and then verify if it is really needed (hope it is not :-) )

Quoted 12 lines

Hugues> +++ b/package/netkitftp/netkitftp.mk
Hugues> @@ -0,0 +1,23 @@
Hugues> +############################################################# Hugues> +#
Hugues> +# netkitftp
Hugues> +#
Hugues> +############################################################# Hugues> +NETKITFTP_VERSION:=0.17
Hugues> +NETKITFTP_SOURCE:=netkit-ftp_$(NETKITFTP_VERSION).orig.tar.gz Hugues> +NETKITFTP_PATCH:=netkit-ftp_0.17-16.diff.gz
Hugues> +NETKITFTP_SITE:=ftp://ftp.debian.org/debian/pool/main/n/netkit-ftp/

Quoted 2 lines

Is that a stable URL? Would something on snapshot.debian.net be better? We have BR2_DEBIAN_MIRROR, which should be used.

Oh, that's right !
I'll correct this.

Quoted 5 lines

Hugues> +
Hugues> +NETKITFTP_CONF_OPT = --installroot=$(TARGET_DIR) \

Something regarding TARGET_DIR at configure time? Doesn't that leak paths on the build host to the installed binaries?

Well, I didn't investigated further, maybe is this not needed. I'll try without and throw then this out, if not.
Or comment it, if needed :o)

Quoted 4 lines

Hugues> + --without-readline
Hugues> +NETKITFTP_MAKE_ENV = SUB=ftp

A comment to why would be good.

Ok.

Quoted 9 lines

Hugues> +NETKITFTP_INSTALL_TARGET_OPT = INSTALL_PREFIX=$(TARGET_DIR) install Hugues> +
Hugues> +$(eval $(call AUTOTARGETS,package,netkitftp))
Hugues> +
Hugues> +$(NETKITFTP_HOOK_POST_BUILD):

 Hugues> +	[ ! -d $(TARGET_DIR)/usr/man/man1 ] && install -d $(TARGET_DIR)/usr/man/man1 || true
 Hugues> +	[ ! -d $(TARGET_DIR)/usr/man/man5 ] && install -d $(TARGET_DIR)/usr/man/man5 ||?true

You have _true at the man5 line.

How, sh*t. These funky french keyboards on early testing Debian put this awkward unbreakable space while pressing AltGt+Space... I didn't saw this earlier. (Seems to have been corrected since, at least on my personal desktop at home, which is more fresh than the one I've got at work, it is.)

Quoted 3 lines

Simply doing mkdir -p
$(TARGET_DIR)/usr/man/man1 $(TARGET_DIR)/usr/man/man5 would be simpler to read.

Great remark.
Anyway, I don't know why I did this way.... O_o
;)

Quoted 2 lines

Also don't forget to touch $@ so the target isn't always considered out of date.

Ok. I didn't thought it was necessary at this state, but if you suggest it.. ;-)

Quoted 2 lines

A comment to why the above is needed in the first place would also be good.

Ok

Quoted 5 lines

Hugues> +
Hugues> +$(NETKITFTP_HOOK_POST_INSTALL):
Hugues> + rm -vfr $(TARGET_DIR)/usr/man

Why verbose?

Mhmm.. because with the "fr", it makes "vfr", which is a motorbike.. ;o) I'll throw it ;)

Quoted 2 lines

That uninstall would also remove all other man pages, so don't do that.

Mhmm... I'm not sure I understood this.. Why do you talk about uninstall ? The netkitftp's 'install' rule does installs the manpages with the binary, without ability to call just the install of the binary without the manpages.
So I did like I see in other packages : just delete the $(TARGET_DIR)/usr/man folder... Is this a bad idea ?
What do you suggest at this stage ?
Doing nothing, this will be cleaned later ?

With best regards,

Signature · 1 line
Hugues Hiegel                                [http://www.hiegel.fr/~hugues/]
#4 lore raw

PATCH 1/1 netkitftp: added package with Makefile.autotools.in support

Le lundi 26 octobre 2009 ? 22:15 +0100, Hugues a ?crit :

Quoted 9 lines

Hello,

Quoted 3 lines

Hugues> diff --git a/package/netkitftp/netkitftp-configure.patch b/package/netkitftp/netkitftp-configure.patch

That one as well.

Well... This one was already packaged with the package I've got, I don't have any idea why it is needed. I'll check this and then verify if it is really needed (hope it is not :-) )

It prevents the launch of cross compiled binaries which would make exit the configure script.

Quoted 22 lines
Quoted 13 lines

Hugues> +++ b/package/netkitftp/netkitftp.mk
Hugues> @@ -0,0 +1,23 @@
Hugues> +############################################################# Hugues> +#
Hugues> +# netkitftp
Hugues> +#
Hugues> +############################################################# Hugues> +NETKITFTP_VERSION:=0.17
Hugues> +NETKITFTP_SOURCE:=netkit-ftp_$(NETKITFTP_VERSION).orig.tar.gz Hugues> +NETKITFTP_PATCH:=netkit-ftp_0.17-16.diff.gz
Hugues> +NETKITFTP_SITE:=ftp://ftp.debian.org/debian/pool/main/n/netkit-ftp/

Quoted 2 lines

Is that a stable URL? Would something on snapshot.debian.net be better? We have BR2_DEBIAN_MIRROR, which should be used.

Oh, that's right !
I'll correct this.

Quoted 3 lines

Hugues> +
Hugues> +NETKITFTP_CONF_OPT = --installroot=$(TARGET_DIR) \

Quoted 7 lines
Quoted 2 lines

Something regarding TARGET_DIR at configure time? Doesn't that leak paths on the build host to the installed binaries?

Well, I didn't investigated further, maybe is this not needed. I'll try without and throw then this out, if not.
Or comment it, if needed :o)

That package's makefile/configure is definitely strange... I just gave it a look and it seems INSTALL_PREFIX is not handled anywhere in the package.
So you can probably drop it from the NETKITFTP_INSTALL_TARGET_OPT variable.

Quoted 23 lines
Quoted 2 lines

Also don't forget to touch $@ so the target isn't always considered out of date.

Ok. I didn't thought it was necessary at this state, but if you suggest it.. ;-)

Quoted 2 lines

A comment to why the above is needed in the first place would also be good.

Ok

Quoted 5 lines

Hugues> +
Hugues> +$(NETKITFTP_HOOK_POST_INSTALL):
Hugues> + rm -vfr $(TARGET_DIR)/usr/man

Why verbose?

Mhmm.. because with the "fr", it makes "vfr", which is a motorbike.. ;o) I'll throw it ;)

Quoted 2 lines

That uninstall would also remove all other man pages, so don't do that.

Quoted 9 lines

Mhmm... I'm not sure I understood this.. Why do you talk about uninstall ? The netkitftp's 'install' rule does installs the manpages with the binary, without ability to call just the install of the binary without the manpages.
So I did like I see in other packages : just delete the $(TARGET_DIR)/usr/man folder... Is this a bad idea ?
What do you suggest at this stage ?
Doing nothing, this will be cleaned later ?

Yeah, I think what Peter wanted to tell is that man pages cleaning as well as locales cleaning is handled globaly by buildroot that the end of the generation process and depending on your config file.

See top Makefile :

ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
TARGETS+=target-purgelocales
endif

We probably have to make a pass on all unmaintained/old packages to fix that.

Signature · 1 line
Lionel Landwerlin <[email protected]>
author
#5 lore raw

PATCH 1/1 netkitftp: added package with Makefile.autotools.in support

Hello, you ;-)

Ce cher Lionel Landwerlin <[email protected]> a dit :

Quoted 5 lines

Le lundi 26 octobre 2009 ? 22:15 +0100, Hugues a ?crit :

Quoted 4 lines

Hello,

Quoted 2 lines

Hugues> diff --git a/package/netkitftp/netkitftp-configure.patch b/package/netkitftp/netkitftp-configure.patch

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

That one as well.

Well... This one was already packaged with the package I've got, I don't have any idea why it is needed. I'll check this and then verify if it is really needed (hope it is not :-) )

It prevents the launch of cross compiled binaries which would make exit the configure script.

Thanks for the check !

Quoted 21 lines
Quoted 21 lines
Quoted 12 lines

Hugues> +++ b/package/netkitftp/netkitftp.mk
Hugues> @@ -0,0 +1,23 @@
Hugues> +############################################################# Hugues> +#
Hugues> +# netkitftp
Hugues> +#
Hugues> +############################################################# Hugues> +NETKITFTP_VERSION:=0.17
Hugues> +NETKITFTP_SOURCE:=netkit-ftp_$(NETKITFTP_VERSION).orig.tar.gz Hugues> +NETKITFTP_PATCH:=netkit-ftp_0.17-16.diff.gz
Hugues> +NETKITFTP_SITE:=ftp://ftp.debian.org/debian/pool/main/n/netkit-ftp/

Quoted 2 lines

Is that a stable URL? Would something on snapshot.debian.net be better? We have BR2_DEBIAN_MIRROR, which should be used.

Oh, that's right !
I'll correct this.

Quoted 3 lines

Hugues> +
Hugues> +NETKITFTP_CONF_OPT = --installroot=$(TARGET_DIR) \

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

Something regarding TARGET_DIR at configure time? Doesn't that leak paths on the build host to the installed binaries?

Well, I didn't investigated further, maybe is this not needed. I'll try without and throw then this out, if not.
Or comment it, if needed :o)

That package's makefile/configure is definitely strange...

Yeah, isn't it ?

Quoted 4 lines

I just gave it a look and it seems INSTALL_PREFIX is not handled anywhere in the package.
So you can probably drop it from the NETKITFTP_INSTALL_TARGET_OPT variable.

Mhmm, that seems correct.

Quoted 12 lines
Quoted 11 lines
Quoted 2 lines

That uninstall would also remove all other man pages, so don't do that.

Mhmm... I'm not sure I understood this.. Why do you talk about uninstall ? The netkitftp's 'install' rule does installs the manpages with the binary, without ability to call just the install of the binary without the manpages.
So I did like I see in other packages : just delete the $(TARGET_DIR)/usr/man folder... Is this a bad idea ?
What do you suggest at this stage ?
Doing nothing, this will be cleaned later ?

Quoted 3 lines

Yeah, I think what Peter wanted to tell is that man pages cleaning as well as locales cleaning is handled globaly by buildroot that the end of the generation process and depending on your config file.

Ok, right, I just read his answer.

Quoted 8 lines

See top Makefile :

ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
TARGETS+=target-purgelocales
endif

We probably have to make a pass on all unmaintained/old packages to fix that.

And that doesn't look like just an easy job ;-)

Thanks for your comments, dude,

Signature · 1 line
Hugues Hiegel                                [http://www.hiegel.fr/~hugues/]
#6 lore raw

PATCH 1/1 netkitftp: added package with Makefile.autotools.in support

In reply to Hugues
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Hugues" == Hugues <[email protected]> writes:

Hugues> Hello,

Hugues> Thanks for the comments,
Hugues> I've got some questions ;

Hugues> +$(NETKITFTP_HOOK_POST_INSTALL):
Hugues> + rm -vfr $(TARGET_DIR)/usr/man

Quoted 2 lines
Quoted 2 lines

Why verbose?

Hugues> Mhmm.. because with the "fr", it makes "vfr", which is a Hugues> motorbike.. ;o) I'll throw it ;)

Quoted 2 lines
Quoted 2 lines

That uninstall would also remove all other man pages, so don't do that.

Hugues> Mhmm... I'm not sure I understood this.. Why do you talk about Hugues> uninstall ? The netkitftp's 'install' rule does installs the Hugues> manpages with the binary, without ability to call just the Hugues> install of the binary without the manpages. So I did like I Hugues> see in other packages : just delete the $(TARGET_DIR)/usr/man Hugues> folder... Is this a bad idea ? What do you suggest at this Hugues> stage ? Doing nothing, this will be cleaned later ?

Sorry, I misread the line (read it as HOOK_POST_UNINSTALL, which actually doesn't exist). The Makefile.autotools.in automatically removes manpages if the user doesn't have BR2_HAVE_MANPAGES enabled, so you can just remove it.

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

PATCH 1/1 netkitftp: ftp client from netkit project

In reply to Hugues Hiegel

From: Hugues Hiegel <[email protected]>

---
 package/netkitftp/Config.in                        |    6 +++
 package/netkitftp/configure-conftest.patch         |   41 ++++++++++++++++++++
 package/netkitftp/configure-unrecognizedopts.patch |   17 ++++++++
 package/netkitftp/netkitftp.mk                     |   25 ++++++++++++
 4 files changed, 89 insertions(+), 0 deletions(-)
 create mode 100644 package/netkitftp/Config.in
 create mode 100644 package/netkitftp/configure-conftest.patch
 create mode 100644 package/netkitftp/configure-unrecognizedopts.patch
 create mode 100644 package/netkitftp/netkitftp.mk
package/netkitftp/Config.in new file +6 -0
new file mode 100644
index 0000000..7ca0a14
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_NETKITFTP
+	bool "netkitftp"
+	help
+	  "Classic" ftp client with standard behaviour from 
+	  the netkit project.
+	  ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
package/netkitftp/configure-conftest.patch new file +41 -0

41 lines not on this page · raw message

package/netkitftp/configure-unrecognizedopts.patch new file +17 -0
new file mode 100644
index 0000000..ff58c11
@@ -0,0 +1,17 @@
+
+This patch prevents ./configure script of netkitftp to exit upon unrecognized
+option that should be passed from the Makefile.autotools.in of buildroot.
+
+diff --git a/configure b/configure
+index 0440527..54a5278 100755
+--- a/configure
++++ b/configure
+@@ -39,7 +39,7 @@ EOF
+ 	--manmode=*) MANMODE=`echo $1 | sed 's/^[^=]*=//'` ;;
+ 	--with-c-compiler=*) CC=`echo $1 | sed 's/^[^=]*=//'` ;;
+ 	--without-readline|--disable-readline) WITHOUT_READLINE=1;;
+-	*) echo "Unrecognized option: $1"; exit 1;;
++	*) echo "Unrecognized option: $1";;
+ esac 
+ shift
+ done
package/netkitftp/netkitftp.mk new file +25 -0
new file mode 100644
index 0000000..37aed24
@@ -0,0 +1,25 @@
+#############################################################
+#
+# netkitftp
+#
+#############################################################
+NETKITFTP_VERSION:=0.17
+NETKITFTP_PATCH_VERSION:=16
+NETKITFTP_SOURCE:=netkit-ftp_$(NETKITFTP_VERSION).orig.tar.gz
+NETKITFTP_PATCH:=netkit-ftp_$(NETKITFTP_VERSION)-$(NETKITFTP_PATCH_VERSION).diff.gz
+NETKITFTP_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/n/netkit-ftp/
+
+# Netkitftp does not understands the INSTALL_PREFIX envvar,
+#??we have to use the --installroot configure option instead...
+NETKITFTP_CONF_OPT = --installroot=$(TARGET_DIR) \
+					 --without-readline
+NETKITFTP_INSTALL_TARGET_OPT = install
+
+$(eval $(call AUTOTARGETS,package,netkitftp))
+
+$(NETKITFTP_HOOK_POST_BUILD):
+	# The 'install' rule of netkitftp would install manpages, but the
+	#??folders generally do not exist on the TARGET_PATH, so we create
+	#??them in order to let 'make install' successfully perform.
+	mkdir -p $(TARGET_DIR)/usr/man/man1 $(TARGET_DIR)/usr/man/man5
+
Signature · 1 line
1.6.2.BigFiles
author
#8 lore raw

PATCH 1/1 netkitftp: ftp client from netkit project

Hi,

this should be the last email for this patch :-) (it replaces my previous ones for netkitftp integration).

HH.

Ce cher Hugues Hiegel <[email protected]> a dit :

Quoted 126 lines

From: Hugues Hiegel <[email protected]>

---
 package/netkitftp/Config.in                        |    6 +++
 package/netkitftp/configure-conftest.patch         |   41 ++++++++++++++++++++
 package/netkitftp/configure-unrecognizedopts.patch |   17 ++++++++
 package/netkitftp/netkitftp.mk                     |   25 ++++++++++++
 4 files changed, 89 insertions(+), 0 deletions(-)
 create mode 100644 package/netkitftp/Config.in
 create mode 100644 package/netkitftp/configure-conftest.patch
 create mode 100644 package/netkitftp/configure-unrecognizedopts.patch
 create mode 100644 package/netkitftp/netkitftp.mk
package/netkitftp/Config.in new file +6 -0
new file mode 100644
index 0000000..7ca0a14
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_NETKITFTP
+	bool "netkitftp"
+	help
+	  "Classic" ftp client with standard behaviour from 
+	  the netkit project.
+	  ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
package/netkitftp/configure-conftest.patch new file +41 -0
new file mode 100644
index 0000000..06cfa11
@@ -0,0 +1,41 @@
+
+This patch prevents ./configure script of netkitftp to exit
+upon execution of cross-compiled test binaries on the host.
+
+diff -aur old/configure new/configure
+--- old/configure	2007-02-23 10:09:31.974440552 +0100
++++ new/configure	2007-02-23 10:03:49.164555576 +0100
+@@ -86,7 +86,7 @@
+     echo -n 'Checking if C compiler works... '
+     if (
+           $CC __conftest.c -o __conftest || exit 1
+-          ./__conftest || exit 1
++          #./__conftest || exit 1
+        ) >/dev/null 2>&1; then
+          echo 'yes'
+      else
+@@ -166,13 +166,13 @@
+ EOF
+ if (
+       $CC $CFLAGS  __conftest.c  -o __conftest || exit 1
+-      ./__conftest || exit 1
++      #./__conftest || exit 1
+    ) >/dev/null 2>&1; then
+     echo 'yes'
+ else
+     if (
+           $CC $CFLAGS -D__USE_BSD_SIGNAL __conftest.c  -o __conftest || exit 1
+-          ./__conftest || exit 1
++          #./__conftest || exit 1
+        ) >/dev/null 2>&1; then
+         echo '-D__USE_BSD_SIGNAL'
+         CFLAGS="$CFLAGS -D__USE_BSD_SIGNAL"
+@@ -379,7 +379,7 @@
+ EOF
+ if (
+       $CC $CFLAGS  __conftest.c $LIBBSD -o __conftest || exit 1
+-      ./__conftest || exit 1
++      #./__conftest || exit 1
+    ) >/dev/null 2>&1; then
+     echo 'ok'
+ else
package/netkitftp/configure-unrecognizedopts.patch new file +17 -0
new file mode 100644
index 0000000..ff58c11
@@ -0,0 +1,17 @@
+
+This patch prevents ./configure script of netkitftp to exit upon unrecognized
+option that should be passed from the Makefile.autotools.in of buildroot.
+
+diff --git a/configure b/configure
+index 0440527..54a5278 100755
+--- a/configure
++++ b/configure
+@@ -39,7 +39,7 @@ EOF
+ 	--manmode=*) MANMODE=`echo $1 | sed 's/^[^=]*=//'` ;;
+ 	--with-c-compiler=*) CC=`echo $1 | sed 's/^[^=]*=//'` ;;
+ 	--without-readline|--disable-readline) WITHOUT_READLINE=1;;
+-	*) echo "Unrecognized option: $1"; exit 1;;
++	*) echo "Unrecognized option: $1";;
+ esac 
+ shift
+ done
package/netkitftp/netkitftp.mk new file +25 -0
new file mode 100644
index 0000000..37aed24
@@ -0,0 +1,25 @@
+#############################################################
+#
+# netkitftp
+#
+#############################################################
+NETKITFTP_VERSION:=0.17
+NETKITFTP_PATCH_VERSION:=16
+NETKITFTP_SOURCE:=netkit-ftp_$(NETKITFTP_VERSION).orig.tar.gz
+NETKITFTP_PATCH:=netkit-ftp_$(NETKITFTP_VERSION)-$(NETKITFTP_PATCH_VERSION).diff.gz
+NETKITFTP_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/n/netkit-ftp/
+
+# Netkitftp does not understands the INSTALL_PREFIX envvar,
+#?we have to use the --installroot configure option instead...
+NETKITFTP_CONF_OPT = --installroot=$(TARGET_DIR) \
+					 --without-readline
+NETKITFTP_INSTALL_TARGET_OPT = install
+
+$(eval $(call AUTOTARGETS,package,netkitftp))
+
+$(NETKITFTP_HOOK_POST_BUILD):
+	# The 'install' rule of netkitftp would install manpages, but the
+	#?folders generally do not exist on the TARGET_PATH, so we create
+	#?them in order to let 'make install' successfully perform.
+	mkdir -p $(TARGET_DIR)/usr/man/man1 $(TARGET_DIR)/usr/man/man5
+
Signature · 1 line
Hugues Hiegel                                [http://www.hiegel.fr/~hugues/]
#9 lore raw

PATCH 1/1 netkitftp: ftp client from netkit project

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Hugues" == Hugues <[email protected]> writes:

Hugues> Hi,

Hugues> this should be the last email for this patch :-)

I'm afraid not - It seems to me like you sent the same patch again ;)

Signature · 1 line
Bye, Peter Korsgaard
#10 lore raw

PATCH 1/1 netkitftp: ftp client from netkit project

In reply to Hugues Hiegel
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Hugues" == Hugues Hiegel <[email protected]> writes:

Hugues> From: Hugues Hiegel <[email protected]>

Thanks, looks a lot better, but we're still not quite there yet.

It would be good if you could add a signed-of-by line to the end of the commit message - E.G.

Hugues> +++ b/package/netkitftp/Config.in
Hugues> @@ -0,0 +1,6 @@
Hugues> +config BR2_PACKAGE_NETKITFTP
Hugues> + bool "netkitftp"
Hugues> + help
Hugues> + "Classic" ftp client with standard behaviour from

Trailing space.

Hugues> +++ b/package/netkitftp/netkitftp.mk
Hugues> @@ -0,0 +1,25 @@
Hugues> +############################################################# Hugues> +#
Hugues> +# netkitftp
Hugues> +#
Hugues> +############################################################# Hugues> +NETKITFTP_VERSION:=0.17
Hugues> +NETKITFTP_PATCH_VERSION:=16
Hugues> +NETKITFTP_SOURCE:=netkit-ftp_$(NETKITFTP_VERSION).orig.tar.gz Hugues> +NETKITFTP_PATCH:=netkit-ftp_$(NETKITFTP_VERSION)-$(NETKITFTP_PATCH_VERSION).diff.gz Hugues> +NETKITFTP_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/n/netkit-ftp/

You'll need to disable the configure cache as the configure script doesn't understand it:

Unrecognized option: --cache-file=/tmp/br/build/tgt-config.cache
make: *** [/tmp/br/build/netkitftp-0.17/.stamp_configured] Error 1

E.G. add NETKITFTP_USE_CONFIG_CACHE:=NO

You'll also need to prepend netkitftp- to the patch names, as they will otherwise not get applied and configure errors out on unrecognized options.

With that fixed the configure script still fails with:

Checking for BSD signal semantics... yes
Checking for ncurses... no
Checking for traditional termcap... not found
This package needs termcap to run.

So you probably need to depend on ncurses. Notice that the configure script doesn't return an error code here, so the build continues (and then fails later on).

Are you testing this in some other tree than mainline?

Hugues> +
Hugues> +# Netkitftp does not understands the INSTALL_PREFIX envvar, Hugues> +#?we have to use the --installroot configure option instead... Hugues> +NETKITFTP_CONF_OPT = --installroot=$(TARGET_DIR) \
Hugues> + --without-readline
Hugues> +NETKITFTP_INSTALL_TARGET_OPT = install
Hugues> +
Hugues> +$(eval $(call AUTOTARGETS,package,netkitftp)) Hugues> +
Hugues> +$(NETKITFTP_HOOK_POST_BUILD):
Hugues> + # The 'install' rule of netkitftp would install manpages, but the
Hugues> + #?folders generally do not exist on the TARGET_PATH, so we create
Hugues> + #?them in order to let 'make install' successfully perform.
Hugues> + mkdir -p $(TARGET_DIR)/usr/man/man1 $(TARGET_DIR)/usr/man/man5

You still have odd unicode chars here.

You forgot to actually include the Config.in to package/Config.in, so the package cannot get selected.

Could you fix those issues please?

Signature · 1 line
Bye, Peter Korsgaard
author
#11 lore raw

PATCH 1/1 netkitftp: ftp client from netkit project

En ce d?gag? mardi 27 octobre, vers 14 heures 10, Peter Korsgaard a tapot? :

Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Hugues" == Hugues Hiegel <[email protected]> writes:

Hugues> From: Hugues Hiegel <[email protected]>

Thanks, looks a lot better, but we're still not quite there yet.

aha :-)

Quoted 4 lines

It would be good if you could add a signed-of-by line to the end of the commit message - E.G.

Well, perhaps should you be the really one who should answer me :
what's the purpose of this "signed-off-by" !? :)

Quoted 3 lines

Hugues> + "Classic" ftp client with standard behaviour from

Trailing space.

Argh, I *really* need to tweak my vim config to show these...

Quoted 6 lines

Hugues> +NETKITFTP_VERSION:=0.17
Hugues> +NETKITFTP_PATCH_VERSION:=16
Hugues> +NETKITFTP_SOURCE:=netkit-ftp_$(NETKITFTP_VERSION).orig.tar.gz Hugues> +NETKITFTP_PATCH:=netkit-ftp_$(NETKITFTP_VERSION)-$(NETKITFTP_PATCH_VERSION).diff.gz Hugues> +NETKITFTP_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/n/netkit-ftp/

Quoted 6 lines

You'll need to disable the configure cache as the configure script doesn't understand it:

Unrecognized option: --cache-file=/tmp/br/build/tgt-config.cache
make: *** [/tmp/br/build/netkitftp-0.17/.stamp_configured] Error 1 E.G. add NETKITFTP_USE_CONFIG_CACHE:=NO

Ok

Quoted 3 lines

You'll also need to prepend netkitftp- to the patch names, as they will otherwise not get applied and configure errors out on unrecognized options.

Mhm, it seemed to work correctly for me, I'll put another eye with more coffee ...

Quoted 10 lines

With that fixed the configure script still fails with:

Checking for BSD signal semantics... yes
Checking for ncurses... no
Checking for traditional termcap... not found
This package needs termcap to run.

So you probably need to depend on ncurses. Notice that the configure script doesn't return an error code here, so the build continues (and then fails later on).

Mhm, right.

Quoted 1 line

Are you testing this in some other tree than mainline?

Yes, it's a tree that has been grown up from 2009.08_rc2, and I've got a bunch of configuration that work with.
I should certainly consider getting a clean and correct config which works on top of the master branch (on which I cherry-pick my netkitftp tweaks ;))

It'll take me some more days,
I've got another bunch of things to do right now :(

But I'm still not discouraged ;o)

Quoted 15 lines

Hugues> +
Hugues> +# Netkitftp does not understands the INSTALL_PREFIX envvar, Hugues> +#?we have to use the --installroot configure option instead... Hugues> +NETKITFTP_CONF_OPT = --installroot=$(TARGET_DIR) \
Hugues> + --without-readline
Hugues> +NETKITFTP_INSTALL_TARGET_OPT = install
Hugues> +
Hugues> +$(eval $(call AUTOTARGETS,package,netkitftp)) Hugues> +
Hugues> +$(NETKITFTP_HOOK_POST_BUILD):
Hugues> + # The 'install' rule of netkitftp would install manpages, but the
Hugues> + #?folders generally do not exist on the TARGET_PATH, so we create
Hugues> + #?them in order to let 'make install' successfully perform.
Hugues> + mkdir -p $(TARGET_DIR)/usr/man/man1 $(TARGET_DIR)/usr/man/man5

Quoted 1 line

You still have odd unicode chars here.

Grr (against myself !).

Quoted 4 lines

You forgot to actually include the Config.in to package/Config.in, so the package cannot get selected.

Could you fix those issues please?

Oh yeah, no problem :)

Thanks you a lot for your patience...

Signature · 1 line
Hugues Hiegel                                [http://www.hiegel.fr/~hugues/]
#12 lore raw

PATCH 1/1 netkitftp: ftp client from netkit project

Quoted 3 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Hugues" == Hugues <[email protected]> writes:

Thanks, looks a lot better, but we're still not quite there yet.

Hugues> aha :-)

;)

Quoted 4 lines
Quoted 4 lines

It would be good if you could add a signed-of-by line to the end of the commit message - E.G.

Hugues> Well, perhaps should you be the really one who should answer me :
Hugues> what's the purpose of this "signed-off-by" !? :)

We're using the same system as the Linux kernel, so take a look at
section 12 of Documentation/SubmittingPatches in the kernel sources for
the details (http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=Documentation/SubmittingPatches)

With git it's very easy to do - Simply add the -s argument to git commit (or alternatively to git format-patch if you forgot while committing).

Hugues> + "Classic" ftp client with standard behaviour from

Quoted 2 lines
Quoted 2 lines

Trailing space.

Hugues> Argh, I *really* need to tweak my vim config to show these...

Not a big deal.

Quoted 3 lines
Quoted 3 lines

You'll also need to prepend netkitftp- to the patch names, as they will otherwise not get applied and configure errors out on unrecognized options.

Hugues> Mhm, it seemed to work correctly for me, I'll put another eye with more Hugues> coffee ...

Quoted 1 line
Quoted 1 line

Are you testing this in some other tree than mainline?

Hugues> Yes, it's a tree that has been grown up from 2009.08_rc2, and Hugues> I've got a bunch of configuration that work with. I should Hugues> certainly consider getting a clean and correct config which Hugues> works on top of the master branch (on which I cherry-pick my Hugues> netkitftp tweaks ;))

That probably explains why you are seeing different things. We afaik tightened up the patch handling since then to not apply *.patch* because of packages supporting multiple versions.

Hugues> It'll take me some more days,
Hugues> I've got another bunch of things to do right now :(

Hugues> But I'm still not discouraged ;o)

;)

Quoted 1 line
Quoted 1 line

Could you fix those issues please?

Hugues> Oh yeah, no problem :)

Great!

Hugues> Thanks you a lot for your patience...

Same to you.

Signature · 1 line
Bye, Peter Korsgaard