[oe-commits] org.oe.dev merge of '3a7743fc01171dc57c6955f1ffe9b6701dc58576'

[mickeyl commit]

merge of '3a7743fc01171dc57c6955f1ffe9b6701dc58576'
     and 'a495e9cb4d40b047ae63d8cd7818e278baad8881'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 5242f08e5988cfd722cc7096bde23b7a64ffa164
ViewMTN: http://monotone.openembedded.org/revision/info/5242f08e5988cfd722cc7096bde23b7a64ffa164
Files:
1
packages/libol/libol_0.3.16.bb
packages/starling/starling_0.1.bb
packages/starling/starling_0.2.bb
packages/aircrack/aircrack-ng_0.9.1.bb
packages/aircrack/aircrack-ng_0.9.3.bb
packages/libol/libol_0.3.18.bb
packages/starling/starling_svn.bb
packages/gtk-webcore/midori_0.0.17.bb
Diffs:

#
# mt diff -r3a7743fc01171dc57c6955f1ffe9b6701dc58576 -r5242f08e5988cfd722cc7096bde23b7a64ffa164
#
#
#
# delete "packages/libol/libol_0.3.16.bb"
# 
# delete "packages/starling/starling_0.1.bb"
# 
# delete "packages/starling/starling_0.2.bb"
# 
# rename "packages/aircrack/aircrack-ng_0.9.1.bb"
#     to "packages/aircrack/aircrack-ng_0.9.3.bb"
# 
# patch "packages/aircrack/aircrack-ng_0.9.3.bb"
#  from [59aa98881f86a89e00056ccb89caad4a4b1136c7]
#    to [8fe9a7ff831f58359845c754b510cf44b999d308]
# 
# patch "packages/libol/libol_0.3.18.bb"
#  from [a545d5692f51a931712602d69f586675ee7ac004]
#    to [9af4b21753afc6dd460268a2111b70af976f2911]
# 
# patch "packages/starling/starling_svn.bb"
#  from [41c225219a46f25d88d800d602cfc111847d3a8b]
#    to [f40a8f4868be867eb5dba875a0fc0615665b8452]
#
============================================================
--- packages/aircrack/aircrack-ng_0.9.1.bb	59aa98881f86a89e00056ccb89caad4a4b1136c7
+++ packages/aircrack/aircrack-ng_0.9.3.bb	8fe9a7ff831f58359845c754b510cf44b999d308
@@ -2,21 +2,21 @@ LICENSE = "GPLv2"
 HOMEPAGE = "http://www.aircrack-ng.org/"
 SECTION = "console/network"
 LICENSE = "GPLv2"
-PR = "r2"
+PR = "r0"
 
 SRC_URI = "http://download.aircrack-ng.org/aircrack-ng-${PV}.tar.gz"
 
+SBINFILES = "airodump-ng aireplay-ng airmon-ng airtun-ng"
+BINFILES = "aircrack-ng airdecap-ng packetforge-ng ivstools kstats makeivs"
+
 do_install() {
-        install -d ${D}/${sbindir}
+	install -d ${D}/${sbindir}
+	for i in ${SBINFILES}; do
+		install -m 0755 $i ${D}/${sbindir}
+	done
+
 	install -d ${D}/${bindir}
-        install -m 0755 airodump-ng       ${D}/${sbindir}
-        install -m 0755 aircrack-ng       ${D}/${bindir}
-        install -m 0755 aireplay-ng       ${D}/${sbindir}
-        install -m 0755 airdecap-ng       ${D}/${bindir}
-        install -m 0755 packetforge-ng    ${D}/${bindir}
-        install -m 0755 airmon-ng         ${D}/${sbindir}
-        install -m 0755 ivstools          ${D}/${bindir}
-	install -m 0755 kstats		  ${D}/${bindir}
-	install -m 0755 airtun-ng	  ${D}/${sbindir}
-	install -m 0755 makeivs 	  ${D}/${bindir}
+	for i in ${BINFILES}; do
+		install -m 0755 $i ${D}/${bindir}
+	done
 }
============================================================
--- packages/libol/libol_0.3.18.bb	a545d5692f51a931712602d69f586675ee7ac004
+++ packages/libol/libol_0.3.18.bb	9af4b21753afc6dd460268a2111b70af976f2911
@@ -1,14 +1,12 @@
-PR = "r7"
+DESCRIPTION = "A tiny C support library"
+SECTION = "libs"
+LICENSE = "GPL"
+PR = "r8"
 
 SRC_URI = "http://www.balabit.com/downloads/files/libol/0.3/${P}.tar.gz"
 
-S = "${WORKDIR}/${PN}-${PV}"
-
 inherit autotools binconfig
 
 do_stage() {
-        install -d ${STAGING_INCDIR}/libol
-        install -m 0755 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR}/
-        ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0
-        install ${S}/src/*.h ${STAGING_INCDIR}/libol/
+	autotools_stage_all
 }
============================================================
--- packages/starling/starling_svn.bb	41c225219a46f25d88d800d602cfc111847d3a8b
+++ packages/starling/starling_svn.bb	f40a8f4868be867eb5dba875a0fc0615665b8452
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 SECTION = "gpe/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup"
+DEPENDS = "gtk+ gstreamer gst-plugins-good gst-plugins-bad esound sqlite libsoup"
 RDEPENDS = "esd \
         gst-plugin-audioconvert \
         gst-plugin-esd \


#
# mt diff -ra495e9cb4d40b047ae63d8cd7818e278baad8881 -r5242f08e5988cfd722cc7096bde23b7a64ffa164
#
#
#
# add_file "packages/gtk-webcore/midori_0.0.17.bb"
#  content [3d8f7815947175065c2271654f26e21a970b8305]
#
============================================================
--- packages/gtk-webcore/midori_0.0.17.bb	3d8f7815947175065c2271654f26e21a970b8305
+++ packages/gtk-webcore/midori_0.0.17.bb	3d8f7815947175065c2271654f26e21a970b8305
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \
+           file://webkit-update.patch;patch=1"
+
+