diff options
author | Saul Wold <Saul.Wold@intel.com> | 2010-08-09 11:49:20 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-13 13:36:05 +0100 |
commit | 1766b2bc223523f55d0db982473e2e3f31dbfb11 (patch) | |
tree | 12f9f307ed4a20dcbe724d1e8be262958164b02b /meta-lsb | |
parent | cca50904086f25efb0a4168414c2bbf056c514bc (diff) | |
download | poky-1766b2bc223523f55d0db982473e2e3f31dbfb11.tar.gz |
tasks: updated tasks and images to reflect distro lsb requirments
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta-lsb')
-rw-r--r-- | meta-lsb/packages/images/poky-image-basic.bb | 17 | ||||
-rw-r--r-- | meta-lsb/packages/images/poky-image-lsb.bb | 8 | ||||
-rw-r--r-- | meta-lsb/packages/images/poky-image-small.bb | 7 | ||||
-rw-r--r-- | meta-lsb/packages/tasks/task-poky-basic.bb | 228 | ||||
-rw-r--r-- | meta-lsb/packages/tasks/task-poky-lsb.bb | 163 | ||||
-rw-r--r-- | meta-lsb/packages/tasks/task-poky-small.bb | 38 |
6 files changed, 191 insertions, 270 deletions
diff --git a/meta-lsb/packages/images/poky-image-basic.bb b/meta-lsb/packages/images/poky-image-basic.bb index 5dae327019..537a6e4122 100644 --- a/meta-lsb/packages/images/poky-image-basic.bb +++ b/meta-lsb/packages/images/poky-image-basic.bb | |||
@@ -2,22 +2,7 @@ IMAGE_FEATURES += "apps-console-core " | |||
2 | 2 | ||
3 | IMAGE_INSTALL = "\ | 3 | IMAGE_INSTALL = "\ |
4 | ${POKY_BASE_INSTALL} \ | 4 | ${POKY_BASE_INSTALL} \ |
5 | task-poky-small \ | 5 | task-poky-basic \ |
6 | task-poky-basic-libs \ | ||
7 | task-poky-basic-libs-dbg \ | ||
8 | task-poky-basic-libs-dev \ | ||
9 | task-poky-basic-utils \ | ||
10 | task-poky-basic-utils-dbg \ | ||
11 | task-poky-basic-utils-dev \ | ||
12 | task-poky-minimal-extras \ | ||
13 | task-poky-minimal-extras-dbg \ | ||
14 | task-poky-minimal-extras-dev \ | ||
15 | task-poky-pkg-managment-opkg \ | ||
16 | task-poky-pkg-managment-opkg-dbg \ | ||
17 | task-poky-pkg-managment-opkg-dev \ | ||
18 | task-poky-network-services \ | ||
19 | task-poky-network-services-dbg \ | ||
20 | task-poky-network-services-dev \ | ||
21 | " | 6 | " |
22 | 7 | ||
23 | inherit poky-image | 8 | inherit poky-image |
diff --git a/meta-lsb/packages/images/poky-image-lsb.bb b/meta-lsb/packages/images/poky-image-lsb.bb index af97894f80..8424d91bb4 100644 --- a/meta-lsb/packages/images/poky-image-lsb.bb +++ b/meta-lsb/packages/images/poky-image-lsb.bb | |||
@@ -2,12 +2,8 @@ IMAGE_FEATURES += "apps-console-core " | |||
2 | 2 | ||
3 | IMAGE_INSTALL = "\ | 3 | IMAGE_INSTALL = "\ |
4 | ${POKY_BASE_INSTALL} \ | 4 | ${POKY_BASE_INSTALL} \ |
5 | task-poky-small-utils \ | 5 | task-poky-basic \ |
6 | task-poky-basic-libs \ | 6 | task-poky-lsb \ |
7 | task-poky-basic-utils \ | ||
8 | task-poky-extended-libs \ | ||
9 | task-poky-extended-utils \ | ||
10 | task-poky-network-services \ | ||
11 | " | 7 | " |
12 | 8 | ||
13 | inherit poky-image | 9 | inherit poky-image |
diff --git a/meta-lsb/packages/images/poky-image-small.bb b/meta-lsb/packages/images/poky-image-small.bb deleted file mode 100644 index 33248c3e5a..0000000000 --- a/meta-lsb/packages/images/poky-image-small.bb +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | IMAGE_FEATURES += "apps-console-core " | ||
2 | |||
3 | IMAGE_INSTALL = "\ | ||
4 | ${POKY_BASE_INSTALL} \ | ||
5 | task-poky-small-utils" | ||
6 | |||
7 | inherit poky-image | ||
diff --git a/meta-lsb/packages/tasks/task-poky-basic.bb b/meta-lsb/packages/tasks/task-poky-basic.bb index fa86096153..04039a3ae3 100644 --- a/meta-lsb/packages/tasks/task-poky-basic.bb +++ b/meta-lsb/packages/tasks/task-poky-basic.bb | |||
@@ -2,149 +2,157 @@ | |||
2 | # Copyright (C) 2010 Intel Corporation | 2 | # Copyright (C) 2010 Intel Corporation |
3 | # | 3 | # |
4 | 4 | ||
5 | DESCRIPTION = "Create Small Image Tasks" | 5 | DESCRIPTION = "Create Basic Image Tasks" |
6 | PR = "r0" | 6 | PR = "r1" |
7 | 7 | ||
8 | PACKAGES = "\ | 8 | PACKAGES = "\ |
9 | task-poky-small \ | 9 | task-poky-basic \ |
10 | task-poky-base-utils \ | ||
11 | task-poky-base-utils-dbg \ | ||
12 | task-poky-base-utils-dev \ | ||
10 | task-poky-basic-libs \ | 13 | task-poky-basic-libs \ |
11 | task-poky-basic-libs-dbg \ | 14 | task-poky-basic-libs-dbg \ |
12 | task-poky-basic-libs-dev \ | 15 | task-poky-basic-libs-dev \ |
13 | task-poky-basic-utils \ | 16 | task-poky-basic-utils \ |
14 | task-poky-basic-utils-dbg \ | 17 | task-poky-basic-utils-dbg \ |
15 | task-poky-basic-utils-dev \ | 18 | task-poky-basic-utils-dev \ |
16 | task-poky-minimal-extras \ | 19 | task-poky-basic-extended \ |
17 | task-poky-minimal-extras-dbg \ | 20 | task-poky-basic-extended-dbg \ |
18 | task-poky-minimal-extras-dev \ | 21 | task-poky-basic-extended-dev \ |
19 | task-poky-pkg-managment-opkg \ | 22 | task-poky-dev-utils \ |
20 | task-poky-pkg-managment-opkg-dbg \ | 23 | task-poky-dev-utils-dbg \ |
21 | task-poky-pkg-managment-opkg-dev \ | 24 | task-poky-dev-utils-dev \ |
22 | task-poky-network-services \ | 25 | task-poky-multiuser \ |
23 | task-poky-network-services-dbg \ | 26 | task-poky-multiuser-dbg \ |
24 | task-poky-network-services-dev \ | 27 | task-poky-multiuser-dev \ |
28 | task-poky-initscripts \ | ||
29 | task-poky-initscripts-dbg \ | ||
30 | task-poky-initscripts-dev \ | ||
31 | task-poky-rpm \ | ||
32 | task-poky-rpm-dbg \ | ||
33 | task-poky-rpm-dev \ | ||
34 | task-poky-sys-services \ | ||
35 | task-poky-sys-services-dbg \ | ||
36 | task-poky-sys-services-dev \ | ||
25 | " | 37 | " |
26 | 38 | ||
27 | ALLOW_EMPTY = "1" | 39 | ALLOW_EMPTY = "1" |
28 | 40 | ||
29 | RDEPENDS_task-poky-minimal-extras = "\ | 41 | RDEPENDS_task-poky-basic = "\ |
30 | makedevs \ | 42 | task-poky-base-utils \ |
31 | ncurses \ | 43 | task-poky-basic-libs \ |
32 | zlib \ | 44 | task-poky-basic-utils \ |
33 | udev \ | 45 | task-poky-basic-extended \ |
34 | udev-extraconf \ | 46 | task-poky-dev-utils \ |
35 | expat \ | 47 | task-poky-multiuser \ |
36 | " | 48 | task-poky-initscripts \ |
37 | 49 | task-poky-rpm \ | |
38 | RDEPENDS_task-poky-pkg-managment-opkg = "\ | 50 | task-poky-sys-services \ |
39 | curl \ | ||
40 | gnutls \ | ||
41 | gpgme \ | ||
42 | libgcrypt \ | ||
43 | libgpg-error \ | ||
44 | lzo \ | ||
45 | opkg-config-base \ | ||
46 | opkg-collateral \ | ||
47 | opkg \ | ||
48 | pth \ | ||
49 | " | ||
50 | |||
51 | RDEPENDS_task-poky-network-services = "\ | ||
52 | # iproute \ | ||
53 | # iputils \ | ||
54 | # iptables \ | ||
55 | nfs-utils \ | ||
56 | " | 51 | " |
57 | 52 | ||
58 | RDEPENDS_task-poky-shells = "\ | 53 | RDEPENDS_task-poky-base-utils = "\ |
59 | bash \ | 54 | busybox \ |
60 | mktemp \ | 55 | dropbear \ |
61 | |||
62 | |||
63 | RDEPENDS_task-poky-misc = "\ | ||
64 | strace \ | ||
65 | lsof \ | ||
66 | elfutils \ | ||
67 | usbutils \ | ||
68 | zlib \ | ||
69 | libusb \ | ||
70 | libstdcxx \ | ||
71 | bluez4 \ | ||
72 | " | 56 | " |
73 | 57 | ||
74 | RDEPENDS_task-poky-basic-libs = "\ | 58 | RDEPENDS_task-poky-basic-libs = "\ |
75 | # libssh2 \ | 59 | glib-2.0 \ |
76 | dbus-glib \ | ||
77 | # nfs-utils-lib \ | ||
78 | " | 60 | " |
79 | 61 | ||
80 | RDEPENDS_task-poky-basic-utils = "\ | 62 | RDEPENDS_task-poky-basic-utils = "\ |
63 | bash \ | ||
64 | # acl \ | ||
65 | attr \ | ||
66 | bc \ | ||
67 | coreutils \ | ||
68 | # cpio \ | ||
69 | e2fsprogs \ | ||
70 | ed \ | ||
71 | file \ | ||
72 | findutils \ | ||
73 | # gawk \ | ||
74 | gmp \ | ||
75 | # grep \ | ||
76 | makedevs \ | ||
77 | # mktemp \ | ||
78 | ncurses \ | ||
79 | # net-tools \ | ||
80 | # pax \ | ||
81 | popt \ | ||
82 | procps \ | ||
83 | psmisc \ | ||
84 | sed \ | ||
85 | tar \ | ||
86 | time \ | ||
87 | udev \ | ||
88 | util-linux \ | ||
89 | zlib \ | ||
90 | " | ||
91 | |||
92 | RDEPENDS_task-poky-basic-extended = "\ | ||
93 | # iproute \ | ||
94 | # iputils \ | ||
95 | iptables \ | ||
96 | module-init-tools \ | ||
81 | # openssh \ | 97 | # openssh \ |
82 | openssl \ | 98 | openssl \ |
83 | pam \ | 99 | " |
100 | |||
101 | RDEPENDS_task-poky-dev-utils = "\ | ||
102 | byacc \ | ||
103 | diffutils \ | ||
104 | m4 \ | ||
105 | make \ | ||
106 | patch \ | ||
107 | binutils \ | ||
108 | " | ||
109 | |||
110 | RDEPENDS_task-poky-initscripts = "\ | ||
111 | initscripts \ | ||
112 | sysvinit \ | ||
113 | # ethtool \ | ||
114 | # mingetty \ | ||
115 | # sysklogd \ | ||
116 | " | ||
117 | |||
118 | RDEPENDS_task-poky-multiuser = "\ | ||
119 | # cracklib \ | ||
120 | gzip \ | ||
121 | # libuser \ | ||
122 | libpam \ | ||
123 | # passwd \ | ||
124 | shadow \ | ||
84 | sudo \ | 125 | sudo \ |
126 | " | ||
127 | |||
128 | RDEPENDS_task-poky-rpm = "\ | ||
85 | beecrypt \ | 129 | beecrypt \ |
86 | curl \ | ||
87 | elfutils \ | ||
88 | neon \ | ||
89 | # mktemp \ | ||
90 | rpm \ | 130 | rpm \ |
131 | " | ||
132 | |||
133 | RDEPENDS_task-poky-sys-services = "\ | ||
134 | at \ | ||
91 | bzip2 \ | 135 | bzip2 \ |
136 | # cronie \ | ||
92 | # crontabs \ | 137 | # crontabs \ |
93 | dbus \ | 138 | dbus \ |
139 | dbus-glib \ | ||
94 | python-dbus \ | 140 | python-dbus \ |
95 | e2fsprogs \ | 141 | elfutils \ |
96 | gdbm \ | 142 | gzip \ |
97 | hal \ | 143 | hal \ |
98 | less \ | 144 | less \ |
99 | popt \ | ||
100 | portmap \ | ||
101 | readline \ | ||
102 | # cron \ | ||
103 | # yaffs2 \ | ||
104 | " | ||
105 | |||
106 | RDEPENDS_task-poky-extended-libs = "\ | ||
107 | # cracklib \ | ||
108 | glib-2.0 \ | ||
109 | libcap \ | 145 | libcap \ |
110 | libevent \ | 146 | libevent \ |
111 | " | ||
112 | |||
113 | RDEPENDS_task-poky-extended-utils = "\ | ||
114 | # acl \ | ||
115 | at \ | ||
116 | attr \ | ||
117 | # bc \ | ||
118 | binutils \ | ||
119 | # cpio \ | ||
120 | # cracklib \ | ||
121 | # logrotate \ | 147 | # logrotate \ |
122 | # pax \ | 148 | nfs-utils \ |
123 | # shadow \ | 149 | pciutils \ |
124 | sqlite3 \ | 150 | libpcre \ |
125 | # syslog \ | 151 | # perl-XML-Parser \ |
126 | # ed \ | 152 | portmap \ |
127 | # lsb \ | 153 | # rpcbind \ |
128 | # mailx \ | 154 | sysfsutils \ |
129 | # man \ | 155 | tcp-wrappers \ |
130 | # sendmail \ | 156 | tzdata \ |
131 | tar \ | ||
132 | tcl \ | ||
133 | " | ||
134 | |||
135 | RDEPENDS_task-poky-python = "\ | ||
136 | gdbm \ | ||
137 | perl \ | ||
138 | zlib \ | ||
139 | " | 157 | " |
140 | 158 | ||
141 | RDEPENDS_task-poky-python = "\ | ||
142 | expat \ | ||
143 | gdbm \ | ||
144 | gmp \ | ||
145 | ncurses \ | ||
146 | openssl \ | ||
147 | python \ | ||
148 | readline \ | ||
149 | zlib \ | ||
150 | " | ||
diff --git a/meta-lsb/packages/tasks/task-poky-lsb.bb b/meta-lsb/packages/tasks/task-poky-lsb.bb index 034a5ca4c4..61db75150b 100644 --- a/meta-lsb/packages/tasks/task-poky-lsb.bb +++ b/meta-lsb/packages/tasks/task-poky-lsb.bb | |||
@@ -3,118 +3,79 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | DESCRIPTION = "Create Small Image Tasks" | 5 | DESCRIPTION = "Create Small Image Tasks" |
6 | PR = "r0" | 6 | PR = "r1" |
7 | 7 | ||
8 | PACKAGES = "\ | 8 | PACKAGES = "\ |
9 | task-poky-small \ | 9 | task-poky-lsb \ |
10 | task-poky-basic-libs \ | 10 | task-poky-sys-extended \ |
11 | task-poky-basic-libs-dbg \ | 11 | task-poky-sys-extended-dbg \ |
12 | task-poky-basic-libs-dev \ | 12 | task-poky-sys-extended-dev \ |
13 | task-poky-basic-utils \ | 13 | task-poky-db \ |
14 | task-poky-basic-utils-dbg \ | 14 | task-poky-db-dbg \ |
15 | task-poky-basic-utils-dev \ | 15 | task-poky-db-dev \ |
16 | task-poky-extended-libs \ | 16 | task-poky-misc \ |
17 | task-poky-extended-libs-dbg \ | 17 | task-poky-misc-dbg \ |
18 | task-poky-extended-libs-dev \ | 18 | task-poky-misc-dev \ |
19 | task-poky-extended-utils \ | 19 | task-poky-perl \ |
20 | task-poky-extended-utils-dbg \ | 20 | task-poky-perl-dbg \ |
21 | task-poky-extended-utils-dev \ | 21 | task-poky-perl-dev \ |
22 | task-poky-network-services \ | 22 | task-poky-python \ |
23 | task-poky-network-services-dbg \ | 23 | task-poky-python-dbg \ |
24 | task-poky-network-services-dev \ | 24 | task-poky-python-dev \ |
25 | task-poky-tcl \ | ||
26 | task-poky-tcl-dbg \ | ||
27 | task-poky-tcl-dev \ | ||
25 | " | 28 | " |
26 | 29 | ||
27 | ALLOW_EMPTY = "1" | 30 | ALLOW_EMPTY = "1" |
28 | 31 | ||
29 | RDEPENDS_task-poky-network-services = "\ | 32 | RDEPENDS_task-poky-lsb = "\ |
30 | # iproute \ | 33 | task-poky-sys-extended \ |
31 | # iputils \ | 34 | task-poky-db \ |
32 | # iptables \ | 35 | task-poky-misc \ |
33 | nfs-utils \ | 36 | task-poky-perl \ |
37 | task-poky-python \ | ||
38 | task-poky-tcl \ | ||
34 | " | 39 | " |
35 | 40 | ||
36 | RDEPENDS_task-poky-shells = "\ | 41 | # |
37 | bash \ | 42 | # GPLv2 Should List |
38 | mktemp \ | 43 | RDEPENDS_task-poky-sys-extended = "\ |
39 | |||
40 | |||
41 | RDEPENDS_task-poky-misc = "\ | ||
42 | strace \ | ||
43 | lsof \ | ||
44 | elfutils \ | ||
45 | usbutils \ | ||
46 | zlib \ | ||
47 | libusb \ | ||
48 | libstdcxx \ | ||
49 | bluez4 \ | ||
50 | " | ||
51 | |||
52 | RDEPENDS_task-poky-basic-libs = "\ | ||
53 | # libssh2 \ | ||
54 | dbus-glib \ | ||
55 | # nfs-utils-lib \ | ||
56 | " | ||
57 | |||
58 | RDEPENDS_task-poky-basic-utils = "\ | ||
59 | # openssh \ | ||
60 | openssl \ | ||
61 | pam \ | ||
62 | sudo \ | ||
63 | beecrypt \ | ||
64 | curl \ | 44 | curl \ |
65 | elfutils \ | 45 | diffutils \ |
46 | gamin \ | ||
47 | hdparm \ | ||
48 | # libaio \ | ||
49 | libxml2 \ | ||
50 | lrzsz \ | ||
51 | lzo \ | ||
52 | # mdadm \ | ||
53 | minicom \ | ||
66 | neon \ | 54 | neon \ |
67 | # mktemp \ | 55 | parted \ |
68 | rpm \ | 56 | pth \ |
69 | bzip2 \ | 57 | quota \ |
70 | # crontabs \ | 58 | # screen \ |
71 | dbus \ | 59 | setserial \ |
72 | python-dbus \ | 60 | # sysstat \ |
73 | e2fsprogs \ | 61 | unzip \ |
74 | gdbm \ | 62 | # watchdog \ |
75 | hal \ | 63 | which \ |
76 | less \ | 64 | zip \ |
77 | popt \ | ||
78 | portmap \ | ||
79 | readline \ | ||
80 | # cron \ | ||
81 | # yaffs2 \ | ||
82 | " | 65 | " |
83 | 66 | ||
84 | RDEPENDS_task-poky-extended-libs = "\ | 67 | RDEPENDS_task-poky-db = "\ |
85 | # cracklib \ | 68 | db \ |
86 | glib-2.0 \ | ||
87 | libcap \ | ||
88 | libevent \ | ||
89 | " | ||
90 | |||
91 | RDEPENDS_task-poky-extended-utils = "\ | ||
92 | # acl \ | ||
93 | # at \ | ||
94 | attr \ | ||
95 | # bc \ | ||
96 | binutils \ | ||
97 | # cpio \ | ||
98 | # cracklib \ | ||
99 | # logrotate \ | ||
100 | # pax \ | ||
101 | # shadow \ | ||
102 | sqlite3 \ | 69 | sqlite3 \ |
103 | # syslog \ | 70 | " |
104 | # ed \ | ||
105 | # lsb \ | ||
106 | # mailx \ | ||
107 | # man \ | ||
108 | # sendmail \ | ||
109 | tcl \ | ||
110 | " | ||
111 | 71 | ||
112 | RDEPENDS_task-poky-python = "\ | 72 | RDEPENDS_task-poky-perl = "\ |
113 | gdbm \ | 73 | gdbm \ |
114 | perl \ | 74 | perl \ |
115 | zlib \ | 75 | zlib \ |
116 | " | 76 | " |
117 | 77 | ||
78 | |||
118 | RDEPENDS_task-poky-python = "\ | 79 | RDEPENDS_task-poky-python = "\ |
119 | expat \ | 80 | expat \ |
120 | gdbm \ | 81 | gdbm \ |
@@ -123,5 +84,21 @@ RDEPENDS_task-poky-python = "\ | |||
123 | openssl \ | 84 | openssl \ |
124 | python \ | 85 | python \ |
125 | readline \ | 86 | readline \ |
87 | zip \ | ||
88 | " | ||
89 | |||
90 | RDEPENDS_task-poky-tcl = "\ | ||
91 | tcl \ | ||
92 | " | ||
93 | |||
94 | RDEPENDS_task-poky-misc = "\ | ||
95 | elfutils \ | ||
96 | gettext \ | ||
97 | lsof \ | ||
98 | ncurses \ | ||
99 | strace \ | ||
100 | # libstdcxx \ | ||
101 | libusb1 \ | ||
102 | usbutils \ | ||
126 | zlib \ | 103 | zlib \ |
127 | " | 104 | " |
diff --git a/meta-lsb/packages/tasks/task-poky-small.bb b/meta-lsb/packages/tasks/task-poky-small.bb deleted file mode 100644 index b966dc72cc..0000000000 --- a/meta-lsb/packages/tasks/task-poky-small.bb +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | # | ||
2 | # Copyright (C) 2010 Intel Corporation | ||
3 | # | ||
4 | |||
5 | DESCRIPTION = "Create Small Image Tasks" | ||
6 | PR = "r0" | ||
7 | |||
8 | PACKAGES = "\ | ||
9 | task-poky-small-utils \ | ||
10 | task-poky-small-utils-dbg \ | ||
11 | task-poky-small-utils-dev \ | ||
12 | " | ||
13 | |||
14 | ALLOW_EMPTY = "1" | ||
15 | |||
16 | RDEPENDS_task-poky-small-utils = "\ | ||
17 | bash \ | ||
18 | coreutils \ | ||
19 | file \ | ||
20 | findutils \ | ||
21 | ncurses \ | ||
22 | psmisc \ | ||
23 | sed \ | ||
24 | time \ | ||
25 | zlib \ | ||
26 | udev \ | ||
27 | udev-extraconf \ | ||
28 | # gawk \ | ||
29 | # grep \ | ||
30 | # gzip \ | ||
31 | # makedev \ | ||
32 | # mktemp \ | ||
33 | # net-tools \ | ||
34 | # procps \ | ||
35 | # passwd \ | ||
36 | # tar \ | ||
37 | # util-linux \ | ||
38 | " | ||