git.openpandora.org / openembedded.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ee908e d56e294)
merge of 121ddca6013972dd4ad8d52c0eece2b80188cff9
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 31 Jul 2005 17:46:29 +0000 (17:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 31 Jul 2005 17:46:29 +0000 (17:46 +0000)
     and 214e28220f1a269af25029de6f726b7883040283

1  2 
conf/distro/openslug-packages.conf patch | diff1 | diff2 | blob | history
packages/meta/openslug-packages.bb patch | diff1 | diff2 | blob | history

diff --cc conf/distro/openslug-packages.conf
Simple merge
diff --cc packages/meta/openslug-packages.bb
index ac8c0db,2c2b17e..a1e8e59
--- 1/packages/meta/openslug-packages.bb
--- 2/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@@ -113,9 -115,7 +117,10 @@@ OPENSLUG_PACKAGES_append_linux = "
        libpam \
        php \
        postfix \
 +      psmisc \
 +      screen \
 +      streamripper \
+       timezones \
        xinetd \
        yp-tools ypbind ypserv \
        "
Clone of mainline OpenEmbedded repository