[oe-commits] org.oe.dev merge of 'cb269c669579f2854a506ffe6ac9cb45f2592b25'
osas commit
openembedded-commits at lists.openembedded.org
Wed Jan 16 20:27:35 UTC 2008
merge of 'cb269c669579f2854a506ffe6ac9cb45f2592b25'
and 'ed94d35280e9dbc28ff90a5b175dc47c752bf347'
Author: osas at nslu2-linux.org
Branch: org.openembedded.dev
Revision: ab1a06b7453ad48a1ad5b4f9ee053cd6a9e04d28
ViewMTN: http://monotone.openembedded.org/revision/info/ab1a06b7453ad48a1ad5b4f9ee053cd6a9e04d28
Files:
1
packages/u-boot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb
packages/imagemagick/imagemagick-native_6.3.5-10.bb
packages/roadmap/files/roadmap_path.patch
packages/supertux/files/supertux.desktop
packages/supertux/supertux_0.1.3.bb
packages/u-boot/files/fix-data-abort-from-sd-ombug799.patch
packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
contrib/python/generate-manifest-2.5.py
packages/libsdl/libsdl-mixer_1.2.6.bb
packages/linux/linux/simpad/defconfig
packages/linux/linux_2.6.21.bb
packages/python/python-ecore_cvs.bb
packages/python/python-edje_cvs.bb
packages/python/python-efl.bb
packages/python/python-efl.inc
packages/python/python-emotion_cvs.bb
packages/python/python-epsilon_cvs.bb
packages/python/python-evas_cvs.bb
packages/python/python_2.5.1.bb
packages/roadmap/roadmap-gtk2.inc
packages/roadmap/roadmap-gtk2_1.1.0.bb
packages/roadmap/roadmap-gtk2_cvs.bb
packages/roadmap/roadmap.inc
packages/roadmap/zroadmap.inc
packages/roadmap/zroadmap_1.1.0.bb
packages/roadmap/zroadmap_cvs.bb
packages/supertux/files/supertux.png
packages/supertux/supertux_0.1.2.bb
packages/u-boot/u-boot-openmoko_svn.bb
packages/monit
packages/monit/files
packages/monit/monit-4.10.1
packages/monit/files/init
packages/monit/monit-4.10.1/init
packages/monit/monit_4.10.1.bb
packages/meta/slugos-packages.bb
Diffs:
#
# mt diff -rcb269c669579f2854a506ffe6ac9cb45f2592b25 -rab1a06b7453ad48a1ad5b4f9ee053cd6a9e04d28
#
#
#
# rename "packages/u-boot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
# to "packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb"
#
# add_file "packages/imagemagick/imagemagick-native_6.3.5-10.bb"
# content [12767989ecd51eae729f7a561f0b330a9ac11994]
#
# add_file "packages/roadmap/files/roadmap_path.patch"
# content [a9de0d93760921a56341d70da42a7b27da04fc34]
#
# add_file "packages/supertux/files/supertux.desktop"
# content [ca0d07025948eea625b61a4c138657fd300ff7ac]
#
# add_file "packages/supertux/supertux_0.1.3.bb"
# content [3bdf0dcd28c6bdec7e0869499bb81b27bbfb9d35]
#
# add_file "packages/u-boot/files/fix-data-abort-from-sd-ombug799.patch"
# content [bd915dc287d002b9db3f2531ecbd27dadbb7d336]
#
# add_file "packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb"
# content [5906c2607fc6aca5a48fa0b21942c425013f9722]
#
# patch "contrib/python/generate-manifest-2.5.py"
# from [b7e8bd24539139e7ffcc8d7a6f869f503d1c3ff5]
# to [42794139eb5d2d065e423c46dd2858a4b6a04f34]
#
# patch "packages/libsdl/libsdl-mixer_1.2.6.bb"
# from [cfee648682c7559cf233d5a7d0ae67430f94a636]
# to [8866166728bbf910308433bf453a286adc1fa2ec]
#
# patch "packages/linux/linux/simpad/defconfig"
# from [9b2a926304e0d3f59c4cc79fc6222c11947ed80f]
# to [ac1e360a7cdda71682cd334f3c0a28dc02b59533]
#
# patch "packages/linux/linux_2.6.21.bb"
# from [ea3e4abd8395bae51a2fa300c1079ee0a5041860]
# to [446a2c08dfcbb88e02f958f8e29adc438c0e9c2d]
#
# patch "packages/python/python-ecore_cvs.bb"
# from [bfa8e271f3daff2c2b60e8e4c9cbf7aedbe9a699]
# to [90845b99ab78eb6b0f8e1fa9647ab805cba9632e]
#
# patch "packages/python/python-edje_cvs.bb"
# from [4b7900f727ff503609272277e678a3a40f185bc1]
# to [a6de8780758ddeaa8388510eb42f800808d4a1c4]
#
# patch "packages/python/python-efl.bb"
# from [8b8f8c4398b8e55f47a8ca673a71204a3e86d9f0]
# to [77937768e6ded1252b9e4626217e70dd277666f7]
#
# patch "packages/python/python-efl.inc"
# from [52c210d09e0ffddb7db102b3f81f7759c1f7991d]
# to [66b0f9ae3de72ea8591bb26d18c8e9294b68bad8]
#
# patch "packages/python/python-emotion_cvs.bb"
# from [030fd4a928e8e5fbe149bc2dce2976c52fe7ff85]
# to [c08664082ddcea8156dbc60c3d71bcf3cfa305b4]
#
# patch "packages/python/python-epsilon_cvs.bb"
# from [7bd65f186128ab558629d1d56830b76733712059]
# to [3905b2da72e626dc4d217ba5ae91084a14f82fb1]
#
# patch "packages/python/python-evas_cvs.bb"
# from [38264868dc3fb93df627bbdca124ddae4143423a]
# to [f54548a04768c6e58155daa9edbda0dab9586f7c]
#
# patch "packages/python/python_2.5.1.bb"
# from [4f55ad9de694427456743f3c4623090c63ef08a5]
# to [36a7f492ee7cc2b9c9fe2268b8b153dcb1729102]
#
# patch "packages/roadmap/roadmap-gtk2.inc"
# from [fc58e3e70037346d52758067318eda8023e6b2be]
# to [2aa378d801945ff02bc3c939ba674715a280b763]
#
# patch "packages/roadmap/roadmap-gtk2_1.1.0.bb"
# from [bf65c63e6c550a015ebf7d3afe59f77c139cc5f3]
# to [28151fbdab1200d9c37c380e25f9bca4cbc1bbaf]
#
# patch "packages/roadmap/roadmap-gtk2_cvs.bb"
# from [2790f799a13355e4ee5e15d33a9b0c737fde2269]
# to [597e6c998d97edcfd8de17534c455b1476978cfa]
#
# patch "packages/roadmap/roadmap.inc"
# from [e3d443eff17119798c0c6deda17bf6ff8785c257]
# to [46055702ecd5e97c7f30231e54b7f3d929ea0fad]
#
# patch "packages/roadmap/zroadmap.inc"
# from [6f4897b3cbc5a817995412a0c649a7fffc71554b]
# to [5c038214b7769f0dee175ca4e846ccd293788c0e]
#
# patch "packages/roadmap/zroadmap_1.1.0.bb"
# from [deaa33e33e25e1c9b13a64473c53715a50f05d59]
# to [b82c031b85848b13832c100afaa5d30d59685dd4]
#
# patch "packages/roadmap/zroadmap_cvs.bb"
# from [910020856a214de2ce5b21692e857806378508b4]
# to [092c0da8140aa7558085ce631475d46da52b946f]
#
# patch "packages/supertux/files/supertux.png"
# from [daa562a438fed2ba9a887bdc0f6e98b0b024d5e4]
# to [95e94bf022d8fe098f34b15b577aa8c08b089bc3]
#
# patch "packages/supertux/supertux_0.1.2.bb"
# from [09cdf957a3989df2fcb1656badfab95e1da5adb2]
# to [1cd0b4d5a1abca0a1dcb49ed472396347e0c7529]
#
# patch "packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb"
# from [0c0171c90503926242288f89cf359ffc1a9f7b2c]
# to [64f842298e8ea505bac76d4278cd6ec3ab3bba9c]
#
# patch "packages/u-boot/u-boot-openmoko_svn.bb"
# from [728dd133bb54e3b77f041e6046fba6405c2a6b2e]
# to [a358024ed5438a158981212e49cdd6e959bb6594]
#
============================================================
--- packages/imagemagick/imagemagick-native_6.3.5-10.bb 12767989ecd51eae729f7a561f0b330a9ac11994
+++ packages/imagemagick/imagemagick-native_6.3.5-10.bb 12767989ecd51eae729f7a561f0b330a9ac11994
@@ -0,0 +1,3 @@
+require imagemagick_${PV}.bb
+DEPENDS ="libtool-native"
+inherit native
============================================================
--- packages/roadmap/files/roadmap_path.patch a9de0d93760921a56341d70da42a7b27da04fc34
+++ packages/roadmap/files/roadmap_path.patch a9de0d93760921a56341d70da42a7b27da04fc34
@@ -0,0 +1,57 @@
+--- src/unix/roadmap_path.c.old 2008-01-12 21:08:03.000000000 -0600
++++ src/unix/roadmap_path.c 2008-01-12 21:29:40.000000000 -0600
+@@ -93,23 +93,18 @@ static const char *RoadMapPathConfig[] =
+ "/opt/QtPalmtop/share/roadmap",
+ "/mnt/cf/QtPalmtop/share/roadmap",
+ "/mnt/card/QtPalmtop/share/roadmap",
+-#else
++#endif
+ /* This is for standard Unix configurations. */
+ "/etc/roadmap",
+ "/usr/local/share/roadmap",
+ "/usr/share/roadmap",
+-#endif
+ NULL
+ };
+ static const char *RoadMapPathConfigPreferred =
+ #ifdef ROADMAP_CONFIG_DIR
+ ROADMAP_CONFIG_DIR;
+ #else
+-#ifdef QWS
+- "/mnt/cf/QtPalmtop/share/roadmap";
+-#else
+- "/usr/local/share/roadmap";
+-#endif
++ "/usr/share/roadmap";
+ #endif
+
+
+@@ -123,7 +118,7 @@ static const char *RoadMapPathMaps[] = {
+ "/opt/QtPalmtop/share/roadmap/...",
+ "/mnt/cf/QtPalmtop/share/roadmap/...",
+ "/mnt/card/QtPalmtop/share/roadmap/...",
+-#else
++#endif
+ /* This is for standard Unix configurations. */
+ "&/maps/...",
+ "/var/lib/roadmap/...",
+@@ -134,19 +129,14 @@ static const char *RoadMapPathMaps[] = {
+ */
+ "/usr/local/share/roadmap/...",
+ "/usr/share/roadmap/...",
+-#endif
+ NULL
+ };
+ static const char *RoadMapPathMapsPreferred =
+ #ifdef ROADMAP_MAP_DIR
+ ROADMAP_MAP_DIR;
+ #else
+-#ifdef QWS
+- "/mnt/cf/QtPalmtop/share/roadmap";
+-#else
+ "/var/lib/roadmap";
+ #endif
+-#endif
+
+ /* The default path for the icon files (the "icons" path): */
+ static const char *RoadMapPathIcons[] = {
============================================================
--- packages/supertux/files/supertux.desktop ca0d07025948eea625b61a4c138657fd300ff7ac
+++ packages/supertux/files/supertux.desktop ca0d07025948eea625b61a4c138657fd300ff7ac
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Encoding=UTF-8
+Name=SuperTux
+Name[en]=SuperTux
+Name[de]=SuperTux
+Name[cs]=SuperTux
+GenericName=A Platform Game
+GenericName[en]=A Platform Game
+GenericName[de]=Ein Jump&Run Spiel
+GenericName[cs]=Plošinová hra
+Comment=A Super Mario inspired penguin platform game
+Comment[en]=A Super Mario inspired penguin platform game
+Comment[de]=Ein von Super Mario inspiriertes Pinguin Jump&Run Spiel
+Comment[cs]=PloÅ¡inovka inspirovaná SuperMariem s tuÄňákem Tuxem v hlavnà roli
+Icon=supertux.png
+Exec=supertux
+Terminal=false
+StartupNotify=false
+Categories=Application;Game;ArcadeGame
============================================================
--- packages/supertux/supertux_0.1.3.bb 3bdf0dcd28c6bdec7e0869499bb81b27bbfb9d35
+++ packages/supertux/supertux_0.1.3.bb 3bdf0dcd28c6bdec7e0869499bb81b27bbfb9d35
@@ -0,0 +1,22 @@
+DESCRIPTION = "SuperTux is a classic 2D jump'n'run sidescroller game \
+in a style similar to the original SuperMario games."
+SECTION = "games"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r1"
+
+APPIMAGE = "${WORKDIR}/supertux.png"
+APPDESKTOP = "${WORKDIR}/supertux.desktop"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/super-tux/supertux-${PV}.tar.bz2 \
+# http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz;patch=1 \
+ file://supertux.png \
+ file://supertux.desktop \
+ "
+
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+EXTRA_OECONF = "--disable-opengl"
+
+inherit autotools sdl
+
+DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/u-boot/files/fix-data-abort-from-sd-ombug799.patch bd915dc287d002b9db3f2531ecbd27dadbb7d336
+++ packages/u-boot/files/fix-data-abort-from-sd-ombug799.patch bd915dc287d002b9db3f2531ecbd27dadbb7d336
@@ -0,0 +1,11 @@
+--- git.orig/fs/ext2/ext2fs.c 2007-12-13 23:16:13.000000000 -0800
++++ git/fs/ext2/ext2fs.c 2007-12-13 23:16:41.000000000 -0800
+@@ -472,7 +472,7 @@
+ return (0);
+ }
+ if (dirent.namelen != 0) {
+- char filename[dirent.namelen + 1];
++ char filename[256];
+ ext2fs_node_t fdiro;
+ int type = FILETYPE_UNKNOWN;
+
============================================================
--- packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb 5906c2607fc6aca5a48fa0b21942c425013f9722
+++ packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb 5906c2607fc6aca5a48fa0b21942c425013f9722
@@ -0,0 +1,85 @@
+DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support"
+AUTHOR = "Harald Welte <laforge at openmoko.org>, OpenMoko <openmoko-kernel at lists.openmoko.org>"
+LICENSE = "GPL"
+SECTION = "bootloader"
+PRIORITY = "optional"
+
+UBOOT_UPSTREAM_REV = "0ec595243dc99edcd248bbcfbfd5a1dc860bde89"
+UBOOT_OPENMOKO_REV = "3817"
+UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4"
+LOCALVERSION = "+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}"
+PV = "1.3.1${LOCALVERSION}"
+PR = "r1"
+
+PROVIDES = "virtual/bootloader"
+S = "${WORKDIR}/git"
+
+SRC_URI = "\
+ git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV} \
+ svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \
+ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
+ file://makefile-no-dirafter.patch;patch=1 \
+ file://fix-data-abort-from-sd-ombug799.patch;patch=1 \
+"
+
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+TARGET_LDFLAGS = ""
+
+do_quilt() {
+ mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
+ rm -Rf patches .pc
+}
+
+do_svnrev() {
+ mv -f tools/setlocalversion tools/setlocalversion.old
+ echo "echo ${LOCALVERSION}" >>tools/setlocalversion
+}
+
+do_configure_prepend() {
+ find . -name "*.mk" -exec sed -i 's,-mabi=apcs-gnu,,' {} \;
+ find . -name "Makefile" -exec sed -i 's,-mabi=apcs-gnu,,' {} \;
+ cat ${WORKDIR}/uboot-eabi-fix-HACK.patch |patch -p1
+}
+
+do_compile () {
+ chmod +x board/neo1973/gta*/split_by_variant.sh
+ for mach in ${UBOOT_MACHINES}
+ do
+ oe_runmake ${mach}_config
+ oe_runmake clean
+ find board -name lowlevel_foo.bin -exec rm '{}' \;
+ oe_runmake all
+ oe_runmake u-boot.udfu
+ if [ -f u-boot.udfu ]; then
+ mv u-boot.udfu u-boot_${mach}.bin
+ else
+ mv u-boot.bin u-boot_${mach}.bin
+ fi
+ if [ -f board/${mach}/lowlevel_foo.bin ]; then
+ mv board/${mach}/lowlevel_foo.bin \
+ lowlevel_foo_${mach}.bin
+ else
+ find board -name lowlevel_foo.bin \
+ -exec mv '{}' lowlevel_foo_${mach}.bin \;
+ fi
+ done
+}
+
+do_deploy () {
+ install -d ${DEPLOY_DIR_IMAGE}
+ for mach in ${UBOOT_MACHINES}
+ do
+ install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin
+ ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin
+ if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then
+ install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin
+ ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin
+ fi
+ done
+ install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage
+}
+
+do_deploy[dirs] = "${S}"
+addtask deploy before do_package after do_install
+addtask quilt before do_patch after do_unpack
+addtask svnrev before do_patch after do_quilt
============================================================
--- contrib/python/generate-manifest-2.5.py b7e8bd24539139e7ffcc8d7a6f869f503d1c3ff5
+++ contrib/python/generate-manifest-2.5.py 42794139eb5d2d065e423c46dd2858a4b6a04f34
@@ -11,7 +11,7 @@ VERSION = "2.5.1"
VERSION = "2.5.1"
# increase when touching python-core, this should be the same ml version as in python_2.5.1.bb
-BASEREV = 5
+BASEREV = 6
__author__ = "Michael 'Mickey' Lauer <mickey at Vanille.de>"
__version__ = "20071205"
============================================================
--- packages/libsdl/libsdl-mixer_1.2.6.bb cfee648682c7559cf233d5a7d0ae67430f94a636
+++ packages/libsdl/libsdl-mixer_1.2.6.bb 8866166728bbf910308433bf453a286adc1fa2ec
@@ -1,9 +1,9 @@ PRIORITY = "optional"
DESCRIPTION = "Simple DirectMedia Layer mixer library."
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS = "virtual/libsdl"
+DEPENDS = "virtual/libsdl libmikmod"
LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz"
S = "${WORKDIR}/SDL_mixer-${PV}"
@@ -12,7 +12,7 @@ inherit autotools
inherit autotools
-EXTRA_OECONF = "--disable-music-mp3 --disable-music-libmikmod"
+EXTRA_OECONF = "--disable-music-mp3"
# although we build smpeg... need to find out how
# to deal with optional dependencies
============================================================
--- packages/linux/linux/simpad/defconfig 9b2a926304e0d3f59c4cc79fc6222c11947ed80f
+++ packages/linux/linux/simpad/defconfig ac1e360a7cdda71682cd334f3c0a28dc02b59533
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21
-# Sat Jul 7 00:02:55 2007
+# Sat Jan 12 20:06:01 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -227,7 +227,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE=""
+CONFIG_CMDLINE=" quiet "
# CONFIG_XIP_KERNEL is not set
# CONFIG_KEXEC is not set
@@ -413,7 +413,12 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
# CONFIG_BT_HCIBLUECARD is not set
# CONFIG_BT_HCIBTUART is not set
# CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+# CONFIG_IEEE80211_CRYPT_CCMP is not set
+# CONFIG_IEEE80211_CRYPT_TKIP is not set
+# CONFIG_IEEE80211_SOFTMAC is not set
CONFIG_WIRELESS_EXT=y
#
@@ -663,34 +668,40 @@ CONFIG_NET_RADIO=y
# Wireless LAN (non-hamradio)
#
CONFIG_NET_RADIO=y
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
+CONFIG_NET_WIRELESS_RTNETLINK=y
#
# Obsolete Wireless cards support (pre-802.11)
#
# CONFIG_STRIP is not set
-# CONFIG_ARLAN is not set
+CONFIG_ARLAN=m
# CONFIG_WAVELAN is not set
CONFIG_PCMCIA_WAVELAN=m
-# CONFIG_PCMCIA_NETWAVE is not set
+CONFIG_PCMCIA_NETWAVE=m
#
# Wireless 802.11 Frequency Hopping cards support
#
-# CONFIG_PCMCIA_RAYCS is not set
+CONFIG_PCMCIA_RAYCS=m
#
# Wireless 802.11b ISA/PCI cards support
#
-# CONFIG_HERMES is not set
-# CONFIG_ATMEL is not set
+CONFIG_HERMES=m
+CONFIG_ATMEL=m
#
# Wireless 802.11b Pcmcia/Cardbus cards support
#
-# CONFIG_AIRO_CS is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_HOSTAP is not set
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_AIRO_CS=m
+# CONFIG_PCMCIA_ATMEL is not set
+CONFIG_PCMCIA_WL3501=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_CS=m
CONFIG_NET_WIRELESS=y
#
@@ -940,10 +951,7 @@ CONFIG_FONT_8x16=y
#
# Logo configuration
#
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
#
# Sound
@@ -986,7 +994,7 @@ CONFIG_USB_ARCH_HAS_HCD=y
#
# MMC/SD Card support
#
-# CONFIG_MMC_SPI_BLOCK is not set
+CONFIG_MMC_SPI_BLOCK=m
# CONFIG_MMC is not set
#
@@ -1247,7%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -red94d35280e9dbc28ff90a5b175dc47c752bf347 -rab1a06b7453ad48a1ad5b4f9ee053cd6a9e04d28
#
#
#
# add_dir "packages/monit"
#
# add_dir "packages/monit/files"
#
# add_dir "packages/monit/monit-4.10.1"
#
# add_file "packages/monit/files/init"
# content [0803d04f265b5e23401f6611b137dd47114def35]
#
# add_file "packages/monit/monit-4.10.1/init"
# content [0803d04f265b5e23401f6611b137dd47114def35]
#
# add_file "packages/monit/monit_4.10.1.bb"
# content [ce8f34274bb715666a2aceab80b44e5f4b8bcbec]
#
# patch "packages/meta/slugos-packages.bb"
# from [1a2ceb929514b8bcf127cdcde0a9622c8ac4a28a]
# to [051f067b1365e603f425622b2d4df43fcd387fe6]
#
============================================================
--- packages/monit/files/init 0803d04f265b5e23401f6611b137dd47114def35
+++ packages/monit/files/init 0803d04f265b5e23401f6611b137dd47114def35
@@ -0,0 +1,42 @@
+#! /bin/sh
+#
+# This is an init script for openembedded
+# Copy it to /etc/init.d/monit and type
+# > update-rc.d monit defaults 99
+#
+monit=/usr/bin/monit
+pidfile=/var/run/monit.pid
+monit_args="-c /etc/monitrc"
+
+test -x "$monit" || exit 0
+
+case "$1" in
+ start)
+ echo -n "Starting Monit"
+ start-stop-daemon --start --quiet --exec $monit -- $monit_args
+ RETVAL=$?
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping Monit"
+ start-stop-daemon --stop --quiet --pidfile $pidfile
+ RETVAL=$?
+ echo "."
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ RETVAL=$?
+ ;;
+ status)
+ $monit $monit_args status
+ RETVAL=$?
+ echo "."
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|status}"
+ exit 1
+esac
+
+exit $RETVAL
+
============================================================
--- packages/monit/monit-4.10.1/init 0803d04f265b5e23401f6611b137dd47114def35
+++ packages/monit/monit-4.10.1/init 0803d04f265b5e23401f6611b137dd47114def35
@@ -0,0 +1,42 @@
+#! /bin/sh
+#
+# This is an init script for openembedded
+# Copy it to /etc/init.d/monit and type
+# > update-rc.d monit defaults 99
+#
+monit=/usr/bin/monit
+pidfile=/var/run/monit.pid
+monit_args="-c /etc/monitrc"
+
+test -x "$monit" || exit 0
+
+case "$1" in
+ start)
+ echo -n "Starting Monit"
+ start-stop-daemon --start --quiet --exec $monit -- $monit_args
+ RETVAL=$?
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping Monit"
+ start-stop-daemon --stop --quiet --pidfile $pidfile
+ RETVAL=$?
+ echo "."
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ RETVAL=$?
+ ;;
+ status)
+ $monit $monit_args status
+ RETVAL=$?
+ echo "."
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|status}"
+ exit 1
+esac
+
+exit $RETVAL
+
============================================================
--- packages/monit/monit_4.10.1.bb ce8f34274bb715666a2aceab80b44e5f4b8bcbec
+++ packages/monit/monit_4.10.1.bb ce8f34274bb715666a2aceab80b44e5f4b8bcbec
@@ -0,0 +1,24 @@
+LICENSE = "GPL"
+DEPENDS = "openssl"
+
+SRC_URI = "http://www.tildeslash.com/monit/dist/monit-${PV}.tar.gz\
+ file://init"
+
+INITSCRIPT_NAME = "monit"
+INITSCRIPT_PARAMS = "defaults 99"
+
+inherit autotools update-rc.d
+
+EXTRA_OECONF = "--with-ssl-lib-dir=${STAGING_LIBDIR} --with-ssl-incl-dir=${STAGING_INCDIR}"
+
+do_install_append() {
+ install -d ${D}${sysconfdir}/init.d/
+ install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/monit
+ sed -i 's:# set daemon 120:set daemon 120:' ${S}/monitrc
+ sed -i 's:include /etc/monit.d/:include /${sysconfdir}/monit.d/:' ${S}/monitrc
+ install -m 600 ${S}/monitrc ${D}${sysconfdir}/monitrc
+ install -m 700 -d ${D}${sysconfdir}/monit.d/
+}
+
+CONFFILES_${PN} += "${sysconfdir}/monitrc"
+
============================================================
--- packages/meta/slugos-packages.bb 1a2ceb929514b8bcf127cdcde0a9622c8ac4a28a
+++ packages/meta/slugos-packages.bb 051f067b1365e603f425622b2d4df43fcd387fe6
@@ -24,7 +24,18 @@ SLUGOS_PACKAGES = "\
apex-env \
apr \
asterisk \
- asterisk-sounds \
+ asterisk-core-sounds-en-alaw \
+ asterisk-core-sounds-en-g729 \
+ asterisk-core-sounds-en-gsm \
+ asterisk-core-sounds-en-ulaw \
+ asterisk-extra-sounds-en-alaw \
+ asterisk-extra-sounds-en-g729 \
+ asterisk-extra-sounds-en-gsm \
+ asterisk-extra-sounds-en-ulaw \
+ asterisk-moh-freeplay-alaw \
+ asterisk-moh-freeplay-g729 \
+ asterisk-moh-freeplay-gsm \
+ asterisk-moh-freeplay-ulaw \
atftp \
audiofile \
aumix \
@@ -137,6 +148,7 @@ SLUGOS_PACKAGES = "\
miau \
microcom \
minicom \
+ monit \
motion \
mpd \
mt-daapd \
@@ -148,9 +160,11 @@ SLUGOS_PACKAGES = "\
ncftp \
ncurses \
net-tools \
+ netatalk \
netcat \
netpbm \
nfs-utils \
+ ngrep \
nmap \
ntfs-3g \
ntp \
More information about the Openembedded-commits
mailing list