diff options
| author |   Koen Kooi <koen@openembedded.org> | 2009-12-04 11:14:49 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-12-04 11:14:49 +0100 |
| commit | 99f78d400254c8f8a6d6a998ac72a9c49a648dd3 (patch) | |
| tree | 7c781f35ab369e88b0e224260b1bb4376f858e57 /recipes/xorg-font | |
| parent | f591b28ed94da8ed215cb279f17f1319179f8720 (diff) | |
| download | openembedded-99f78d400254c8f8a6d6a998ac72a9c49a648dd3.tar.gz | |
font-util: fix merge damage
Diffstat (limited to 'recipes/xorg-font')
| -rw-r--r-- | recipes/xorg-font/font-util-native_1.0.1.bb | 2 | ||||
| -rw-r--r-- | recipes/xorg-font/font-util_1.0.1.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes/xorg-font/font-util-native_1.0.1.bb b/recipes/xorg-font/font-util-native_1.0.1.bb index cb117bf957..ffcd60c8b7 100644 --- a/recipes/xorg-font/font-util-native_1.0.1.bb +++ b/recipes/xorg-font/font-util-native_1.0.1.bb @@ -1,4 +1,4 @@ -be inherit native +inherit native require xorg-font-common.inc XORG_PN = "font-util" diff --git a/recipes/xorg-font/font-util_1.0.1.bb b/recipes/xorg-font/font-util_1.0.1.bb index 5a1761bf6a..4d55407ff9 100644 --- a/recipes/xorg-font/font-util_1.0.1.bb +++ b/recipes/xorg-font/font-util_1.0.1.bb @@ -1,4 +1,4 @@ -Qurequire xorg-font-common.inc +require xorg-font-common.inc PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" |