[oe-commits] org.oe.dev merge of '046d6d9432d8b2f9c1768927b44311f32da334f0'
crofton commit
openembedded-commits at lists.openembedded.org
Sun Aug 26 14:04:24 UTC 2007
merge of '046d6d9432d8b2f9c1768927b44311f32da334f0'
and '641c0ed5d9b91d2a89f0918ddfbd5c0a67eee6a9'
Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: a62d50d1376551d7ad4d774f00eeb8e6f0be4f12
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a62d50d1376551d7ad4d774f00eeb8e6f0be4f12
Files:
1
packages/libnetfilter-queue/libnetfilter-queue_0.0.13.bb
packages/sane-backends
packages/sane
packages/olsrd/files/unbreak-makefile.patch
packages/olsrd/olsrd_0.5.3.bb
packages/sane/sane-frontends_1.0.13.bb
packages/olsrd/olsrd.inc
packages/sane/sane-backends_1.0.17.bb
Diffs:
#
# mt diff -r046d6d9432d8b2f9c1768927b44311f32da334f0 -ra62d50d1376551d7ad4d774f00eeb8e6f0be4f12
#
#
#
# patch "packages/libnetfilter-queue/libnetfilter-queue_0.0.13.bb"
# from [04a37192b82f73eec2eb554a8eaea7576453863a]
# to [344ad26bbacd4a898b2969f8b3ce10e54fe4af76]
#
============================================================
--- packages/libnetfilter-queue/libnetfilter-queue_0.0.13.bb 04a37192b82f73eec2eb554a8eaea7576453863a
+++ packages/libnetfilter-queue/libnetfilter-queue_0.0.13.bb 344ad26bbacd4a898b2969f8b3ce10e54fe4af76
@@ -10,7 +10,7 @@ PR = "r0"
# This package requires libtool-cross-1.5.24 which is not the default libtool
# used by OE (25AUG2007)
-DEPENDS = "libnfnetlink"
+DEPENDS = "libnfnetlink libtool-cross (>=1.5.24)"
SRC_URI = "http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-${PV}.tar.bz2"
#
# mt diff -r641c0ed5d9b91d2a89f0918ddfbd5c0a67eee6a9 -ra62d50d1376551d7ad4d774f00eeb8e6f0be4f12
#
#
#
# rename "packages/sane-backends"
# to "packages/sane"
#
# add_file "packages/olsrd/files/unbreak-makefile.patch"
# content [7a33293374adb238b88f2f43ce21188b7226edb6]
#
# add_file "packages/olsrd/olsrd_0.5.3.bb"
# content [203f63fd7ae86bd25144c1ddac0872e5117eea3f]
#
# add_file "packages/sane/sane-frontends_1.0.13.bb"
# content [5388e62703a19444fc54e8d0037a6d2ed1476728]
#
# patch "packages/olsrd/olsrd.inc"
# from [b541707aede39615aeb70297d1a63f4e3b61979e]
# to [8f56b9aa91c3eb5463c0db445070be3b92c2f6e9]
#
# patch "packages/sane/sane-backends_1.0.17.bb"
# from [07b6cc439e8848fef052730e4a858171c6bda4ae]
# to [da2359e6844078fb17b8c43ac97237b291394592]
#
============================================================
--- packages/olsrd/files/unbreak-makefile.patch 7a33293374adb238b88f2f43ce21188b7226edb6
+++ packages/olsrd/files/unbreak-makefile.patch 7a33293374adb238b88f2f43ce21188b7226edb6
@@ -0,0 +1,45 @@
+--- /tmp/Makefile 2007-08-26 13:59:42.264688053 +0200
++++ olsrd-0.5.3/Makefile 2007-08-26 14:02:46.059161904 +0200
+@@ -89,9 +89,8 @@
+ install: install_olsrd
+
+ install_bin:
+- mkdir -p $(SBINDIR)
+- install -m 755 $(EXENAME) $(SBINDIR)
+- $(STRIP) $(SBINDIR)/$(EXENAME)
++ mkdir -p $(INSTALL_PREFIX)$(SBINDIR)
++ install -m 755 $(EXENAME) $(INSTALL_PREFIX)$(SBINDIR)
+
+ install_olsrd: install_bin
+ @echo ========= C O N F I G U R A T I O N - F I L E ============
+@@ -100,16 +99,16 @@
+ @echo configfile can be installed. Note that a LQ-based configfile
+ @echo can be found at files/olsrd.conf.default.lq
+ @echo ==========================================================
+- mkdir -p $(ETCDIR)
++ mkdir -p $(INSTALL_PREFIX)$(ETCDIR)
+ -cp -i files/olsrd.conf.default.rfc $(CFGFILE)
+ @echo -------------------------------------------
+ @echo Edit $(CFGFILE) before running olsrd!!
+ @echo -------------------------------------------
+ @echo Installing manpages olsrd\(8\) and olsrd.conf\(5\)
+- mkdir -p $(MANDIR)/man8/
+- cp files/olsrd.8.gz $(MANDIR)/man8/olsrd.8.gz
+- mkdir -p $(MANDIR)/man5/
+- cp files/olsrd.conf.5.gz $(MANDIR)/man5/olsrd.conf.5.gz
++ mkdir -p $(INSTALL_PREFIX)$(MANDIR)/man8/
++ cp files/olsrd.8.gz $(INSTALL_PREFIX)$(MANDIR)/man8/olsrd.8.gz
++ mkdir -p $(INSTALL_PREFIX)$(MANDIR)/man5/
++ cp files/olsrd.conf.5.gz $(INSTALL_PREFIX)$(MANDIR)/man5/olsrd.conf.5.gz
+
+ tags:
+ $(TAGCMD) -o $(TAGFILE) $(TAG_SRCS)
+@@ -131,7 +130,7 @@
+ $(MAKECMD) -C lib LIBDIR=$(LIBDIR) clean
+
+ libs_install install_libs:
+- $(MAKECMD) -C lib LIBDIR=$(LIBDIR) install
++ $(MAKECMD) -C lib LIBDIR=$(INSTALL_PREFIX)$(LIBDIR) install
+
+ httpinfo:
+ $(MAKECMD) -C lib/httpinfo clean
============================================================
--- packages/olsrd/olsrd_0.5.3.bb 203f63fd7ae86bd25144c1ddac0872e5117eea3f
+++ packages/olsrd/olsrd_0.5.3.bb 203f63fd7ae86bd25144c1ddac0872e5117eea3f
@@ -0,0 +1,14 @@
+require olsrd.inc
+PR = "r0"
+
+SRC_URI="http://www.olsr.org/releases/0.5/olsrd-${PV}.tar.bz2 \
+ file://init \
+ file://olsrd.conf \
+ file://unbreak-makefile.patch;patch=1"
+
+do_compile() {
+ oe_runmake OS=linux clean
+ touch .depend
+ touch src/cfgparser/.depend
+ oe_runmake OS=linux all libs
+}
============================================================
--- packages/sane/sane-frontends_1.0.13.bb 5388e62703a19444fc54e8d0037a6d2ed1476728
+++ packages/sane/sane-frontends_1.0.13.bb 5388e62703a19444fc54e8d0037a6d2ed1476728
@@ -0,0 +1,20 @@
+DESCRIPTION = "Frontends for SANE"
+DEPENDS = "virtual/libx11 gimp sane-backends"
+LICENSE = "LGPL"
+
+PR = "r0"
+
+SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-frontends-${PV}/sane-frontends-${PV}.tar.gz \
+ "
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-translations"
+
+PACKAGES =+ "scanadf xcam xscanimage"
+
+FILES_scanadf = "${bindir}/scanadf"
+FILES_xcam = "${bindir}/xcam"
+FILES_xscanimage = "${bindir}/xscanimage ${datadir}/sane"
+
+
============================================================
--- packages/olsrd/olsrd.inc b541707aede39615aeb70297d1a63f4e3b61979e
+++ packages/olsrd/olsrd.inc 8f56b9aa91c3eb5463c0db445070be3b92c2f6e9
@@ -1,18 +1,14 @@ LICENSE = "BSD"
DESCRIPTION = "OLSR mesh routing daemon"
HOMEPAGE = "http://www.olsr.org"
DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon - optional libraries"
SECTION = "console/network"
PRIORITY = "optional"
LICENSE = "BSD"
-RDEPENDS_olsrd = "olsrd-libs"
SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \
file://init \
file://olsrd.conf"
-PACKAGES =+ "olsrd-libs"
-FILES_olsrd-libs = "${libdir}"
-
S = "${WORKDIR}/olsrd-${PV}"
inherit update-rc.d
@@ -27,14 +23,20 @@ do_compile() {
}
do_compile() {
- oe_runmake
+ oe_runmake
}
do_install () {
- oe_runmake OS=linux INSTALL_PREFIX=${D} install install_libs
+ oe_runmake OS=linux INSTALL_PREFIX=${D} STRIP=echo install install_libs
install -d ${D}/${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/olsrd
install -m 644 ${WORKDIR}/olsrd.conf ${D}/${sysconfdir}
}
+
+PACKAGES =+ "olsrd-libs"
+FILES_olsrd-libs = "${libdir}/*.so.*"
+
+RDEPENDS_${PN} = "olsrd-libs"
+
CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"
============================================================
--- packages/sane/sane-backends_1.0.17.bb 07b6cc439e8848fef052730e4a858171c6bda4ae
+++ packages/sane/sane-backends_1.0.17.bb da2359e6844078fb17b8c43ac97237b291394592
@@ -1,15 +1,15 @@ LICENSE = "LGPL"
DESCRIPTION = "Scanner drivers for SANE"
DEPENDS = "gphoto2 jpeg libusb"
LICENSE = "LGPL"
-PR = "r0"
+PR = "r2"
SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-${PV}/sane-backends-${PV}.tar.gz \
file://Makefile.in.patch;patch=1 \
file://saned.xinetd \
"
-inherit autotools
+inherit autotools pkgconfig binconfig
EXTRA_OECONF = "--disable-translations"
@@ -26,7 +26,7 @@ RRECOMMENDS_saned = "xinetd"
FILES_libsane-dev += "${libdir}/sane/*"
RRECOMMENDS_saned = "xinetd"
-FILES_saned = "i${sbindir}/saned"
+FILES_saned = "${sbindir}/saned"
FILES_sane-utils = "${bindir}/*"
FILES_${PN}-dbg += "${libdir}/sane/.debug"
@@ -34,3 +34,9 @@ CONFFILES_libsane = "${sysconfdir}/sane.
CONFFILES_libsane = "${sysconfdir}/sane.d/abaton.conf ${sysconfdir}/sane.d/agfafocus.conf ${sysconfdir}/sane.d/apple.conf ${sysconfdir}/sane.d/artec.conf ${sysconfdir}/sane.d/avision.conf ${sysconfdir}/sane.d/bh.conf ${sysconfdir}/sane.d/canon.conf ${sysconfdir}/sane.d/canon630u.conf ${sysconfdir}/sane.d/coolscan.conf ${sysconfdir}/sane.d/coolscan2.conf ${sysconfdir}/sane.d/dc25.conf ${sysconfdir}/sane.d/dmc.conf ${sysconfdir}/sane.d/epson.conf ${sysconfdir}/sane.d/fujitsu.conf ${sysconfdir}/sane.d/gt68xx.conf ${sysconfdir}/sane.d/hp.conf ${sysconfdir}/sane.d/leo.conf ${sysconfdir}/sane.d/matsushita.conf ${sysconfdir}/sane.d/microtek.conf ${sysconfdir}/sane.d/microtek2.conf ${sysconfdir}/sane.d/mustek.conf ${sysconfdir}/sane.d/mustek_usb.conf ${sysconfdir}/sane.d/nec.conf ${sysconfdir}/sane.d/pie.conf ${sysconfdir}/sane.d/plustek.conf ${sysconfdir}/sane.d/plustek_pp.conf ${sysconfdir}/sane.d/ricoh.conf ${sysconfdir}/sane.d/s9036.conf ${sysconfdir}/sane.d/sceptre.conf ${sysconfdir}/sane.d/sharp.conf ${sysconfdir}/sane.d/sp15c.conf ${sysconfdir}/sane.d/st400.conf ${sysconfdir}/sane.d/tamarack.conf ${sysconfdir}/sane.d/test.conf ${sysconfdir}/sane.d/teco1.conf ${sysconfdir}/sane.d/teco2.conf ${sysconfdir}/sane.d/teco3.conf ${sysconfdir}/sane.d/umax.conf ${sysconfdir}/sane.d/umax_pp.conf ${sysconfdir}/sane.d/umax1220u.conf ${sysconfdir}/sane.d/artec_eplus48u.conf ${sysconfdir}/sane.d/ma1509.conf ${sysconfdir}/sane.d/ibm.conf ${sysconfdir}/sane.d/hp5400.conf ${sysconfdir}/sane.d/u12.conf ${sysconfdir}/sane.d/snapscan.conf ${sysconfdir}/sane.d/dc210.conf ${sysconfdir}/sane.d/dc240.conf ${sysconfdir}/sane.d/gphoto2.conf ${sysconfdir}/sane.d/qcam.conf ${sysconfdir}/sane.d/v4l.conf ${sysconfdir}/sane.d/net.conf ${sysconfdir}/sane.d/dll.conf ${sysconfdir}/sane.d/saned.conf"
+do_stage() {
+ autotools_stage_all
+}
+
+
+
More information about the Openembedded-commits
mailing list