Changeset 63

Show
Ignore:
Timestamp:
03/30/08 14:13:11 (5 years ago)
Author:
bryank
Message:

Merge changes made in these recipes in OE, but don't undo changes we made locally.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openembedded/zipitZ2BBfiles/base-files/base-files_3.0.14.bb

    r22 r63  
    4747 
    4848volatiles = "cache run lock tmp" 
    49  
    5049conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ 
    5150             ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \ 
    …… 
    119118 
    120119        ln -sf /proc/mounts ${D}${sysconfdir}/mtab 
    121  
    122120} 
    123121 
    …… 
    148146} 
    149147 
    150 PACKAGES = "${PN}-doc ${PN}" 
     148PACKAGES = "${PN}-dbg ${PN}-doc ${PN}" 
    151149FILES_${PN} = "/*" 
    152150FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" 

  • openembedded/zipitZ2BBfiles/netbase/netbase_4.21.bb

    r28 r63  
    33SECTION = "base" 
    44LICENSE = "GPL" 
    5 PR = "r25" 
     5PR = "r27" 
    66 
    77inherit update-rc.d 

  • openembedded/zipitZ2BBfiles/sysvinit/sysvinit_2.86.bb

    r62 r63  
    33LICENSE = "GPL" 
    44HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" 
    5 PR = "r36" 
     5PR = "r40" 
    66 
    77# USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. 
    …… 
    105105 
    106106pkg_postinst_${PN} () { 
    107         update-alternatives --install ${base_sbindir}/halt halt halt.${PN} 200 
    108         update-alternatives --install ${base_sbindir}/reboot reboot reboot.${PN} 200 
    109         update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 200 
    110         update-alternatives --install ${bindir}/last last last.${PN} 200 
    111         update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 200 
    112         update-alternatives --install ${bindir}/wall wall wall.${PN} 200 
     107#!/bin/sh 
     108update-alternatives --install ${base_sbindir}/halt halt halt.${PN} 200 
     109update-alternatives --install ${base_sbindir}/reboot reboot reboot.${PN} 200 
     110update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 200 
     111update-alternatives --install ${bindir}/last last last.${PN} 200 
     112update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 200 
     113update-alternatives --install ${bindir}/wall wall wall.${PN} 200 
    113114} 
    114115 
    115116pkg_prerm_${PN} () { 
    116         update-alternatives --remove halt halt.${PN} 
    117         update-alternatives --remove reboot reboot.${PN} 
    118         update-alternatives --remove shutdown shutdown.${PN} 
    119         update-alternatives --remove last last.${PN} 
    120         update-alternatives --remove mesg mesg.${PN} 
    121         update-alternatives --remove wall wall.${PN} 
     117#!/bin/sh 
     118update-alternatives --remove halt halt.${PN} 
     119update-alternatives --remove reboot reboot.${PN} 
     120update-alternatives --remove shutdown shutdown.${PN} 
     121update-alternatives --remove last last.${PN} 
     122update-alternatives --remove mesg mesg.${PN} 
     123update-alternatives --remove wall wall.${PN} 
    122124} 
    123125 
    124126pkg_postinst_sysvinit-pidof () { 
    125         update-alternatives --install ${base_bindir}/pidof pidof pidof.${PN} 200 
     127#!/bin/sh 
     128update-alternatives --install ${base_bindir}/pidof pidof pidof.${PN} 200 
    126129} 
    127130 
    128131pkg_prerm_sysvinit-pidof () { 
    129         update-alternatives --remove pidof pidof.${PN} 
     132#!/bin/sh 
     133update-alternatives --remove pidof pidof.${PN} 
    130134} 

  • openembedded/zipitZ2BBfiles/tzdata/tzdata_2007k.bb

    r37 r63  
    44DEPENDS = "tzcode-native" 
    55 
    6 PR = "r0" 
     6PR = "r2" 
    77 
    8 PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ 
    9             tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ 
    10             tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" 
    11 RPROVIDES = "tzdata" 
    128RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ 
    139             timezone-arctic timezone-asia timezone-atlantic \ 
    …… 
    4339# in most time zones in the base package 
    4440 
    45 PACKAGES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ 
     41PACKAGES = "${PN}-dbg tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ 
    4642    tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ 
    4743    tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" 
     44 
     45ALLOW_EMPTY_${PN}-dbg = "1" 
    4846 
    4947FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*" 
    …… 
    127125                ${datadir}/zoneinfo/Asia/Hong_Kong       \ 
    128126                ${datadir}/zoneinfo/Asia/Tokyo           \ 
     127                ${datadir}/zoneinfo/Australia/Darwin     \ 
     128                ${datadir}/zoneinfo/Australia/Adelaide   \ 
     129                ${datadir}/zoneinfo/Australia/Brisbane   \ 
    129130                ${datadir}/zoneinfo/Australia/Sydney     \ 
    130131                ${datadir}/zoneinfo/Pacific/Noumea       \ 

  • openembedded/zipitZ2BBfiles/xorg-xserver/xserver-kdrive_1.4.bb

    r60 r63  
    44 
    55PE = "1" 
    6 PR = "r3" 
     6PR = "r4" 
    77 
    88SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ 
    …… 
    1919        file://keyboard-resume-workaround.patch;patch=1 \ 
    2020        file://xorg-avr32-support.diff;patch=1 \ 
     21        file://pkgconfig_fix.patch;patch=1 \ 
    2122        file://xkb-ensure-assign-nTty.patch;patch=1 \ 
    2223        file://xkb-dont-map-keys.patch;patch=1 \ 

  • openembedded/zipitZ2BBfiles/xorg-xserver/xserver-kdrive-common.inc

    r56 r63  
    1010             xserver-kdrive-epson \ 
    1111             xserver-kdrive-ati \ 
    12              xserver-kdrive-glamo \ 
    1312             xserver-kdrive-chips \ 
    1413             xserver-kdrive-i810 \ 
    …… 
    3231DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" 
    3332DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" 
    34 DESCRIPTION_xserver-kdrive-glamo = "X server from freedesktop.org, supporting Smedia Glamo chipset" 
    3533DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets" 
    3634DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets" 
    …… 
    5452FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" 
    5553FILES_xserver-kdrive-ati = "${bindir}/Xati" 
    56 FILES_xserver-kdrive-glamo = "${bindir}/Xglamo" 
    5754FILES_xserver-kdrive-chips = "${bindir}/Xchips" 
    5855FILES_xserver-kdrive-i810 = "${bindir}/Xi810" 
    …… 
    7471RDEPENDS_xserver-kdrive-sdl = "${PN}" 
    7572RDEPENDS_xserver-kdrive-ati = "${PN}" 
    76 RDEPENDS_xserver-kdrive-glamo = "${PN}" 
    7773RDEPENDS_xserver-kdrive-chips = "${PN}" 
    7874RDEPENDS_xserver-kdrive-i810 = "${PN}"