summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/ucslugc-packages.conf2
-rw-r--r--packages/gcc/gcc_3.4.4.bb5
-rw-r--r--packages/meta/ucslugc-packages.bb2
3 files changed, 8 insertions, 1 deletions
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf
index fcdb8a3a7d..3e4fcba26e 100644
--- a/conf/distro/ucslugc-packages.conf
+++ b/conf/distro/ucslugc-packages.conf
@@ -102,6 +102,7 @@ ${PKGDIR}/packages/ncftp/*.bb \
${PKGDIR}/packages/ncurses/*.bb \
${PKGDIR}/packages/netbase/*.bb \
${PKGDIR}/packages/netpbm/*.bb \
+${PKGDIR}/packages/nmap/*.bb \
${PKGDIR}/packages/ntp/*.bb \
${PKGDIR}/packages/obexftp/*.bb \
${PKGDIR}/packages/openldap/*.bb \
@@ -150,6 +151,7 @@ ${PKGDIR}/packages/update-modules/*.bb \
${PKGDIR}/packages/update-rc.d/*.bb \
${PKGDIR}/packages/upslug/*.bb \
${PKGDIR}/packages/util-linux/*.bb \
+${PKGDIR}/packages/vim/*.bb \
${PKGDIR}/packages/vlan/*.bb \
${PKGDIR}/packages/wakelan/*.bb \
${PKGDIR}/packages/wget/*.bb \
diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb
index 4d1e8fca63..e34eaf717c 100644
--- a/packages/gcc/gcc_3.4.4.bb
+++ b/packages/gcc/gcc_3.4.4.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
@@ -9,6 +9,9 @@ inherit autotools gettext
include gcc-package.inc
+# At present the thumb implementation is non-functional
+ARM_INSTRUCTION_SET = ""
+
SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://gcc34-reverse-compare.patch;patch=1 \
file://gcc34-arm-ldm.patch;patch=1 \
diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb
index 55fc193037..d69e873fe2 100644
--- a/packages/meta/ucslugc-packages.bb
+++ b/packages/meta/ucslugc-packages.bb
@@ -83,6 +83,7 @@ UCSLUGC_PACKAGES = "\
ncftp \
ncurses \
netpbm \
+ nmap \
ntp \
obexftp openobex openobex-apps ircp \
openldap \
@@ -116,6 +117,7 @@ UCSLUGC_PACKAGES = "\
tiff \
unionfs-modules unionfs-utils \
util-linux \
+ vim \
vlan \
wakelan \
wget \