From 62b6b808de09df06357be12e5692edc95c785200 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 4 Mar 2007 13:49:17 +0000 Subject: tzcode, tzdata: update to something that actually is fetchable, remove hardcoded paths, install binaries in correct staging dir and make sure we use the correct 'zic' --- packages/tzcode/tzcode-native_2007a.bb | 20 ----- packages/tzcode/tzcode-native_2007c.bb | 20 +++++ packages/tzdata/tzdata_2007a.bb | 158 --------------------------------- packages/tzdata/tzdata_2007c.bb | 156 ++++++++++++++++++++++++++++++++ 4 files changed, 176 insertions(+), 178 deletions(-) delete mode 100644 packages/tzcode/tzcode-native_2007a.bb create mode 100644 packages/tzcode/tzcode-native_2007c.bb delete mode 100644 packages/tzdata/tzdata_2007a.bb create mode 100644 packages/tzdata/tzdata_2007c.bb (limited to 'packages') diff --git a/packages/tzcode/tzcode-native_2007a.bb b/packages/tzcode/tzcode-native_2007a.bb deleted file mode 100644 index 1c6e2f59b8..0000000000 --- a/packages/tzcode/tzcode-native_2007a.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" - -PR = "r0" - -SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz \ - ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" - -S = "${WORKDIR}" - -inherit native - -do_stage () { - install -m 755 zic ${STAGING_BINDIR} - install -m 755 zdump ${STAGING_BINDIR} - install -m 755 tzselect ${STAGING_BINDIR} -} - -do_install () { - : -} diff --git a/packages/tzcode/tzcode-native_2007c.bb b/packages/tzcode/tzcode-native_2007c.bb new file mode 100644 index 0000000000..126658bd39 --- /dev/null +++ b/packages/tzcode/tzcode-native_2007c.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" + +PR = "r1" + +SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz \ + ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" + +S = "${WORKDIR}" + +inherit native + +do_stage () { + install -m 755 zic ${STAGING_BINDIR_NATIVE} + install -m 755 zdump ${STAGING_BINDIR_NATIVE} + install -m 755 tzselect ${STAGING_BINDIR_NATIVE} +} + +do_install () { + : +} diff --git a/packages/tzdata/tzdata_2007a.bb b/packages/tzdata/tzdata_2007a.bb deleted file mode 100644 index e5007e8310..0000000000 --- a/packages/tzdata/tzdata_2007a.bb +++ /dev/null @@ -1,158 +0,0 @@ -DESCRIPTION = "Timezone data" -SECTION = "base" -PRIORITY = "optional" -DEPENDS = "tzcode-native" - -PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ - tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ - tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" -RPROVIDES = "tzdata" -RCONFLICTS= "timezone-africa timezone-america timezone-antarctica \ - timezone-arctic timezone-asia timezone-atlantic \ - timezone-australia timezone-europe timezone-indian \ - timezone-iso3166.tab timezone-pacific timezone-zone.tab" - -PR = "r0" - -SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" - -S = "${WORKDIR}" - -TZONES= "africa antarctica asia australasia europe northamerica southamerica \ - factory solar87 solar88 solar89 etcetera backward systemv \ -# pacificnew \ - " - -do_compile () { - for zone in ${TZONES}; do \ - zic -d ${WORKDIR}/usr/share/zoneinfo -L /dev/null \ - -y ${S}/yearistype.sh ${S}/${zone} ; \ - zic -d ${WORKDIR}/usr/share/zoneinfo/posix -L /dev/null \ - -y ${S}/yearistype.sh ${S}/${zone} ; \ - zic -d ${WORKDIR}/usr/share/zoneinfo/right -L ${S}/leapseconds \ - -y ${S}/yearistype.sh ${S}/${zone} ; \ - done -} - -do_install () { - install -d ${D}/usr ${D}/usr/share ${D}/usr/share/zoneinfo - cp -pPR ${S}/usr ${D}/ -} - -# Packages primarily organized by directory with a major city -# in most time zones in the base package - -PACKAGES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ - tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ - tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" - -FILES_tzdata-africa += "/usr/share/zoneinfo/Africa/*" -RPROVIDES_tzdata-africa = "tzdata-africa" - -FILES_tzdata-americas += "/usr/share/zoneinfo/America/* \ - /usr/share/zoneinfo/US/* \ - /usr/share/zoneinfo/Brazil/* \ - /usr/share/zoneinfo/Canada/* \ - /usr/share/zoneinfo/Mexico/* \ - /usr/share/zoneinfo/Chile/*" -RPROVIDES_tzdata-americas = "tzdata-americas" - -FILES_tzdata-antarctica += "/usr/share/zoneinfo/Antarctica/*" -RPROVIDES_tzdata-antarctica = "tzdata-antarctica" - -FILES_tzdata-arctic += "/usr/share/zoneinfo/Arctic/*" -RPROVIDES_tzdata-arctic = "tzdata-arctic" - -FILES_tzdata-asia += "/usr/share/zoneinfo/Asia/* \ - /usr/share/zoneinfo/Indian/* \ - /usr/share/zoneinfo/Mideast/*" -RPROVIDES_tzdata-asia = "tzdata-asia" - -FILES_tzdata-atlantic += "/usr/share/zoneinfo/Atlantic/*" -RPROVIDES_tzdata-atlantic = "tzdata-atlantic" - -FILES_tzdata-australia += "/usr/share/zoneinfo/Australia/*" -RPROVIDES_tzdata-australia = "tzdata-australia" - -FILES_tzdata-europe += "/usr/share/zoneinfo/Europe/*" -RPROVIDES_tzdata-europe = "tzdata-europe" - -FILES_tzdata-pacific += "/usr/share/zoneinfo/Pacific/*" -RPROVIDES_tzdata-pacific = "tzdata-pacific" - -FILES_tzdata-posix += "/usr/share/zoneinfo/posix/*" -RPROVIDES_tzdata-posix = "tzdata-posix" - -FILES_tzdata-right += "/usr/share/zoneinfo/right/*" -RPROVIDES_tzdata-right = "tzdata-right" - - -FILES_tzdata-misc += "/usr/share/zoneinfo/Cuba \ - /usr/share/zoneinfo/Egypt \ - /usr/share/zoneinfo/Eire \ - /usr/share/zoneinfo/Factory \ - /usr/share/zoneinfo/GB-Eire \ - /usr/share/zoneinfo/Hongkong \ - /usr/share/zoneinfo/Iceland \ - /usr/share/zoneinfo/Iran \ - /usr/share/zoneinfo/Israel \ - /usr/share/zoneinfo/Jamaica \ - /usr/share/zoneinfo/Japan \ - /usr/share/zoneinfo/Kwajalein \ - /usr/share/zoneinfo/Libya \ - /usr/share/zoneinfo/Navajo \ - /usr/share/zoneinfo/Poland \ - /usr/share/zoneinfo/Portugal \ - /usr/share/zoneinfo/Singapore \ - /usr/share/zoneinfo/Turkey" -RPROVIDES_tzdata-misc = "tzdata-misc" - - -FILES_${PN} += "/usr/share/zoneinfo/Pacific/Honolulu \ - /usr/share/zoneinfo/America/Anchorage \ - /usr/share/zoneinfo/America/Los_Angeles \ - /usr/share/zoneinfo/America/Denver \ - /usr/share/zoneinfo/America/Chicago \ - /usr/share/zoneinfo/America/New_York \ - /usr/share/zoneinfo/America/Caracas \ - /usr/share/zoneinfo/America/Sao_Paulo \ - /usr/share/zoneinfo/Europe/London \ - /usr/share/zoneinfo/Europe/Paris \ - /usr/share/zoneinfo/Africa/Cairo \ - /usr/share/zoneinfo/Europe/Moscow \ - /usr/share/zoneinfo/Asia/Dubai \ - /usr/share/zoneinfo/Asia/Karachi \ - /usr/share/zoneinfo/Asia/Dhaka \ - /usr/share/zoneinfo/Asia/Bankok \ - /usr/share/zoneinfo/Asia/Hong_Kong \ - /usr/share/zoneinfo/Asia/Tokyo \ - /usr/share/zoneinfo/Australia/Sydney \ - /usr/share/zoneinfo/Pacific/Noumea \ - /usr/share/zoneinfo/CET \ - /usr/share/zoneinfo/CST6CDT \ - /usr/share/zoneinfo/EET \ - /usr/share/zoneinfo/EST \ - /usr/share/zoneinfo/EST5EDT \ - /usr/share/zoneinfo/GB \ - /usr/share/zoneinfo/GMT \ - /usr/share/zoneinfo/GMT+0 \ - /usr/share/zoneinfo/GMT-0 \ - /usr/share/zoneinfo/GMT0 \ - /usr/share/zoneinfo/Greenwich \ - /usr/share/zoneinfo/HST \ - /usr/share/zoneinfo/MET \ - /usr/share/zoneinfo/MST \ - /usr/share/zoneinfo/MST7MDT \ - /usr/share/zoneinfo/NZ \ - /usr/share/zoneinfo/NZ-CHAT \ - /usr/share/zoneinfo/PRC \ - /usr/share/zoneinfo/PST8PDT \ - /usr/share/zoneinfo/ROC \ - /usr/share/zoneinfo/ROK \ - /usr/share/zoneinfo/UCT \ - /usr/share/zoneinfo/UTC \ - /usr/share/zoneinfo/Universal \ - /usr/share/zoneinfo/W-SU \ - /usr/share/zoneinfo/WET \ - /usr/share/zoneinfo/Zulu \ - /usr/share/zoneinfo/Etc/*" diff --git a/packages/tzdata/tzdata_2007c.bb b/packages/tzdata/tzdata_2007c.bb new file mode 100644 index 0000000000..3b6c45502b --- /dev/null +++ b/packages/tzdata/tzdata_2007c.bb @@ -0,0 +1,156 @@ +DESCRIPTION = "Timezone data" +SECTION = "base" +PRIORITY = "optional" +DEPENDS = "tzcode-native" + +PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ + tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ + tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" +RPROVIDES = "tzdata" +RCONFLICTS= "timezone-africa timezone-america timezone-antarctica \ + timezone-arctic timezone-asia timezone-atlantic \ + timezone-australia timezone-europe timezone-indian \ + timezone-iso3166.tab timezone-pacific timezone-zone.tab" + +SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" + +S = "${WORKDIR}" + +TZONES= "africa antarctica asia australasia europe northamerica southamerica \ + factory solar87 solar88 solar89 etcetera backward systemv \ +# pacificnew \ + " + +do_compile () { + for zone in ${TZONES}; do \ + ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \ + -y ${S}/yearistype.sh ${S}/${zone} ; \ + ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \ + -y ${S}/yearistype.sh ${S}/${zone} ; \ + ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \ + -y ${S}/yearistype.sh ${S}/${zone} ; \ + done +} + +do_install () { + install -d ${D}/usr ${D}${datadir}/zoneinfo + cp -pPR ${S}/usr ${D}/ +} + +# Packages primarily organized by directory with a major city +# in most time zones in the base package + +PACKAGES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ + tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ + tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" + +FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*" +RPROVIDES_tzdata-africa = "tzdata-africa" + +FILES_tzdata-americas += "${datadir}/zoneinfo/America/* \ + ${datadir}/zoneinfo/US/* \ + ${datadir}/zoneinfo/Brazil/* \ + ${datadir}/zoneinfo/Canada/* \ + ${datadir}/zoneinfo/Mexico/* \ + ${datadir}/zoneinfo/Chile/*" +RPROVIDES_tzdata-americas = "tzdata-americas" + +FILES_tzdata-antarctica += "${datadir}/zoneinfo/Antarctica/*" +RPROVIDES_tzdata-antarctica = "tzdata-antarctica" + +FILES_tzdata-arctic += "${datadir}/zoneinfo/Arctic/*" +RPROVIDES_tzdata-arctic = "tzdata-arctic" + +FILES_tzdata-asia += "${datadir}/zoneinfo/Asia/* \ + ${datadir}/zoneinfo/Indian/* \ + ${datadir}/zoneinfo/Mideast/*" +RPROVIDES_tzdata-asia = "tzdata-asia" + +FILES_tzdata-atlantic += "${datadir}/zoneinfo/Atlantic/*" +RPROVIDES_tzdata-atlantic = "tzdata-atlantic" + +FILES_tzdata-australia += "${datadir}/zoneinfo/Australia/*" +RPROVIDES_tzdata-australia = "tzdata-australia" + +FILES_tzdata-europe += "${datadir}/zoneinfo/Europe/*" +RPROVIDES_tzdata-europe = "tzdata-europe" + +FILES_tzdata-pacific += "${datadir}/zoneinfo/Pacific/*" +RPROVIDES_tzdata-pacific = "tzdata-pacific" + +FILES_tzdata-posix += "${datadir}/zoneinfo/posix/*" +RPROVIDES_tzdata-posix = "tzdata-posix" + +FILES_tzdata-right += "${datadir}/zoneinfo/right/*" +RPROVIDES_tzdata-right = "tzdata-right" + + +FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba \ + ${datadir}/zoneinfo/Egypt \ + ${datadir}/zoneinfo/Eire \ + ${datadir}/zoneinfo/Factory \ + ${datadir}/zoneinfo/GB-Eire \ + ${datadir}/zoneinfo/Hongkong \ + ${datadir}/zoneinfo/Iceland \ + ${datadir}/zoneinfo/Iran \ + ${datadir}/zoneinfo/Israel \ + ${datadir}/zoneinfo/Jamaica \ + ${datadir}/zoneinfo/Japan \ + ${datadir}/zoneinfo/Kwajalein \ + ${datadir}/zoneinfo/Libya \ + ${datadir}/zoneinfo/Navajo \ + ${datadir}/zoneinfo/Poland \ + ${datadir}/zoneinfo/Portugal \ + ${datadir}/zoneinfo/Singapore \ + ${datadir}/zoneinfo/Turkey" +RPROVIDES_tzdata-misc = "tzdata-misc" + + +FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ + ${datadir}/zoneinfo/America/Anchorage \ + ${datadir}/zoneinfo/America/Los_Angeles \ + ${datadir}/zoneinfo/America/Denver \ + ${datadir}/zoneinfo/America/Chicago \ + ${datadir}/zoneinfo/America/New_York \ + ${datadir}/zoneinfo/America/Caracas \ + ${datadir}/zoneinfo/America/Sao_Paulo \ + ${datadir}/zoneinfo/Europe/London \ + ${datadir}/zoneinfo/Europe/Paris \ + ${datadir}/zoneinfo/Africa/Cairo \ + ${datadir}/zoneinfo/Europe/Moscow \ + ${datadir}/zoneinfo/Asia/Dubai \ + ${datadir}/zoneinfo/Asia/Karachi \ + ${datadir}/zoneinfo/Asia/Dhaka \ + ${datadir}/zoneinfo/Asia/Bankok \ + ${datadir}/zoneinfo/Asia/Hong_Kong \ + ${datadir}/zoneinfo/Asia/Tokyo \ + ${datadir}/zoneinfo/Australia/Sydney \ + ${datadir}/zoneinfo/Pacific/Noumea \ + ${datadir}/zoneinfo/CET \ + ${datadir}/zoneinfo/CST6CDT \ + ${datadir}/zoneinfo/EET \ + ${datadir}/zoneinfo/EST \ + ${datadir}/zoneinfo/EST5EDT \ + ${datadir}/zoneinfo/GB \ + ${datadir}/zoneinfo/GMT \ + ${datadir}/zoneinfo/GMT+0 \ + ${datadir}/zoneinfo/GMT-0 \ + ${datadir}/zoneinfo/GMT0 \ + ${datadir}/zoneinfo/Greenwich \ + ${datadir}/zoneinfo/HST \ + ${datadir}/zoneinfo/MET \ + ${datadir}/zoneinfo/MST \ + ${datadir}/zoneinfo/MST7MDT \ + ${datadir}/zoneinfo/NZ \ + ${datadir}/zoneinfo/NZ-CHAT \ + ${datadir}/zoneinfo/PRC \ + ${datadir}/zoneinfo/PST8PDT \ + ${datadir}/zoneinfo/ROC \ + ${datadir}/zoneinfo/ROK \ + ${datadir}/zoneinfo/UCT \ + ${datadir}/zoneinfo/UTC \ + ${datadir}/zoneinfo/Universal \ + ${datadir}/zoneinfo/W-SU \ + ${datadir}/zoneinfo/WET \ + ${datadir}/zoneinfo/Zulu \ + ${datadir}/zoneinfo/Etc/*" -- cgit v1.2.3 From 16020851cc3618f60c3b00933c0af42df1046db3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 4 Mar 2007 14:22:12 +0000 Subject: openmoko-session: autostart the gsm plugin now it has been converted to mb-panel 2 --- packages/openmoko-base/files/session | 2 +- packages/openmoko-base/openmoko-session_svn.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/files/session index 41bb8a2439..b2e7fd0a69 100644 --- a/packages/openmoko-base/files/session +++ b/packages/openmoko-base/files/session @@ -8,7 +8,7 @@ matchbox-desktop --icon-size 96 \ --titlefont sans-20:bold \ --bg img-tiled:/usr/share/themes/openmoko-standard/gtk-2.0/mokopanedwindow-upper-enclosing.png & # --bg col-gradient-vertical:#000000,#aaaaaa & -matchbox-panel --start-applets=showdesktop,systray,windowselector --end-applets=openmoko-panel-demo-simple,openmoko-panel-battery,openmoko-panel-clock & +matchbox-panel --start-applets=showdesktop,systray,windowselector --end-applets=openmoko-panel-demo-simple,openmoko-panel-battery,openmoko-panel-clock,openmoko-panel-gsm & #start some old-style panel plugins to get a keyboard and battery status mbinputmgr & diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb index 00e4ec6117..5f0a88cfbf 100644 --- a/packages/openmoko-base/openmoko-session_svn.bb +++ b/packages/openmoko-base/openmoko-session_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox session files for OpenMoko" SECTION = "openmoko/base" RDEPENDS = "matchbox gconf matchbox-applet-startup-monitor gtk-theme-clearlooks" PV = "0.0+svn${SRCDATE}" -PR = "r5" +PR = "r6" inherit openmoko-base -- cgit v1.2.3 From 976688f9e3a46c93892273268dffa7f7519a959f Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 4 Mar 2007 16:45:40 +0000 Subject: packages/{libmrss,libnxml}: Add two interesting libraries from Andrea Marchesini mrss is a simple RSS library which is suing curl and libnxml --- packages/libmrss/.mtn2git_empty | 0 packages/libmrss/libmrss_0.17.bb | 13 +++++++++++++ packages/libnxml/.mtn2git_empty | 0 packages/libnxml/libnxml_0.16.bb | 14 ++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 packages/libmrss/.mtn2git_empty create mode 100644 packages/libmrss/libmrss_0.17.bb create mode 100644 packages/libnxml/.mtn2git_empty create mode 100644 packages/libnxml/libnxml_0.16.bb (limited to 'packages') diff --git a/packages/libmrss/.mtn2git_empty b/packages/libmrss/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libmrss/libmrss_0.17.bb b/packages/libmrss/libmrss_0.17.bb new file mode 100644 index 0000000000..c2170fa09a --- /dev/null +++ b/packages/libmrss/libmrss_0.17.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "mRSS is a C library for parsing, writing and creating RSS (0.91, 0.92, 1.0, 2.0) files or streams" +LICENSE = "LGPL" +HOMEPAGE = "http://www2.autistici.org/bakunin//codes.php" + +DEPENDS = "libnxml curl" + +inherit autotools pkgconfig + +SRC_URI = "http://www2.autistici.org/bakunin//libmrss/libmrss-${PV}.tar.gz;md5sum=28d0e78d736748e67f25ad99456f10c3" + +do_stage() { + autotools_stage_all +} diff --git a/packages/libnxml/.mtn2git_empty b/packages/libnxml/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libnxml/libnxml_0.16.bb b/packages/libnxml/libnxml_0.16.bb new file mode 100644 index 0000000000..c798ff3405 --- /dev/null +++ b/packages/libnxml/libnxml_0.16.bb @@ -0,0 +1,14 @@ +HOMEPAGE = "http://www2.autistici.org/bakunin//codes.php" +DESCRIPTION = "nXML is a C library for parsing, writing and creating XML 1.0 and 1.1 files or streams. It supports utf-8, utf-16be and utf-16le, ucs-4 (1234, 4321, 2143, 2312)" +LICENSE = "LGPL" + +DEPENDS = "curl" + +inherit autotools pkgconfig + +SRC_URI = "http://www2.autistici.org/bakunin//libnxml/libnxml-${PV}.tar.gz;md5sum=85b6a42a9e17a23c01b2f2ed0ece0563" + + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From a40b604d81c16e649e3fbe7bf666b93a3f9de0e7 Mon Sep 17 00:00:00 2001 From: Rick Farina Date: Sun, 4 Mar 2007 20:40:57 +0000 Subject: packages/void11: Add void11 a hacking tool for wireless networks Patch from Rick Farina from bug #1939 --- packages/void11/.mtn2git_empty | 0 packages/void11/files/.mtn2git_empty | 0 packages/void11/files/oezc.patch | 112 +++++++++++++++++++++++++++++++++++ packages/void11/void11_0.2.0.bb | 26 ++++++++ 4 files changed, 138 insertions(+) create mode 100644 packages/void11/.mtn2git_empty create mode 100644 packages/void11/files/.mtn2git_empty create mode 100644 packages/void11/files/oezc.patch create mode 100644 packages/void11/void11_0.2.0.bb (limited to 'packages') diff --git a/packages/void11/.mtn2git_empty b/packages/void11/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/void11/files/.mtn2git_empty b/packages/void11/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/void11/files/oezc.patch b/packages/void11/files/oezc.patch new file mode 100644 index 0000000000..998f14c44e --- /dev/null +++ b/packages/void11/files/oezc.patch @@ -0,0 +1,112 @@ +diff -urN void11-0.2.0/console/Makefile void11-0.2.0-zc/console/Makefile +--- void11-0.2.0/console/Makefile 2004-01-08 05:05:56.000000000 -0500 ++++ void11-0.2.0-zc/console/Makefile 2007-03-04 12:47:44.000000000 -0500 +@@ -11,7 +11,6 @@ + + $(PROG): $(PROGOBJ) + $(CC) $(CFLAGS) $(PROGOBJ) $(LIB) -o $@ +- $(STRIP) $@ + + clean: + $(RM) $(PROGOBJ) $(PROG) *~ +diff -urN void11-0.2.0/console/void11_hopper void11-0.2.0-zc/console/void11_hopper +--- void11-0.2.0/console/void11_hopper 2003-03-14 22:25:02.000000000 -0500 ++++ void11-0.2.0-zc/console/void11_hopper 2007-03-04 12:50:20.000000000 -0500 +@@ -1,3 +1,8 @@ + #!/bin/sh ++iwconfig wlan0 essid test ++smallsleep 0.5 ++iwpriv wlan0 hostapd 1 ++smallsleep 0.5 + iwconfig wlan0 mode master +-while(true); do for i in $(seq 1 14); do iwconfig wlan0 channel $i; sleep 0.2; echo -n "$i. "; done; done 2>/dev/null ++#while(true); do for i in $(seq 1 14); do iwconfig wlan0 channel $i; sleep 0.2; echo -n "$i. "; done; done 2>/dev/null ++while(true); do for i in $(seq 1 11); do iwconfig wlan0 channel $i; smallsleep 0.2; echo -n "$i. "; done; done +diff -urN void11-0.2.0/lib/Makefile void11-0.2.0-zc/lib/Makefile +--- void11-0.2.0/lib/Makefile 2004-01-08 05:04:37.000000000 -0500 ++++ void11-0.2.0-zc/lib/Makefile 2007-03-04 13:19:18.000000000 -0500 +@@ -11,7 +11,7 @@ + + $(LIB): $(LIBOBJ) $(HEADER) + rm -f $@ || true +- gcc -shared -o $@ $(LIBOBJ) ++ ${CC} -shared -o $@ $(LIBOBJ) + + clean: + $(RM) $(PROGOBJ) $(LIBOBJ) $(LIB) *~ +diff -urN void11-0.2.0/Makefile void11-0.2.0-zc/Makefile +--- void11-0.2.0/Makefile 2004-01-08 06:49:00.000000000 -0500 ++++ void11-0.2.0-zc/Makefile 2007-03-04 13:13:58.000000000 -0500 +@@ -2,7 +2,7 @@ + + include $(VOID11_TOPDIR)/Rules.make + +-SUBDIRS = lib ++SUBDIRS = lib smallsleep + CONFIG = + + ifdef USECONSOLE +@@ -19,6 +19,9 @@ + lib: + @$(MAKE) -C $(VOID11_TOPDIR)/$@ -f Makefile VOID11_TOPDIR=$(VOID11_TOPDIR) + ++smallsleep: ++ @$(MAKE) -C $(VOID11_TOPDIR)/$@ -f Makefile VOID11_TOPDIR=$(VOID11_TOPDIR) ++ + console: lib + @$(MAKE) -C $(VOID11_TOPDIR)/$@ -f Makefile VOID11_TOPDIR=$(VOID11_TOPDIR) + +diff -urN void11-0.2.0/Rules.make void11-0.2.0-zc/Rules.make +--- void11-0.2.0/Rules.make 2004-01-08 05:03:40.000000000 -0500 ++++ void11-0.2.0-zc/Rules.make 2007-03-04 13:18:14.000000000 -0500 +@@ -11,5 +11,4 @@ + + MKDIR = mkdir -p + CP = cp -f +-STRIP = strip -x +-CC = gcc ++# CC = gcc +diff -urN void11-0.2.0/smallsleep/Makefile void11-0.2.0-zc/smallsleep/Makefile +--- void11-0.2.0/smallsleep/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ void11-0.2.0-zc/smallsleep/Makefile 2007-03-04 12:57:27.000000000 -0500 +@@ -0,0 +1,10 @@ ++CFLAGS = -g -O3 -Wall ++ ++all: smallsleep ++ ++smallsleep: smallsleep.c ++ $(CC) $(CFLAGS) smallsleep.c -o smallsleep ++ ++install: ++ install -d /sbin ++ install -m 755 smallsleep /sbin +diff -urN void11-0.2.0/smallsleep/smallsleep.c void11-0.2.0-zc/smallsleep/smallsleep.c +--- void11-0.2.0/smallsleep/smallsleep.c 1969-12-31 19:00:00.000000000 -0500 ++++ void11-0.2.0-zc/smallsleep/smallsleep.c 2007-03-04 12:57:27.000000000 -0500 +@@ -0,0 +1,26 @@ ++#include // for usleep ++#include // for printf() ++#include // for atof() ++ ++/* compile with ++gcc -g -Wall -o smallsleep smallsleep.c ++*/ ++ ++#define MICROSECONDS_IN_SECONDS 1000000 ++ ++int main (int argc, const char *argv[]) ++{ ++ if (argc != 2) { ++ fprintf (stderr, "usage: %s time-in-seconds\n", argv[0]); ++ fprintf (stderr, " (decimal values are OK for the time)\n"); ++ return (1); ++ } ++ ++ float fraction; ++ fraction = atof (argv[1]); ++ ++ usleep (fraction * MICROSECONDS_IN_SECONDS); ++ ++ return (0); ++ ++} // main diff --git a/packages/void11/void11_0.2.0.bb b/packages/void11/void11_0.2.0.bb new file mode 100644 index 0000000000..2f4d5f2af9 --- /dev/null +++ b/packages/void11/void11_0.2.0.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "void11" +HOMEPAGE = "http://www.wlsec.net/void11" +SECTION = "console/network" +LICENSE = "GPL" +FILES_${PN} += "${libdir}/libvoid11.so" + +SRC_URI = "http://www.wirelessdefence.org/Contents/Files/void11-0.2.0.tar.bz2;md5sum=1c5b3e3e70916de74c2932c7f3e46d9e \ + http://hostap.epitest.fi/releases/hostapd-0.1.3.tar.gz;md5sum=54563fb51f143c4bf26ddec2516e8f9f \ + file://oezc.patch;patch=1;pnum=1" + +S = "${WORKDIR}/void11-0.2.0" + +inherit autotools + +do_compile () { + oe_runmake USECONSOLE=1 HOSTAPD_PATH=${WORKDIR}/hostapd-0.1.3 +} + +do_install () { + install -d ${D}/${sbindir} + install -d ${D}/${libdir} + install -m 0755 lib/libvoid11.so ${D}/${libdir} + install -m 0755 console/void11_hopper ${D}/${sbindir} + install -m 0755 smallsleep/smallsleep ${D}/${sbindir} + install -m 0755 console/void11_penetration ${D}/${sbindir} +} -- cgit v1.2.3 From 411a5800a5241d7cd15801dc2f2984b477576759 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Mon, 5 Mar 2007 10:04:28 +0000 Subject: packages/asterisk/asterisk_1.2.14.bb: Several fixes Q&A issues move .debug out of asterisk packages Add asterisk app to 'telephony' section instead of Base Set correct working dir Make sure that all asterisk headers get copied to staging/include --- packages/asterisk/asterisk_1.2.14.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/asterisk/asterisk_1.2.14.bb b/packages/asterisk/asterisk_1.2.14.bb index 3378f6e48b..64dac59199 100644 --- a/packages/asterisk/asterisk_1.2.14.bb +++ b/packages/asterisk/asterisk_1.2.14.bb @@ -2,13 +2,16 @@ DESCRIPTION="The Asterisk open source software PBX" HOMEPAGE="www.asterisk.org" LICENSE="GPL" DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt" -PR = "r2" +SECTION = "telephony" +PR = "r3" SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ file://uclibc-compat-getloadavg.patch;patch=1 \ file://uclibc-dsn.patch;patch=1 \ file://asterisk.patch;patch=1" +S = "${WORKDIR}/asterisk-${PV}" + export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}" export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}" @@ -35,3 +38,6 @@ do_stage () { } +FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug" +FILES_${PN}-dbg += "/var/lib/asterisk/agi-bin/.debug" + -- cgit v1.2.3 From 8c7f569b1328872beba6270ed6b870ac4b295e22 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Mon, 5 Mar 2007 10:08:23 +0000 Subject: packages/libesmtp/libesmtp_1.0.4.bb: Fix Q&A errors --- packages/libesmtp/libesmtp_1.0.4.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/libesmtp/libesmtp_1.0.4.bb b/packages/libesmtp/libesmtp_1.0.4.bb index 294333c579..06b46821d9 100644 --- a/packages/libesmtp/libesmtp_1.0.4.bb +++ b/packages/libesmtp/libesmtp_1.0.4.bb @@ -4,7 +4,7 @@ preconfigured Mail Transport Agent (MTA) such as Exim or PostFix." LICENSE = "GPL" SECTION = "libs/network" DEPENDS = "openssl" -PR = "r1" +PR = "r2" SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2" @@ -17,3 +17,4 @@ do_stage() { } FILES_libesmtp_append = " ${libdir}/esmtp-plugins" +FILES_${PN}-dbg += "${libdir}/esmtp-plugins/.debug/" -- cgit v1.2.3 From a9b4d234c578e728cb38f98fee2437585bc47138 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Mon, 5 Mar 2007 10:11:56 +0000 Subject: packages/asterisk/asterisk_1.2.14.bb: Add correct section console/telephony instead of telephony --- packages/asterisk/asterisk_1.2.14.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/asterisk/asterisk_1.2.14.bb b/packages/asterisk/asterisk_1.2.14.bb index 64dac59199..0ec55f8e42 100644 --- a/packages/asterisk/asterisk_1.2.14.bb +++ b/packages/asterisk/asterisk_1.2.14.bb @@ -2,8 +2,8 @@ DESCRIPTION="The Asterisk open source software PBX" HOMEPAGE="www.asterisk.org" LICENSE="GPL" DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt" -SECTION = "telephony" -PR = "r3" +SECTION = "console/telephony" +PR = "r4" SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ file://uclibc-compat-getloadavg.patch;patch=1 \ -- cgit v1.2.3 From 61996472e7427ce96a2e648862d1c19065cfb186 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 5 Mar 2007 12:38:22 +0000 Subject: Portmap: Update to 5-26, previous version unfetchable --- packages/portmap/portmap-5-26/.mtn2git_empty | 0 packages/portmap/portmap-5-26/make.patch | 73 ++++++++++++++++++++++++++++ packages/portmap/portmap_5-26.bb | 1 + 3 files changed, 74 insertions(+) create mode 100644 packages/portmap/portmap-5-26/.mtn2git_empty create mode 100644 packages/portmap/portmap-5-26/make.patch create mode 100644 packages/portmap/portmap_5-26.bb (limited to 'packages') diff --git a/packages/portmap/portmap-5-26/.mtn2git_empty b/packages/portmap/portmap-5-26/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/portmap/portmap-5-26/make.patch b/packages/portmap/portmap-5-26/make.patch new file mode 100644 index 0000000000..7726846b7c --- /dev/null +++ b/packages/portmap/portmap-5-26/make.patch @@ -0,0 +1,73 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: portmap_5beta/Makefile +=================================================================== +--- portmap_5beta.orig/Makefile 2006-12-19 10:32:58.000000000 +0000 ++++ portmap_5beta/Makefile 2006-12-19 10:35:54.000000000 +0000 +@@ -110,6 +110,13 @@ + # + #CONST = -Dconst= + ++DESTDIR = ++prefix = /usr ++sbindir = /sbin ++datadir = $(prefix)/share ++mandir = $(datadir)/man ++docdir = $(datadir)/doc/portmap ++ + ### End of configurable stuff. + ############################## + +@@ -127,7 +134,7 @@ + COPT = $(CONST) $(HOSTS_ACCESS) $(CHECK_PORT) \ + $(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(BROKEN_PIPE) \ + $(SA_LEN) $(LOOPBACK) $(SETPGRP) +-CFLAGS = -Wall $(COPT) -O2 $(NSARCHS) ++CFLAGS = -Wall -O2 $(NSARCHS) + OBJECTS = portmap.o pmap_check.o from_local.o $(AUX) + + all: portmap pmap_dump pmap_set +@@ -142,20 +149,23 @@ + $(CC) $(CFLAGS) -o $@ $? $(LIBS) + + from_local: from_local.c +- cc $(CFLAGS) -DTEST -o $@ from_local.c ++ $(CC) $(COPT) -DTEST $(CFLAGS) $(LDFLAGS) -o $@ from_local.c + + get_myaddress: get_myaddress.c +- cc $(CFLAGS) -DTEST -o $@ get_myaddress.c $(LIBS) ++ $(CC) $(COPT) -DTEST $(CFLAGS) $(LDFLAGS) -o $@ get_myaddress.c $(LIBS) + + install: all +- install -o root -g root -m 0755 -s portmap ${BASEDIR}/sbin +- install -o root -g root -m 0755 -s pmap_dump ${BASEDIR}/sbin +- install -o root -g root -m 0755 -s pmap_set ${BASEDIR}/sbin +- install -o root -g root -m 0644 portmap.8 ${BASEDIR}/usr/share/man/man8 +- install -o root -g root -m 0644 pmap_dump.8 ${BASEDIR}/usr/share/man/man8 +- install -o root -g root -m 0644 pmap_set.8 ${BASEDIR}/usr/share/man/man8 +- cat BLURB >${BASEDIR}/usr/share/doc/portmap/portmapper.txt +- gzip -9f ${BASEDIR}/usr/share/doc/portmap/portmapper.txt ++ install -d $(DESTDIR)/$(sbindir) \ ++ $(DESTDIR)/$(docdir) \ ++ $(DESTDIR)/$(mandir)/man8 ++ install -m 0755 portmap ${DESTDIR}/sbin ++ install -m 0755 pmap_dump ${DESTDIR}/sbin ++ install -m 0755 pmap_set ${DESTDIR}/sbin ++ install -m 0644 portmap.8 ${DESTDIR}/usr/share/man/man8 ++ install -m 0644 pmap_dump.8 ${DESTDIR}/usr/share/man/man8 ++ install -m 0644 pmap_set.8 ${DESTDIR}/usr/share/man/man8 ++ cat BLURB >${DESTDIR}/usr/share/doc/portmap/portmapper.txt ++ gzip -9f ${DESTDIR}/usr/share/doc/portmap/portmapper.txt + + + lint: +@@ -181,3 +191,6 @@ + portmap.o: portmap.c + portmap.o: pmap_check.h Makefile + strerror.o: strerror.c ++ ++%.o: %.c ++ $(CC) $(COPT) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $*.c -o $*.o diff --git a/packages/portmap/portmap_5-26.bb b/packages/portmap/portmap_5-26.bb new file mode 100644 index 0000000000..064679e7f0 --- /dev/null +++ b/packages/portmap/portmap_5-26.bb @@ -0,0 +1 @@ +require portmap.inc -- cgit v1.2.3 From b85ac9a806c00af6b11a2d0d35574bb15dc2fc13 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 5 Mar 2007 13:05:24 +0000 Subject: hdparm: Upstream upgrade to 6.9 --- packages/hdparm/hdparm-6.9/.mtn2git_empty | 0 packages/hdparm/hdparm-6.9/bswap.patch | 39 +++++++++++++++++++++++++++++++ packages/hdparm/hdparm-6.9/uclibc.patch | 35 +++++++++++++++++++++++++++ packages/hdparm/hdparm_6.9.bb | 14 +++++++++++ 4 files changed, 88 insertions(+) create mode 100644 packages/hdparm/hdparm-6.9/.mtn2git_empty create mode 100644 packages/hdparm/hdparm-6.9/bswap.patch create mode 100644 packages/hdparm/hdparm-6.9/uclibc.patch create mode 100644 packages/hdparm/hdparm_6.9.bb (limited to 'packages') diff --git a/packages/hdparm/hdparm-6.9/.mtn2git_empty b/packages/hdparm/hdparm-6.9/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/hdparm/hdparm-6.9/bswap.patch b/packages/hdparm/hdparm-6.9/bswap.patch new file mode 100644 index 0000000000..3281c33954 --- /dev/null +++ b/packages/hdparm/hdparm-6.9/bswap.patch @@ -0,0 +1,39 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: hdparm-6.9/hdparm.c +=================================================================== +--- hdparm-6.9.orig/hdparm.c 2006-10-25 16:41:33.000000000 +0200 ++++ hdparm-6.9/hdparm.c 2007-03-05 14:02:03.000000000 +0100 +@@ -19,8 +19,9 @@ + #include + #include + #include +-#include +-//#include ++#include ++ ++#define le16_to_cpus(x) bswap_16(htons(x)) + + #include "hdparm.h" + +@@ -1328,7 +1329,7 @@ + } + } else { + for(i = 0; i < 0x100; ++i) { +- __le16_to_cpus(&id[i]); ++ le16_to_cpus(&id[i]); + } + identify((void *)id); + } +@@ -1608,7 +1609,7 @@ + && ishex(d[++digit] = getchar()) + && ishex(d[++digit] = getchar())) { + sbuf[wc] = (fromhex(d[0]) << 12) | (fromhex(d[1]) << 8) | (fromhex(d[2]) << 4) | fromhex(d[3]); +- __le16_to_cpus((__u16 *)(&sbuf[wc])); ++ le16_to_cpus((__u16 *)(&sbuf[wc])); + ++wc; + } else if (d[digit] == EOF) { + goto eof; diff --git a/packages/hdparm/hdparm-6.9/uclibc.patch b/packages/hdparm/hdparm-6.9/uclibc.patch new file mode 100644 index 0000000000..0758aa07b8 --- /dev/null +++ b/packages/hdparm/hdparm-6.9/uclibc.patch @@ -0,0 +1,35 @@ +Index: hdparm-6.9/hdparm.c +=================================================================== +--- hdparm-6.9.orig/hdparm.c 2007-03-05 14:02:03.000000000 +0100 ++++ hdparm-6.9/hdparm.c 2007-03-05 14:02:23.000000000 +0100 +@@ -16,7 +16,9 @@ + #include + #include + #include ++#ifndef __UCLIBC__ + #include ++#endif + #include + #include + #include +Index: hdparm-6.9/hdparm.h +=================================================================== +--- hdparm-6.9.orig/hdparm.h 2006-04-28 16:33:01.000000000 +0200 ++++ hdparm-6.9/hdparm.h 2007-03-05 14:03:10.000000000 +0100 +@@ -1,6 +1,6 @@ + /* Some prototypes for extern functions. */ + +-#include /* for __u16 */ ++#include + + #if !defined(__GNUC__) && !defined(__attribute__) + #define __attribute__(x) /* if not using GCC, turn off the __attribute__ +@@ -11,7 +11,7 @@ + others, though, were declared in hdparm.c with global scope; since other + functions in that file have static (file) scope, I assume the difference is + intentional. */ +-extern void identify (__u16 *id_supplied); ++extern void identify (uint16_t *id_supplied); + + extern void usage_error(int out) __attribute__((noreturn)); + extern int main(int argc, char **argv) __attribute__((noreturn)); diff --git a/packages/hdparm/hdparm_6.9.bb b/packages/hdparm/hdparm_6.9.bb new file mode 100644 index 0000000000..94d1e6e9bf --- /dev/null +++ b/packages/hdparm/hdparm_6.9.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "hdparm is a Linux shell utility for viewing \ +and manipulating various IDE drive and driver parameters." +SECTION = "console/utils" +PRIORITY = "optional" +LICENSE = "BSD" + +SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/hdparm-${PV}.tar.gz \ + file://bswap.patch;patch=1 \ + file://uclibc.patch;patch=1" + +do_install () { + install -d ${D}/${sbindir} ${D}/${mandir}/man8 + oe_runmake 'DESTDIR=${D}' install +} -- cgit v1.2.3 From 3f3fb7c2ca3d090087027c68fd0c4320fc6beda7 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 5 Mar 2007 14:17:06 +0000 Subject: libgnomeprint: QA issue, install all debug files into -dbg package. --- packages/gnome/libgnomeprint_2.8.2.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/gnome/libgnomeprint_2.8.2.bb b/packages/gnome/libgnomeprint_2.8.2.bb index b154c5b652..a7db775e22 100644 --- a/packages/gnome/libgnomeprint_2.8.2.bb +++ b/packages/gnome/libgnomeprint_2.8.2.bb @@ -6,6 +6,8 @@ DEPENDS = "libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt gnome inherit flow-lossage pkgconfig gnome +FILES_${PN}-dbg += "${libdir}/libgnomeprint/2.8.2/modules/transports/.debug \ + ${libdir}/libgnomeprint/2.8.2/modules/.debug" do_stage() { install -d ${STAGING_LIBDIR} -- cgit v1.2.3 From 211dff1568deae1f0221aebb87a71c72cb77655c Mon Sep 17 00:00:00 2001 From: Dominik Kuhlen Date: Mon, 5 Mar 2007 15:02:44 +0000 Subject: mpd svn: set maxdate for mikmod patch since it has been applied officially --- packages/musicpd/mpd_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_svn.bb index 5a338aa7d2..04ddf8fdc3 100644 --- a/packages/musicpd/mpd_svn.bb +++ b/packages/musicpd/mpd_svn.bb @@ -8,7 +8,7 @@ PV = "0.12.1+svn${SRCDATE}" PR = "r2" SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \ - file://fix-mod-support.patch;patch=1" + file://fix-mod-support.patch;patch=1;maxdate=20070302" # file://save-volume-state.patch;patch=1" S = "${WORKDIR}/trunk" -- cgit v1.2.3 From 73423a99e0ddbd640088008da92f4c80efb3ffbc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 5 Mar 2007 18:09:48 +0000 Subject: linux-gta01: update to moko8 patchset --- .../linux/linux-gta01/defconfig-2.6.20-fic-gta01 | 34 ++++++++++++++-------- packages/linux/linux-gta01_2.6.20.bb | 2 +- 2 files changed, 23 insertions(+), 13 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-gta01/defconfig-2.6.20-fic-gta01 b/packages/linux/linux-gta01/defconfig-2.6.20-fic-gta01 index 948ccd6f70..e0a885fa0d 100644 --- a/packages/linux/linux-gta01/defconfig-2.6.20-fic-gta01 +++ b/packages/linux/linux-gta01/defconfig-2.6.20-fic-gta01 @@ -29,7 +29,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup # -CONFIG_LOCALVERSION="-moko7" +CONFIG_LOCALVERSION="-moko8" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y @@ -165,9 +165,8 @@ CONFIG_S3C2410_BOOT_ERROR_RESET=y # CONFIG_S3C2410_DMA=y # CONFIG_S3C2410_DMA_DEBUG is not set -CONFIG_S3C2410_PM_DEBUG=y -CONFIG_S3C2410_PM_CHECK=y -CONFIG_S3C2410_PM_CHECK_CHUNKSIZE=64 +# CONFIG_S3C2410_PM_DEBUG is not set +# CONFIG_S3C2410_PM_CHECK is not set CONFIG_S3C2410_LOWLEVEL_UART_PORT=0 # @@ -639,8 +638,8 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y CONFIG_MTD_NAND_IDS=y CONFIG_MTD_NAND_S3C2410=y CONFIG_MTD_NAND_S3C2410_BBT=y -CONFIG_MTD_NAND_S3C2410_DEBUG=y -# CONFIG_MTD_NAND_S3C2410_HWECC is not set +# CONFIG_MTD_NAND_S3C2410_DEBUG is not set +CONFIG_MTD_NAND_S3C2410_HWECC=y CONFIG_MTD_NAND_S3C2410_CLKSTOP=y # CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_NANDSIM is not set @@ -761,7 +760,7 @@ CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set +CONFIG_TUN=m # # PHY device support @@ -848,7 +847,8 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set CONFIG_KEYBOARD_STOWAWAY=m -CONFIG_KEYBOARD_GTA01=m +CONFIG_KEYBOARD_GTA01=y +CONFIG_KEYBOARD_QT2410=y CONFIG_INPUT_MOUSE=y # CONFIG_MOUSE_PS2 is not set # CONFIG_MOUSE_SERIAL is not set @@ -881,6 +881,7 @@ CONFIG_SERIO=y # CONFIG_VT=y CONFIG_VT_CONSOLE=y +CONFIG_NR_TTY_DEVICES=4 CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y # CONFIG_SERIAL_NONSTANDARD is not set @@ -898,8 +899,7 @@ CONFIG_SERIAL_S3C2410_CONSOLE=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_LEGACY_PTYS is not set # # IPMI @@ -1450,9 +1450,9 @@ CONFIG_USB_ETH_RNDIS=y # # MMC/SD Card support # -CONFIG_MMC=m +CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set -CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK=y # CONFIG_MMC_TIFM_SD is not set CONFIG_MMC_S3C=m @@ -1558,6 +1558,16 @@ CONFIG_CONFIGFS_FS=m # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set +# CONFIG_YAFFS_FS is not set +# CONFIG_YAFFS_YAFFS1 is not set +# CONFIG_YAFFS_DOES_ECC is not set +# CONFIG_YAFFS_YAFFS2 is not set +# CONFIG_YAFFS_AUTO_YAFFS2 is not set +# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set +# CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS is not set +# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set +# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set +# CONFIG_YAFFS_SHORT_NAMES_IN_RAM is not set CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y diff --git a/packages/linux/linux-gta01_2.6.20.bb b/packages/linux/linux-gta01_2.6.20.bb index a922abd701..406369d81f 100644 --- a/packages/linux/linux-gta01_2.6.20.bb +++ b/packages/linux/linux-gta01_2.6.20.bb @@ -4,7 +4,7 @@ AUTHOR = "Harald Welte " HOMEPAGE = "N/A" LICENSE = "GPL" DEPENDS += "uboot-gta01" -MOKOR = "moko7" +MOKOR = "moko8" PR = "${MOKOR}-r1" VANILLA_VERSION = "2.6.20" -- cgit v1.2.3 From 0fbcc542429722b19c5a4c6e9e83fc437c55a492 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 5 Mar 2007 18:25:36 +0000 Subject: gconf-osso: drop it, part of the maemo clean up --- packages/maemo/gconf-osso/configure-dbus.patch | 11 - packages/maemo/gconf-osso/free-entry-fix.diff | 11 - packages/maemo/gconf-osso/gconf-daemon-dbus-oe.sh | 7 - packages/maemo/gconf-osso/gconf-daemon-oe.sh | 21 - packages/maemo/gconf-osso/gconf-update.patch | 31 - packages/maemo/gconf-osso/no-po-no-examples.diff | 34032 -------------------- packages/maemo/gconf-osso/service-file.diff | 9 - packages/maemo/gconf-osso_2.6.4-3.1osso13.bb | 45 - 8 files changed, 34167 deletions(-) delete mode 100644 packages/maemo/gconf-osso/configure-dbus.patch delete mode 100644 packages/maemo/gconf-osso/free-entry-fix.diff delete mode 100755 packages/maemo/gconf-osso/gconf-daemon-dbus-oe.sh delete mode 100644 packages/maemo/gconf-osso/gconf-daemon-oe.sh delete mode 100644 packages/maemo/gconf-osso/gconf-update.patch delete mode 100644 packages/maemo/gconf-osso/no-po-no-examples.diff delete mode 100644 packages/maemo/gconf-osso/service-file.diff delete mode 100644 packages/maemo/gconf-osso_2.6.4-3.1osso13.bb (limited to 'packages') diff --git a/packages/maemo/gconf-osso/configure-dbus.patch b/packages/maemo/gconf-osso/configure-dbus.patch deleted file mode 100644 index dfba0763c9..0000000000 --- a/packages/maemo/gconf-osso/configure-dbus.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- GConf-2.6.4/configure.in.orig 2007-03-03 18:30:35.000000000 +0000 -+++ GConf-2.6.4/configure.in 2007-03-03 18:30:50.000000000 +0000 -@@ -186,7 +186,7 @@ - - AC_ARG_WITH(ipc, [ --with-ipc=[orbit/dbus/both] choose ipc mechanism to use in the daemon, [default=dbus]], with_ipc="$withval", with_ipc=dbus) - --if test x$with_ipc = xorbit -o x$with_ipc = xboth; then -+if test x$with_ipc = xorbit -o x$with_ipc = xboth -o x$with_ipc = xdbus; then - PKG_CHECK_MODULES(GCONF_ORBIT, ORBit-2.0 >= 2.4.0 linc >= 0.5.0, have_orbit=yes, have_orbit=no) - if test x$have_orbit = xno ; then - AC_MSG_WARN([ORBit development libraries not found]) diff --git a/packages/maemo/gconf-osso/free-entry-fix.diff b/packages/maemo/gconf-osso/free-entry-fix.diff deleted file mode 100644 index 43e45a7be1..0000000000 --- a/packages/maemo/gconf-osso/free-entry-fix.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur GConf-2.6.4/gconf/gconf-client.c GConf-2.6.4.new/gconf/gconf-client.c ---- GConf-2.6.4/gconf/gconf-client.c 2004-09-19 15:29:35.000000000 +0300 -+++ GConf-2.6.4.new/gconf/gconf-client.c 2005-04-08 10:59:46.268506800 +0300 -@@ -776,7 +776,6 @@ - static gboolean - clear_cache_foreach (char* key, GConfEntry* entry, GConfClient* client) - { -- g_free (key); - gconf_entry_free (entry); - - return TRUE; diff --git a/packages/maemo/gconf-osso/gconf-daemon-dbus-oe.sh b/packages/maemo/gconf-osso/gconf-daemon-dbus-oe.sh deleted file mode 100755 index 90dfdb7eb0..0000000000 --- a/packages/maemo/gconf-osso/gconf-daemon-dbus-oe.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# GConf daemon startup script for D-BUS activation -if [ -x /usr/sbin/dsmetool ]; then - /usr/sbin/dsmetool -U messagebus -n -1 -t /usr/lib/gconf2/gconfd-2 -else - exec /usr/libexec/gconfd-2 -fi diff --git a/packages/maemo/gconf-osso/gconf-daemon-oe.sh b/packages/maemo/gconf-osso/gconf-daemon-oe.sh deleted file mode 100644 index a14954de6e..0000000000 --- a/packages/maemo/gconf-osso/gconf-daemon-oe.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# GConf daemon startup/shutdown script - -PROG=/usr/libexec/gconfd-2 -SVC="GConf daemon" - -case "$1" in -start) START=TRUE - ;; -stop) START=FALSE - ;; -*) echo "Usage: $0 {start|stop}" - exit 1 - ;; -esac - -if [ $START = TRUE ]; then - $LAUNCHWRAPPER start "$SVC" $PROG -else - $LAUNCHWRAPPER stop"$SVC" $PROG -fi diff --git a/packages/maemo/gconf-osso/gconf-update.patch b/packages/maemo/gconf-osso/gconf-update.patch deleted file mode 100644 index 9870078b86..0000000000 --- a/packages/maemo/gconf-osso/gconf-update.patch +++ /dev/null @@ -1,31 +0,0 @@ -? gconf/gconf.service -Index: gconf/Makefile.am -=================================================================== -RCS file: /cvs/gnome/gconf/gconf/Makefile.am,v -retrieving revision 1.78.4.8 -diff -u -r1.78.4.8 Makefile.am ---- gconf/Makefile.am 21 Dec 2003 14:21:15 -0000 1.78.4.8 -+++ gconf/Makefile.am 22 Jan 2005 00:30:13 -0000 -@@ -155,6 +155,7 @@ - - libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE) -no-undefined - libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) $(GCONF_IPC_LIBS) -+libgconf_2_la_CFLAGS = $(AM_CFLAGS) - - if HAVE_DBUS - servicedir = $(DBUS_SERVICE_DIR) -Index: backends/Makefile.am -=================================================================== -RCS file: /cvs/gnome/gconf/backends/Makefile.am,v -retrieving revision 1.30 -diff -u -r1.30 Makefile.am ---- backends/Makefile.am 3 Nov 2003 00:19:33 -0000 1.30 -+++ backends/Makefile.am 22 Jan 2005 00:30:14 -0000 -@@ -17,6 +17,7 @@ - - libgconfbackend_oldxml_la_LDFLAGS = -avoid-version -module -no-undefined - libgconfbackend_oldxml_la_LIBADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la -+libgconfbackend_oldxml_la_CFLAGS = $(AM_CFLAGS) - - libgconfbackend_xml_la_SOURCES = \ - markup-backend.c \ diff --git a/packages/maemo/gconf-osso/no-po-no-examples.diff b/packages/maemo/gconf-osso/no-po-no-examples.diff deleted file mode 100644 index a7411dfef7..0000000000 --- a/packages/maemo/gconf-osso/no-po-no-examples.diff +++ /dev/null @@ -1,34032 +0,0 @@ -diff -urN GConf-2.6.4/Makefile.am GConf-2.6.4.new/Makefile.am ---- GConf-2.6.4/Makefile.am 2004-09-20 00:42:59.000000000 +0300 -+++ GConf-2.6.4.new/Makefile.am 2005-03-05 11:06:46.000000000 +0200 -@@ -1,5 +1,5 @@ - --SUBDIRS = gconf backends po doc examples -+SUBDIRS = gconf backends doc - DIST_SUBDIRS=tests $(SUBDIRS) - - DBUS_GCONF_CONF=gconfd.conf -diff -urN GConf-2.6.4/Makefile.in GConf-2.6.4.new/Makefile.in ---- GConf-2.6.4/Makefile.in 2004-09-20 00:45:15.000000000 +0300 -+++ GConf-2.6.4.new/Makefile.in 2005-03-05 11:07:05.000000000 +0200 -@@ -1,6 +1,8 @@ --# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am -+# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# @configure_input@ - --# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,69 +12,57 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - -- --SHELL = @SHELL@ -+@SET_MAKE@ - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include -- --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -- - top_builddir = . - --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ --transform = @program_transform_name@ -- -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ - host_triplet = @host@ -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ -+AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ --BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ -+CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ - DATADIRNAME = @DATADIRNAME@ - DB2HTML = @DB2HTML@ - DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ - DEPENDENT_CFLAGS = @DEPENDENT_CFLAGS@ - DEPENDENT_LIBS = @DEPENDENT_LIBS@ - DEPENDENT_WITH_GTK_CFLAGS = @DEPENDENT_WITH_GTK_CFLAGS@ -@@ -83,48 +73,73 @@ - DEPENDENT_WITH_XML_LIBS = @DEPENDENT_WITH_XML_LIBS@ - DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ -+ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ - EXEEXT = @EXEEXT@ - EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@ - F77 = @F77@ --GCJ = @GCJ@ --GCJFLAGS = @GCJFLAGS@ -+FFLAGS = @FFLAGS@ - GCONF_AGE = @GCONF_AGE@ - GCONF_CONFIG_SOURCE = @GCONF_CONFIG_SOURCE@ - GCONF_CURRENT = @GCONF_CURRENT@ -+GCONF_DBUS_CFLAGS = @GCONF_DBUS_CFLAGS@ -+GCONF_DBUS_LIBS = @GCONF_DBUS_LIBS@ - GCONF_IPC_CFLAGS = @GCONF_IPC_CFLAGS@ - GCONF_IPC_LIBS = @GCONF_IPC_LIBS@ -+GCONF_ORBIT_CFLAGS = @GCONF_ORBIT_CFLAGS@ -+GCONF_ORBIT_LIBS = @GCONF_ORBIT_LIBS@ - GCONF_REVISION = @GCONF_REVISION@ --GENCAT = @GENCAT@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GMOFILES = @GMOFILES@ - GMSGFMT = @GMSGFMT@ - GTKDOC = @GTKDOC@ --GT_NO = @GT_NO@ --GT_YES = @GT_YES@ -+GTK_FALSE = @GTK_FALSE@ -+GTK_TRUE = @GTK_TRUE@ -+HAVE_DBUS_FALSE = @HAVE_DBUS_FALSE@ -+HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@ -+HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -+HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_GTK_DOC = @HAVE_GTK_DOC@ --HAVE_LIB = @HAVE_LIB@ -+HAVE_GTK_DOC_FALSE = @HAVE_GTK_DOC_FALSE@ -+HAVE_GTK_DOC_TRUE = @HAVE_GTK_DOC_TRUE@ -+HAVE_ORBIT_FALSE = @HAVE_ORBIT_FALSE@ -+HAVE_ORBIT_TRUE = @HAVE_ORBIT_TRUE@ - HTML_DIR = @HTML_DIR@ --INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ - INDENT = @INDENT@ -+INSTALL_DATA = @INSTALL_DATA@ - INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ --INTLDEPS = @INTLDEPS@ - INTLLIBS = @INTLLIBS@ --INTLOBJS = @INTLOBJS@ - LDFLAGS = @LDFLAGS@ --LIB = @LIB@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --LTLIB = @LTLIB@ -+LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAJOR_VERSION = @MAJOR_VERSION@ - MAKEINFO = @MAKEINFO@ - MKINSTALLDIRS = @MKINSTALLDIRS@ -+MSGFMT = @MSGFMT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - ORBIT_IDL = @ORBIT_IDL@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - PC_REQUIRES = @PC_REQUIRES@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ -@@ -133,18 +148,65 @@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ - PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -+PTHREADS_FALSE = @PTHREADS_FALSE@ -+PTHREADS_TRUE = @PTHREADS_TRUE@ - RANLIB = @RANLIB@ --RC = @RC@ - REBUILD = @REBUILD@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - STRIP = @STRIP@ --USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ - USE_NLS = @USE_NLS@ -+USE_SYSTEM_BUS_FALSE = @USE_SYSTEM_BUS_FALSE@ -+USE_SYSTEM_BUS_TRUE = @USE_SYSTEM_BUS_TRUE@ - VERSION = @VERSION@ -+XGETTEXT = @XGETTEXT@ - absolute_top_srcdir = @absolute_top_srcdir@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_AS = @ac_ct_AS@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+datadir = @datadir@ -+exec_prefix = @exec_prefix@ - gconflocaledir = @gconflocaledir@ --l = @l@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ -+install_sh = @install_sh@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+oldincludedir = @oldincludedir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ - --SUBDIRS = gconf backends po doc examples -+SUBDIRS = gconf backends doc - DIST_SUBDIRS = tests $(SUBDIRS) - - DBUS_GCONF_CONF = gconfd.conf -@@ -152,112 +214,119 @@ - @USE_SYSTEM_BUS_TRUE@dbusconfdir = $(sysconfdir)/dbus-1/system.d - @USE_SYSTEM_BUS_TRUE@dbusconf_DATA = $(DBUS_GCONF_CONF) - --EXTRA_DIST = gconf.m4.in TODO gconf-2.0.pc.in $(DBUS_GCONF_CONF) -+EXTRA_DIST = gconf.m4.in TODO \ -+ gconf-2.0.pc.in \ -+ $(DBUS_GCONF_CONF) - - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = gconf-2.0.pc -+subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = gconf.m4 gconf-2.0.pc --DATA = $(dbusconf_DATA) $(pkgconfig_DATA) -- --DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \ --INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h acinclude.m4 \ --aclocal.m4 config.guess config.h.in config.sub configure configure.in \ --gconf-2.0.pc.in gconf.m4.in install-sh ltmain.sh missing mkinstalldirs -- -- --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+CONFIG_CLEAN_FILES = gconf.m4 gconf-2.0.pc -+DIST_SOURCES = -+DATA = $(dbusconf_DATA) $(pkgconfig_DATA) -+ -+ -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive -+DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \ -+ ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS \ -+ TODO acconfig.h acinclude.m4 aclocal.m4 config.guess \ -+ config.h.in config.sub configure configure.in depcomp \ -+ gconf-2.0.pc.in gconf.m4.in install-sh ltmain.sh missing \ -+ mkinstalldirs -+all: config.h -+ $(MAKE) $(AM_MAKEFLAGS) all-recursive - --TAR = tar --GZIP_ENV = --best --all: all-redirect - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) \ -- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -+ configure.lineno -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+ cd $(top_srcdir) && \ -+ $(AUTOMAKE) --gnu Makefile -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) - --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 -- cd $(srcdir) && $(ACLOCAL) -- --config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck --$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) -+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) - --config.h: stamp-h -- @if test ! -f $@; then \ -- rm -f stamp-h; \ -- $(MAKE) stamp-h; \ -- else :; fi --stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status -- cd $(top_builddir) \ -- && CONFIG_FILES= CONFIG_HEADERS=config.h \ -- $(SHELL) ./config.status -- @echo timestamp > stamp-h 2> /dev/null --$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 -+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -+ -+config.h: stamp-h1 - @if test ! -f $@; then \ -- rm -f $(srcdir)/stamp-h.in; \ -- $(MAKE) $(srcdir)/stamp-h.in; \ -+ rm -f stamp-h1; \ -+ $(MAKE) stamp-h1; \ - else :; fi --$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h -- cd $(top_srcdir) && $(AUTOHEADER) -- @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null - --mostlyclean-hdr: -+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status -+ @rm -f stamp-h1 -+ cd $(top_builddir) && $(SHELL) ./config.status config.h - --clean-hdr: -+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h -+ cd $(top_srcdir) && $(AUTOHEADER) -+ touch $(srcdir)/config.h.in - - distclean-hdr: -- -rm -f config.h -- --maintainer-clean-hdr: -+ -rm -f config.h stamp-h1 - gconf.m4: $(top_builddir)/config.status gconf.m4.in -- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $@ - gconf-2.0.pc: $(top_builddir)/config.status gconf-2.0.pc.in -- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $@ -+ -+mostlyclean-libtool: -+ -rm -f *.lo - -+clean-libtool: -+ -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+dbusconfDATA_INSTALL = $(INSTALL_DATA) - install-dbusconfDATA: $(dbusconf_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(dbusconfdir) - @list='$(dbusconf_DATA)'; for p in $$list; do \ -- if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(dbusconfdir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(dbusconfdir)/$$p; \ -- else if test -f $$p; then \ -- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(dbusconfdir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(dbusconfdir)/$$p; \ -- fi; fi; \ -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(dbusconfDATA_INSTALL) $$d$$p $(DESTDIR)$(dbusconfdir)/$$f"; \ -+ $(dbusconfDATA_INSTALL) $$d$$p $(DESTDIR)$(dbusconfdir)/$$f; \ - done - - uninstall-dbusconfDATA: - @$(NORMAL_UNINSTALL) -- list='$(dbusconf_DATA)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(dbusconfdir)/$$p; \ -+ @list='$(dbusconf_DATA)'; for p in $$list; do \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(dbusconfdir)/$$f"; \ -+ rm -f $(DESTDIR)$(dbusconfdir)/$$f; \ - done -- -+pkgconfigDATA_INSTALL = $(INSTALL_DATA) - install-pkgconfigDATA: $(pkgconfig_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) - @list='$(pkgconfig_DATA)'; for p in $$list; do \ -- if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \ -- else if test -f $$p; then \ -- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DES