diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | conf/distro/openwrt-sdk.conf | 5 | ||||
| -rw-r--r-- | packages/nut/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/nut/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/nut/files/libm.patch | 21 | ||||
| -rw-r--r-- | packages/nut/nut_2.2.1.bb | 14 |
6 files changed, 40 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c11f463a98..e7016392ea 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -162,7 +162,7 @@ Mail: pmiscml@gmail.com Machines: h3900, h4000, hx4700 Interests: PocketPC and Palm devices support, Win32 support Interests: Cross-machine unification -Recipes: linux-handhelds-2.6, opie-* +Recipes: linux-handhelds-2.6, opie-*, initramfs-*, gnome-mplayer Person: Philip Balister Mail: Crofton@balister.org diff --git a/conf/distro/openwrt-sdk.conf b/conf/distro/openwrt-sdk.conf index fc760f9ea0..92e5ac5b39 100644 --- a/conf/distro/openwrt-sdk.conf +++ b/conf/distro/openwrt-sdk.conf @@ -18,9 +18,12 @@ require conf/distro/generic-uclibc.conf # Header # DISTRO_NAME = "OpenWRT" +DISTRO_REVISION = "2" + +IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0" # This is what lives in SDK ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc" # Make sure that we have correct package dependencies for SDK-provided libs. -ASSUME_SHLIBS += "libc.so.0:uclibc libgcc_s.so.1:libgcc" +ASSUME_SHLIBS += "libc.so.0:uclibc libm.so.0:uclibc libgcc_s.so.1:libgcc" diff --git a/packages/nut/.mtn2git_empty b/packages/nut/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/nut/.mtn2git_empty diff --git a/packages/nut/files/.mtn2git_empty b/packages/nut/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/nut/files/.mtn2git_empty diff --git a/packages/nut/files/libm.patch b/packages/nut/files/libm.patch new file mode 100644 index 0000000000..658d42face --- /dev/null +++ b/packages/nut/files/libm.patch @@ -0,0 +1,21 @@ +--- a/drivers/Makefile.am.org 2007-10-01 16:06:24.000000000 +0300 ++++ a/drivers/Makefile.am 2008-01-09 02:13:09.000000000 +0200 +@@ -125,7 +125,7 @@ + tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) -lm + + bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c nut_usb.c +-bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) ++bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) -lm + + megatec_usb_SOURCES = megatec.c megatec_usb.c libusb.c + megatec_usb_CFLAGS = $(AM_CFLAGS) -DMEGATEC_SUBDRV +--- a/drivers/Makefile.am.org 2008-01-09 02:14:32.000000000 +0200 ++++ a/drivers/Makefile.am 2008-01-09 02:17:37.000000000 +0200 +@@ -67,6 +67,7 @@ + al175_SOURCES = al175.c + apcsmart_SOURCES = apcsmart.c + bcmxcp_SOURCES = bcmxcp.c bcmxcp_ser.c ++bcmxcp_LDADD = $(LDADD) -lm + belkin_SOURCES = belkin.c + belkinunv_SOURCES = belkinunv.c + bestfcom_SOURCES = bestfcom.c diff --git a/packages/nut/nut_2.2.1.bb b/packages/nut/nut_2.2.1.bb new file mode 100644 index 0000000000..db3367435d --- /dev/null +++ b/packages/nut/nut_2.2.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Network UPS Tools" +LICENSE = "GPL" +DEPENDS = "libusb" +PR = "r1" + +inherit autotools + +EXTRA_OECONF = "--with-usb" + +SRC_URI = "http://www.networkupstools.org/source/2.2/nut-${PV}.tar.gz \ + file://libm.patch;patch=1 \ + " + +FILES_${PN} += "${datadir}/" |