diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/ixp425-eth/ixp425-eth_1.1.bb | 10 | ||||
| -rw-r--r-- | packages/meta/openslug-image.bb | 3 | ||||
| -rw-r--r-- | packages/meta/openslug-packages.bb | 10 |
3 files changed, 12 insertions, 11 deletions
diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb index a8be7757c3..84d037d330 100644 --- a/packages/ixp425-eth/ixp425-eth_1.1.bb +++ b/packages/ixp425-eth/ixp425-eth_1.1.bb @@ -8,7 +8,7 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPa file://intdriven.patch;patch=1 \ file://pollcontroller.patch;patch=1 \ file://mm4.patch;patch=1" -PR = "r6" +PR = "r7" S = "${WORKDIR}" @@ -32,11 +32,11 @@ KERNEL_CC += "${TARGET_CC_ARCH} -mno-thumb-interwork" # #addtask ixp425_c_patch_fetch after do_fetch before do_unpack -do_ixp425_c_patch_unpack () { - install -m 0644 ${DL_DIR}/ixp425_eth.c.patch ${WORKDIR}/ -} +#do_ixp425_c_patch_unpack () { +# install -m 0644 ${DL_DIR}/ixp425_eth.c.patch ${WORKDIR}/ +#} -addtask ixp425_c_patch_unpack after do_unpack before do_pre_patch +#addtask ixp425_c_patch_unpack after do_unpack before do_pre_patch do_pre_patch () { patcher -p 0 -i ixp425_eth_1_1_update_nf_bridge.patch diff --git a/packages/meta/openslug-image.bb b/packages/meta/openslug-image.bb index 6ab8bc73b5..c8c231d302 100644 --- a/packages/meta/openslug-image.bb +++ b/packages/meta/openslug-image.bb @@ -36,8 +36,7 @@ inherit image_ipk python () { # Don't build openslug images unless we're targeting an nslu2 mach = bb.data.getVar("MACHINE", d, 1) - dist = bb.data.getVar("DISTRO", d, 1) - if mach != 'nslu2' or dist != 'openslug': + if mach != 'nslu2': raise bb.parse.SkipPackage("OpenSlug only builds for the Linksys NSLU2") } LICENSE = MIT diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 7a62698dd0..09db2ad821 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -34,6 +34,7 @@ OPENSLUG_DEVELOPMENT = "\ pciutils \ quilt \ sed \ + strace \ util-linux \ " @@ -63,7 +64,6 @@ OPENSLUG_PACKAGES = "\ less \ libusb \ libxml2 \ - man \ man-pages \ miau \ microcom \ @@ -79,13 +79,10 @@ OPENSLUG_PACKAGES = "\ pcre \ ppp \ procps \ - psmisc \ puppy \ pwc \ rsync \ - screen \ setpwc \ - streamripper \ sudo \ sysfsutils \ thttpd \ @@ -109,12 +106,17 @@ OPENSLUG_PACKAGES = "\ # such as sinf.) OPENSLUG_PACKAGES_append_linux = "\ bind \ + man \ mgetty \ mpd \ nfs-utils \ libpam \ php \ postfix \ + psmisc \ + screen \ + streamripper \ + timezones \ xinetd \ yp-tools ypbind ypserv \ " |