diff options
| author | Stelios Koroneos <skoroneos@digital-opsis.com> | 2008-04-02 09:33:38 +0000 |
|---|---|---|
| committer | Stelios Koroneos <skoroneos@digital-opsis.com> | 2008-04-02 09:33:38 +0000 |
| commit | db5c57ee30343602c897f0b11e5e635c54af05cf (patch) | |
| tree | 3d93c1ec68c6aaf34d40e72527f98d5f540514c6 | |
| parent | 507cc9a74d34783a4a941429b65eb92d149d2766 (diff) | |
| parent | bdf75f7e48d843190819b9dc81d56b9e955ff9d3 (diff) | |
merge of '6fe43ab76c4fc12eb8d88adfd84e1aa260ca5d6f'
and 'c77bda4ba3178abef09bacdc2fbf63fd225870ca'
| -rw-r--r-- | packages/gnome/libgnomecups_0.2.2.bb | 5 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 3 | ||||
| -rw-r--r-- | packages/wv/wv_1.2.0.bb | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/packages/gnome/libgnomecups_0.2.2.bb b/packages/gnome/libgnomecups_0.2.2.bb index 53251ba84b..905a4a6ea7 100644 --- a/packages/gnome/libgnomecups_0.2.2.bb +++ b/packages/gnome/libgnomecups_0.2.2.bb @@ -6,6 +6,11 @@ DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui" inherit gnome pkgconfig +do_compile_append () { + cp libgnomecups-1.0.pc libgnomecups-1.0.pc.old + sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old > libgnomecups-1.0.pc +} + do_stage() { autotools_stage_all } diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index c0e274e289..5401237c49 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r49" +PR = "r50" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2|ixp4xx" @@ -208,6 +208,7 @@ SLUGOS_PACKAGES = "\ smartmontools \ spandsp \ sqlite \ + squid \ ssmtp \ strace \ streamripper \ diff --git a/packages/wv/wv_1.2.0.bb b/packages/wv/wv_1.2.0.bb index 5b0a484a67..9e9e65fd49 100644 --- a/packages/wv/wv_1.2.0.bb +++ b/packages/wv/wv_1.2.0.bb @@ -12,6 +12,11 @@ S = "${WORKDIR}/${PN}-${PV}" EXTRA_OECONF = "" +do_compile_append () { + cp wv-1.0.pc wv-1.0.pc.old + sed 's:${STAGING_DIR_HOST}::g' < wv-1.0.pc.old > wv-1.0.pc +} + do_stage () { autotools_stage_all } |