diff options
author | Martin Dietze <di@fh-wedel.de> | 2007-04-27 09:07:30 +0000 |
---|---|---|
committer | Martin Dietze <di@fh-wedel.de> | 2007-04-27 09:07:30 +0000 |
commit | 39bfd6436cea5f93f8d429b650beeb587af0cec8 (patch) | |
tree | a557e0acd2726e7ae8dd8bb7839cdb2331ad19b9 /packages/images | |
parent | 3d75046772500b479cbfaa0c199aa7ef069fdc7a (diff) | |
parent | 21174316f8181c882e6816b923ad2ca81c3778a2 (diff) |
merge of '30f615c65861e2aeac9bcd31565276b2d5929532'
and '3267272c84aca4cba0b1f3d43c934a2d3be05af4'
Diffstat (limited to 'packages/images')
-rw-r--r-- | packages/images/bootstrap-image.bb | 3 | ||||
-rw-r--r-- | packages/images/maemo-image.bb | 2 | ||||
-rw-r--r-- | packages/images/pivotboot-image.bb | 3 | ||||
-rw-r--r-- | packages/images/sectest-gpe-image.bb | 2 |
4 files changed, 0 insertions, 10 deletions
diff --git a/packages/images/bootstrap-image.bb b/packages/images/bootstrap-image.bb index 1ff60e60e1..f25ad222aa 100644 --- a/packages/images/bootstrap-image.bb +++ b/packages/images/bootstrap-image.bb @@ -6,7 +6,4 @@ DEPENDS = "${MACHINE_TASK_PROVIDER}" inherit image -FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \ - opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" - LICENSE = "MIT" diff --git a/packages/images/maemo-image.bb b/packages/images/maemo-image.bb index 2153e427c1..f8f5cb5c9d 100644 --- a/packages/images/maemo-image.bb +++ b/packages/images/maemo-image.bb @@ -2,8 +2,6 @@ # Meta package for maemo based system image # -FEED_URIS_append_familiar = " maemo##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/maemo" - PR = "r2" export IMAGE_BASENAME = "maemo-image" diff --git a/packages/images/pivotboot-image.bb b/packages/images/pivotboot-image.bb index 78c3d7a6e9..529e4cdb83 100644 --- a/packages/images/pivotboot-image.bb +++ b/packages/images/pivotboot-image.bb @@ -7,7 +7,4 @@ PR = "r1" inherit image -FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \ - opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" - LICENSE = "MIT" diff --git a/packages/images/sectest-gpe-image.bb b/packages/images/sectest-gpe-image.bb index fa16437662..a56991b902 100644 --- a/packages/images/sectest-gpe-image.bb +++ b/packages/images/sectest-gpe-image.bb @@ -1,8 +1,6 @@ LICENSE = "MIT" PR = "r6" -FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11" - export IMAGE_BASENAME = "sectest-gpe-image" GPE_EXTRA_THEMES = "\ |