summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/openwrt-sdk.conf4
-rw-r--r--packages/bvi/bvi-1.3.1/no-strip.patch13
-rw-r--r--packages/bvi/bvi_1.3.1.bb4
-rw-r--r--packages/joe/joe_3.1.bb4
4 files changed, 23 insertions, 2 deletions
diff --git a/conf/distro/openwrt-sdk.conf b/conf/distro/openwrt-sdk.conf
index 92e5ac5b39..0646b17f90 100644
--- a/conf/distro/openwrt-sdk.conf
+++ b/conf/distro/openwrt-sdk.conf
@@ -20,10 +20,14 @@ require conf/distro/generic-uclibc.conf
DISTRO_NAME = "OpenWRT"
DISTRO_REVISION = "2"
+# Build ipk's wrapped with tar.gz instead of ar, like OpenWRT has them
IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
# This is what lives in SDK
ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
+# Rename packages to names used in OpenWRT
+PKG_ncurses = "libncurses"
+
# Make sure that we have correct package dependencies for SDK-provided libs.
ASSUME_SHLIBS += "libc.so.0:uclibc libm.so.0:uclibc libgcc_s.so.1:libgcc"
diff --git a/packages/bvi/bvi-1.3.1/no-strip.patch b/packages/bvi/bvi-1.3.1/no-strip.patch
new file mode 100644
index 0000000000..520b058ea0
--- /dev/null
+++ b/packages/bvi/bvi-1.3.1/no-strip.patch
@@ -0,0 +1,13 @@
+--- 1/Makefile.in.org 2001-12-25 15:37:37.000000000 +0200
++++ 1/Makefile.in 2008-02-20 02:54:56.000000000 +0200
+@@ -63,8 +63,8 @@
+ install: all installdirs
+ @echo "Installing bvi"
+ @$(INSTALL_DATA) bvi.1 bmore.1 $(man1dir)
+- @$(INSTALL_PROGRAM) -s bvi $(bindir)
+- @$(INSTALL_PROGRAM) -s bmore $(bindir)
++ @$(INSTALL_PROGRAM) bvi $(bindir)
++ @$(INSTALL_PROGRAM) bmore $(bindir)
+ @$(INSTALL_DATA) bmore.help $(datadir)
+ @if [ -f $(bindir)/bview ]; then rm $(bindir)/bview; fi
+ @if [ -f $(bindir)/bvedit ]; then rm $(bindir)/bvedit; fi
diff --git a/packages/bvi/bvi_1.3.1.bb b/packages/bvi/bvi_1.3.1.bb
index 8e7a8adbe9..b6525aad88 100644
--- a/packages/bvi/bvi_1.3.1.bb
+++ b/packages/bvi/bvi_1.3.1.bb
@@ -3,9 +3,11 @@ DESCRIPTION = "binary vi (binary file editor)"
SECTION = "console/utils"
DEPENDS = "ncurses"
LICENSE = "GPL"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/bvi/bvi-${PV}.src.tar.gz \
file://configure.patch;patch=1 \
- file://compile.patch;patch=1"
+ file://compile.patch;patch=1 \
+ file://no-strip.patch;patch=1"
inherit autotools
diff --git a/packages/joe/joe_3.1.bb b/packages/joe/joe_3.1.bb
index 31050477b8..d2f2aa6ad2 100644
--- a/packages/joe/joe_3.1.bb
+++ b/packages/joe/joe_3.1.bb
@@ -1,6 +1,8 @@
SECTION = "console/utils"
-DESCRIPTION = "Joe's own editor."
+DESCRIPTION = "Console text editor with good functionality, good choice for vi-haters."
+HOMEPAGE = "http://joe-editor.sourceforge.net/"
LICENSE ="GPL"
SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz"
+PR = "r1"
inherit autotools