summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/slugos-packages.conf3
-rw-r--r--packages/meta/slugos-image.bb7
-rw-r--r--packages/meta/slugos-packages.bb3
3 files changed, 12 insertions, 1 deletions
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index 57743c670f..8692945243 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -33,6 +33,7 @@ ${PKGDIR}/packages/db/*.bb \
${PKGDIR}/packages/dbus/*.bb \
${PKGDIR}/packages/devio/*.bb \
${PKGDIR}/packages/device-mapper/*.bb \
+${PKGDIR}/packages/devlabel/*.bb \
${PKGDIR}/packages/diffstat/*.bb \
${PKGDIR}/packages/diffutils/*.bb \
${PKGDIR}/packages/dnsmasq/*.bb \
@@ -40,6 +41,7 @@ ${PKGDIR}/packages/docbook-utils/*.bb \
${PKGDIR}/packages/dropbear/*.bb \
${PKGDIR}/packages/dsniff/*.bb \
${PKGDIR}/packages/e2fsprogs/*.bb \
+${PKGDIR}/packages/e2fsprogs-libs/*.bb \
${PKGDIR}/packages/expat/*.bb \
${PKGDIR}/packages/ez-ipupdate/*.bb \
${PKGDIR}/packages/fakeroot/*.bb \
@@ -226,5 +228,6 @@ ${PKGDIR}/packages/xinetd/*.bb \
${PKGDIR}/packages/xproto/*.bb \
${PKGDIR}/packages/xtrans/*.bb \
${PKGDIR}/packages/zd1211/*.bb \
+${PKGDIR}/packages/zip/*.bb \
${PKGDIR}/packages/zlib/*.bb \
${SLUGOS_EXTRA_BBFILES}"
diff --git a/packages/meta/slugos-image.bb b/packages/meta/slugos-image.bb
index 80a8ada1e5..fb004d8900 100644
--- a/packages/meta/slugos-image.bb
+++ b/packages/meta/slugos-image.bb
@@ -7,7 +7,7 @@ DESCRIPTION = "Generic SlugOS image"
MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r21"
+PR = "r22"
# SLUGOS_IMAGENAME defines the name of the image to be build, if it
# is not set this package will be skipped!
@@ -82,6 +82,11 @@ RDEPENDS = "kernel ixp-eth \
ipkg-collateral ipkg ipkg-link \
portmap \
dropbear \
+ util-linux-fdisk \
+ util-linux-mount \
+ util-linux-umount \
+ util-linux-swaponoff \
+ util-linux-losetup \
${SLUGOS_SUPPORT} \
${SLUGOS_KERNEL} \
${SLUGOS_EXTRA_RDEPENDS}"
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 7be79681db..4aabba6ea6 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -43,10 +43,12 @@ SLUGOS_PACKAGES = "\
cyrus-imapd \
cyrus-sasl \
db \
+ devlabel \
diffstat \
diffutils \
dnsmasq \
e2fsprogs \
+ e2fsprogs-libs \
expat \
ez-ipupdate \
fetchmail \
@@ -153,6 +155,7 @@ SLUGOS_PACKAGES = "\
wireless-tools \
wpa-supplicant \
zd1211 \
+ zip \
zlib \
"