Commit Graph

28187 Commits

Author SHA1 Message Date
Harald Welte 0d60036748 Merge commit 'c9908cfd53dd4d2e71d528ba9e019325e7409d70' into dora 2015-05-21 17:52:32 +02:00
Harald Welte c9908cfd53 increment nfacct PR to force package rebuild 2015-05-21 17:52:15 +02:00
Harald Welte d57ac4e3e6 nfacct json support: add timestamp to json output 2015-05-21 17:52:15 +02:00
Holger Hans Peter Freyther 3c7a1caef2 libjson-perl: Drop the idea of using libjson-xs-perl
Drop the dependency and more modules. I don't feel like packaging
Types::Serialiser and then their dependencies and so on. The pure
perl based encoding does work and we don't want to run this code
every milli second.
2015-05-21 19:52:00 +08:00
Holger Hans Peter Freyther 27897f433a Merge commit 'b792b649e4cd2b7376af52642610b6bb5f489d5f' into dora 2015-05-21 19:38:28 +08:00
Holger Hans Peter Freyther b792b649e4 libjson-xs-perl: Add needed dependency by the same author
libjson-xs requires another module that is normally not
packaged.
2015-05-21 19:37:00 +08:00
Holger Hans Peter Freyther d454e151c3 libjson: Make the pure-perl version work
Depend on two more modules to have the following code
emit something:

 #use JSON::XS;
use JSON;

my %rec_hash = ('a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5);
my $json = encode_json \%rec_hash;
print "$json\n";
2015-05-21 19:10:09 +08:00
Holger Hans Peter Freyther be3c19b19b Merge commit '7f9ef4ddb9a0fd454e3fff9a58bbd8fa44cb6cef' into dora 2015-05-21 18:37:50 +08:00
Holger Hans Peter Freyther 7f9ef4ddb9 libjson-perl: Fix the license file checksum
I am not exactly sure how I managed to skip this step
locally and when I broke it.
2015-05-21 18:37:06 +08:00
Holger Hans Peter Freyther 20e4089ce3 Merge commit '8161ee10f0bf148d4dff4f584d3a6c02737d0f73' into dora 2015-05-21 18:30:06 +08:00
Holger Hans Peter Freyther 8161ee10f0 libjson-perl: Fix last minute dependency issue 2015-05-21 18:29:21 +08:00
Holger Hans Peter Freyther 263ac6b27f Merge commit 'bbfff1e487037b2a60588d30e2a3851cf2c4be49' into dora 2015-05-21 18:17:59 +08:00
Holger Hans Peter Freyther bbfff1e487 task-sysmocom-feed: Build perl and include the new modules
We want these modules to be available, specially to
determine the real depedencies and then to fix them.
2015-05-21 18:15:35 +08:00
Holger Hans Peter Freyther 3f26af624b perl/json: Add two libraries needed for perl/JSON handling
Besides DBI we need the JSON module. As far as I can see
JSON can use JSON:XS as a fast encoder/decoder. This is
why both libraries need to be provided.
2015-05-21 18:12:13 +08:00
Holger Hans Peter Freyther a54fdc0570 libdbi/libdbd: Import the perl module needed for a script
We need DBI and the sqlite3 backend support for a small
monitoring application. Make it available. The files were
taken from meta-perl as of yesterday.
2015-05-21 17:34:31 +08:00
Holger Hans Peter Freyther ea9e9cc540 Merge commit '753b6db01978d37dca23176ed94f7612904bbda1' into dora 2015-05-21 15:18:46 +08:00
Holger Hans Peter Freyther 753b6db019 Create sysmobts-sob task and make sure the real ifupdown is installed
Add the new task to task-sysmocom-feed so it is being built by
default in our CI infrastructure.

make iputils available as well for people wanting to use a real
ping/traceroute/arping.

Related: SYS#1190
2015-05-21 15:17:11 +08:00
Harald Welte 5a597a3c91 Merge commit 'd3ae677639d84714602fd02e6803a7e6c5c45ecc' into dora 2015-05-20 11:01:53 +02:00
Harald Welte d3ae677639 nfacct: Add patches for direct JSON output format
Rather than parsing the existing XML or standard output of the nfacct
utility, and then piping that into a perl/python script for formatting
to JSON, we teach nfacct to generate JSON directly.  This seems like
the proper way to do it.  The patches will be submitted mainline.
2015-05-20 11:00:13 +02:00
Henning Heinold 88f39279bc sysmocom-idu: remove ifplugd from MACHINE_ESSENTIAL_EXTRA_RDEPENDS
[hfreyther: I asked henning to move forward and not test this. We
do not have dhcp/dynamic config in /etc/network/interfaces and the
link will always be up on the idu due it being connected to a switch.
ifplugd is not doing anything useful in this context]

Fixes: SYS#1535
2015-05-19 21:20:50 +02:00
Holger Hans Peter Freyther 155ee4768e Merge commit 'a89b5587e2601c6a325e7a748f392fb8025df515' into dora 2015-05-19 21:10:47 +02:00
Henning Heinold a89b5587e2 image-static-dns.bb: new image snippet to set a static dns configuration
Fixes: SYS#1126
2015-05-19 21:10:02 +02:00
Holger Hans Peter Freyther 8b5f88e80b syslog: Do not re-create the symbolic link
In SYS#659 we wanted that "file" will always log to a persistent
/var/log. After I changed the /etc/default/volatiles/00_core for
the IDU and made journald persistent we still ended up having the
symlink. It appears to be caused by this script.

* When "buffer" is used we don't need to care about /var/log as
it is not being used at all.

* When "file" is set we make sure that /var/log is not a symlink.

In case of the IDU the journald should now be persistent.

Related: SYS#659
2015-05-15 11:12:39 +02:00
Henning Heinold e374c6bc04 busybox-udhcpc: add default file to control the modification of /etc/resolv.conf
- using commit aee3a65e2a,
  which fixes the route metrics from holger for all machines

Fixes: SYS#1126
2015-05-14 15:32:11 +02:00
Holger Hans Peter Freyther 6dfbeb8cea Merge commit '8073a33e2cb0bbf3aa7ac14808e4cedebb0c20f4' into dora 2015-05-13 12:16:35 +02:00
Holger Hans Peter Freyther 8073a33e2c qtbase: Cherry-pick ioctl change from Qt 5.4
The log is spammed with:

May 03 06:24:58 kernel[221]: Loading kernel module for a netw....
May 03 06:24:59 kernel: Loading kernel module for a network ...d.

this is because of an ioctl for an invalid device which leads
to the kernel trying to load a module. This occurs many times
a minute.

I have cherry-picked 1910454fe00cce8b815b1abc0a18a04d3d387ccf which
merged without conflicts. It has not been compile tested.

Related: SYS#1610
2015-05-13 12:11:56 +02:00
Holger Hans Peter Freyther ad81ff7de9 Merge commit 'bf472b1799a81f46ef0598efd31e64618b8f0730' into dora 2015-05-13 09:33:27 +02:00
Holger Hans Peter Freyther bf472b1799 initscripts: Attempt to have /var/log on the root partition
For the IDU we currently want to have persistent log files. We
need to fork the volatiles script (installed as 00_core) and it
is already different between dora and current master of poky.

We are missing an sob-idu-qa check that verifies that /var/log
is not a symlink and that /etc/systemd/system/journald.conf is
set to persistent too.

Related: SYS#659
2015-05-13 09:31:50 +02:00
Holger Hans Peter Freyther 4dafdbcc17 systemd: Make the log persistent for the IDU
Similar to the T-ODU we would like to keep a persistent log.
This commit is completely untested, rushed and not the final
one (/etc/default/volatiles/00_core most likely needs patching
and we want to limit the size of the log as well).

Related: SYS#659
2015-05-13 09:31:50 +02:00
Harald Welte abe0c65892 idu /etc/network/interfaces: Major update
* add interface for connection to Inmarsat
* remove 'br0' and work directly with 'eth2' instead, to avoid bridges
  in vlans of bridges
* bridge the video LAN also into the backbone (for later break-out)
2015-05-12 22:29:49 +02:00
Holger Hans Peter Freyther d97e87f46b dbus: Catch up with yocto-master
dbus is now using version 1.8.16 instead of the old version.
Our patch does not depend on a specific version of dbus, so
let us use a wildcard.
2015-05-11 16:31:37 +02:00
Harald Welte d35fbc4f82 [idu] dnsmasq: Add DHCP range for video subnet 2015-05-10 11:22:49 +02:00
Jan Luebbe 5304e22ff4 busybox: create /etc/default before using it
This fixes an error during do_install for busybox when building on dora.
2015-05-06 11:23:48 +02:00
Harald Welte 35a13a17ee conntrack-tools: Dont have HTML as init script, but actual script 2015-05-05 15:32:44 +02:00
Holger Hans Peter Freyther 1a61dfc20a linux-sysmocom: Really base on 3.10.76 for our kernel
linux-sysmocom_git.bb is used for the BTS, BSC and IDU. Let's
really use 3.10.76 (from 3.10.50 just rebased and not tested
on the device yet). This should fix the Yocto-Master build
tonight.
2015-05-04 21:15:28 +02:00
Daniel Willmann 933d151e84 Merge branch 'hheinold/ntp'
Ticket: SYS#1180
2015-05-04 20:05:53 +02:00
Henning Heinold ef2c9b84d3 busybox: add package for udhcpc which can set the ntp server provided by the dhcpc-server
* the oe udhcpc calls /usr/share/udhcpc/default.script which
  calls run-parts -a "$1" /etc/udhcpc.d, so we can install
  our script as 60ntp

* using /etc/default/udhcpc-ntp to have the possibility
  to disable it on the target, its enabled per default

Related: SYS#1180
2015-05-04 20:03:57 +02:00
Henning Heinold f0278f35a9 dnsmasq: provide the ntp server running on the idu to the dhcp clients
Fixes: SYS#1180
2015-05-04 20:03:05 +02:00
Holger Hans Peter Freyther 4d76f00233 linux-sysmocom: Remove the branch from the SRC_URI
9610e792ffde7fb2599d19ca6d2a03230f2043c6 can not be found
in the linux-3.10.76 branch. Just avoid this branch game.

ERROR: Fetcher failure: Unable to find revision 9610e792ffde7fb2599d19ca6d2a03230f2043c6 in branch linux-3.10.76 even from upstream
ERROR: Function failed: Fetcher failure for URL: 'git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=linux-3.10.76'. Unable to fetch URL from any source.
ERROR: Logfile of failure stored in: /home/builder/jenkins/workspace/Yocto-Master/label/OE/build/tmp/work/sysmobts_v2-poky-linux-gnueabi/linux-sysmocom/3.10.76+gitAUTOINC+9610e792ff-r43/temp/log.do_fetch.16350
NOTE: recipe linux-sysmocom-3.10.76+gitAUTOINC+9610e792ff-r43: task do_fetch: Failed
ERROR: Task 126 (/home/builder/jenkins/workspace/Yocto-Master/label/OE/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb, do_fetch) failed with exit code '1
2015-05-03 23:15:40 +02:00
Harald Welte bd6709ae21 Merge commit '809e9cd999f670950d250b1097a423a4f08fd8a4' into dora 2015-05-03 11:38:12 +02:00
Harald Welte 809e9cd999 ulogd: Disable building pgsql/mysql output plugins
As ulogd's configure script doesn't support this out of the box, we need
to patch it for this.
2015-05-03 11:37:57 +02:00
Holger Hans Peter Freyther 8753fbf081 yocto-master: We shouldn't need to patch pkgconfig anymore
pkg.m4 has been packaged in the main package for a long
while. We certainly don't need this in master anymore.

ERROR: No recipes available for:
 /ws/meta-sysmocom-bsp/yocto-master/pkgconfig_0.28.bbappend
2015-05-02 21:24:53 +02:00
Harald Welte 973134df36 Merge commit '3324575ef58f53ac38c59415de16a510c874200c' into dora 2015-05-02 19:23:06 +02:00
Harald Welte 3324575ef5 nfacct: RDEPENDS should be ${PN} specific 2015-05-02 19:21:31 +02:00
Harald Welte 58a8325efa Merge commit '6938804c99f4e86d917bc504701219ad978f611e' into dora 2015-05-02 17:34:47 +02:00
Harald Welte 6938804c99 nfacct: Add RDEPENDS to kernel modules
nfacct in userspace doesn't work without its kernel counterparts..
2015-05-02 17:33:40 +02:00
Harald Welte 7c6170178d ulogd: Add RDEPENS to respective kernel modules
some sub-packages of ulogd don't make sense without the corresponding
kernel modules
2015-05-02 17:31:34 +02:00
Harald Welte 864ea38cb9 Merge commit '62856a3a9b246d714d60820582dfa03b34408d6a' into dora 2015-05-02 14:19:42 +02:00
Harald Welte 62856a3a9b [idu/bsc] bump PR of linux-sysmocom_git.bb 2015-05-02 14:18:56 +02:00
Harald Welte 8b9a9895ec [bsc/idu]: keep netfilter/ipsec as modules
It seems like the kernel/package/upgrade/... proceess doesn't deal well
with the fact that some options used to be modules, which are now
built-in.  Let's keep it as modules for the time being.
2015-05-02 14:15:35 +02:00