diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 20:39:07 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 20:39:07 +0200 |
commit | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (patch) | |
tree | 10c726d162bc0ded85eb7aeacf8f246bd39ad63a /package/openobex | |
parent | bbd610f15a71b27c955175cb98392b114717fd47 (diff) |
optimize ipkg package management
- generate ipkg control file from PKG_* variables
- automatically install init scripts from ./files/*.init
set #PKG pkgname to set the binary package
- rename FWINIT -> INIT
- move postinst and conffiles meta data to ./files
- update the packages to the latest upstream version
- remove some unready or unused package (strongswan,..)
more cleanups needed after allmodconfig
Diffstat (limited to 'package/openobex')
-rw-r--r-- | package/openobex/Makefile | 13 | ||||
-rw-r--r-- | package/openobex/ipkg/openobex.control | 4 | ||||
-rw-r--r-- | package/openobex/patches/patch-configure | 64 |
3 files changed, 71 insertions, 10 deletions
diff --git a/package/openobex/Makefile b/package/openobex/Makefile index b1c94ee27..25cebd71a 100644 --- a/package/openobex/Makefile +++ b/package/openobex/Makefile @@ -6,18 +6,19 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openobex -PKG_VERSION:= 1.3 +PKG_VERSION:= 1.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= feaa5dfe5151c0e70e8f868fa4648a43 - -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=openobex/} +PKG_MD5SUM:= 0d83dc86445a46a1b9750107ba7ab65c +PKG_DESCR:= implementation of the Object Exchange (OBEX) protocol +PKG_SECTION:= bluetooth +PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/WikiStart +PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OPENOBEX,openobex,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OPENOBEX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu -CONFIGURE_ARGS+= PKG_CONFIG="" INSTALL_STYLE:= auto post-install: diff --git a/package/openobex/ipkg/openobex.control b/package/openobex/ipkg/openobex.control deleted file mode 100644 index 51805cdb8..000000000 --- a/package/openobex/ipkg/openobex.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: openobex -Priority: optional -Section: bluetooth -Description: Openobex diff --git a/package/openobex/patches/patch-configure b/package/openobex/patches/patch-configure new file mode 100644 index 000000000..33741baab --- /dev/null +++ b/package/openobex/patches/patch-configure @@ -0,0 +1,64 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- openobex-1.5.orig/configure 2009-02-08 19:32:25.000000000 +0100 ++++ openobex-1.5/configure 2009-05-30 14:32:22.786455567 +0200 +@@ -11270,60 +11270,6 @@ fi + + + +-if test $pkg_failed = yes; then +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libusb" 2>&1` +- else +- USB_PKG_ERRORS=`$PKG_CONFIG --print-errors "libusb" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$USB_PKG_ERRORS" >&5 +- +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-else +- USB_CFLAGS=$pkg_cv_USB_CFLAGS +- USB_LIBS=$pkg_cv_USB_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- usb_lib_found=yes +-fi +- as_ac_File=`$as_echo "ac_cv_file_${prefix}/lib/pkgconfig/libusb.pc" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for ${prefix}/lib/pkgconfig/libusb.pc" >&5 +-$as_echo_n "checking for ${prefix}/lib/pkgconfig/libusb.pc... " >&6; } +-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- test "$cross_compiling" = yes && +- { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +- { (exit 1); exit 1; }; } +-if test -r "${prefix}/lib/pkgconfig/libusb.pc"; then +- eval "$as_ac_File=yes" +-else +- eval "$as_ac_File=no" +-fi +-fi +-ac_res=`eval 'as_val=${'$as_ac_File'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_File'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- REQUIRES="libusb" +-fi + + ;; + esac |