d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump buildroot to 2020.11-rc1 (#985)

Browse Source 
* Update buildroot-patches for 2020.11-rc1 buildroot

* Update buildroot to 2020.11-rc1

Signed-off-by: Stefan Agner <stefan@agner.ch>

* Don't rely on sfdisk --list-free output

The --list-free (-F) argument does not allow machine readable mode. And
it seems that the output format changes over time (different spacing,
using size postfixes instead of raw blocks).

Use sfdisk json output and calculate free partition space ourselfs. This
works for 2.35 and 2.36 and is more robust since we rely on output which
is meant for scripts to parse.

* Migrate defconfigs for Buildroot 2020.11-rc1

In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to
BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE).

* Rebase/remove systemd patches for systemd 246

* Drop apparmor/libapparmor from buildroot-external

* hassos-persists: use /run as directory for lockfiles

The U-Boot tools use /var/lock by default which is not created any more
by systemd by default (it is under tmpfiles legacy.conf, which we no
longer install).

* Disable systemd-update-done.service

The service is not suited for pure read-only systems. In particular the
service needs to be able to write a file in /etc and /var. Remove the
service. Note: This is a static service and cannot be removed using
systemd-preset.

* Disable apparmor.service for now

The service loads all default profiles. Some might actually cause
problems. E.g. the profile for ping seems not to match our setup for
/etc/resolv.conf:
[85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
This commit is contained in:
Stefan Agner
2020-11-13 18:25:44 +01:00
committed by GitHub
parent 25a0dd3082
commit a0871be6c0
4024 changed files with 68095 additions and 47900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
buildroot/package/ltris/0001-fix-build-with-gcc-4.8.patch Normal file
View File

@@ -0,0 +1,20 @@
Fix build with gcc 4.8
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://sourceforge.net/p/lgames/patches/28]
Index: ltris/src/bowl.c
===================================================================
--- ltris/src/bowl.c (révision 421)
+++ ltris/src/bowl.c (copie de travail)
@@ -828,9 +828,10 @@
*/
void bowl_init_block_masks()
{
+ int i;
int masksize = sizeof(block_masks[0].mask); // same for all
- for (int i = 0; i < 7; i++) {
+ for (i = 0; i < 7; i++) {
block_masks[i].rx = 2;
block_masks[i].ry = 2;
memset(block_masks[i].mask, 0, masksize );

308
buildroot/package/ltris/0001-fix-gcc5-build.patch
View File

@@ -1,308 +0,0 @@
Upstream patch to fix build with GCC 5
Obtained from the LGames Subversion repository with the following command:
svn diff -c164 svn://svn.code.sf.net/p/lgames/code/trunk/ltris
Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
Revision log message:
------------------------------------------------------------------------
r164 | kulkanie | 2015-05-16 05:48:02 -0300 (Sat, 16 May 2015) | 1 line
removed all inline keywords
------------------------------------------------------------------------
Line added to LTris ChangeLog concerning the change:
- removed all inline keywords to work with GCC 5 (2015/05/16 MS)
Author: Michael Speck
Index: src/sdl.c
===================================================================
--- a/src/sdl.c (revision 163)
+++ b/src/sdl.c (revision 164)
@@ -244,7 +244,7 @@
#endif
/* return full path of bitmap */
-inline void get_full_bmp_path( char *full_path, char *file_name )
+void get_full_bmp_path( char *full_path, char *file_name )
{
sprintf(full_path, "%s/gfx/%s", SRC_DIR, file_name );
}
@@ -330,7 +330,7 @@
/*
lock surface
*/
-inline void lock_surf(SDL_Surface *sur)
+void lock_surf(SDL_Surface *sur)
{
if (SDL_MUSTLOCK(sur))
SDL_LockSurface(sur);
@@ -339,7 +339,7 @@
/*
unlock surface
*/
-inline void unlock_surf(SDL_Surface *sur)
+void unlock_surf(SDL_Surface *sur)
{
if (SDL_MUSTLOCK(sur))
SDL_UnlockSurface(sur);
@@ -666,7 +666,7 @@
/*
lock font surface
*/
-inline void lock_font(Font *fnt)
+void lock_font(Font *fnt)
{
if (SDL_MUSTLOCK(fnt->pic))
SDL_LockSurface(fnt->pic);
@@ -675,7 +675,7 @@
/*
unlock font surface
*/
-inline void unlock_font(Font *fnt)
+void unlock_font(Font *fnt)
{
if (SDL_MUSTLOCK(fnt->pic))
SDL_UnlockSurface(fnt->pic);
@@ -905,7 +905,7 @@
/*
update rectangle (0,0,0,0)->fullscreen
*/
-inline void refresh_screen(int x, int y, int w, int h)
+void refresh_screen(int x, int y, int w, int h)
{
SDL_UpdateRect(sdl.screen, x, y, w, h);
}
@@ -1055,7 +1055,7 @@
/*
lock surface
*/
-inline void lock_screen()
+void lock_screen()
{
if (SDL_MUSTLOCK(sdl.screen))
SDL_LockSurface(sdl.screen);
@@ -1064,7 +1064,7 @@
/*
unlock surface
*/
-inline void unlock_screen()
+void unlock_screen()
{
if (SDL_MUSTLOCK(sdl.screen))
SDL_UnlockSurface(sdl.screen);
@@ -1073,7 +1073,7 @@
/*
flip hardware screens (double buffer)
*/
-inline void flip_screen()
+void flip_screen()
{
SDL_Flip(sdl.screen);
}
@@ -1132,7 +1132,7 @@
/*
get milliseconds since last call
*/
-inline int get_time()
+int get_time()
{
int ms;
cur_time = SDL_GetTicks();
@@ -1148,7 +1148,7 @@
/*
reset timer
*/
-inline void reset_timer()
+void reset_timer()
{
last_time = SDL_GetTicks();
}
Index: src/sdl.h
===================================================================
--- a/src/sdl.h (revision 163)
+++ b/src/sdl.h (revision 164)
@@ -41,8 +41,8 @@
SDL_Surface* load_surf(char *fname, int f);
SDL_Surface* create_surf(int w, int h, int f);
void free_surf( SDL_Surface **surf );
-inline void lock_surf(SDL_Surface *sur);
-inline void unlock_surf(SDL_Surface *sur);
+void lock_surf(SDL_Surface *sur);
+void unlock_surf(SDL_Surface *sur);
void blit_surf(void);
void alpha_blit_surf(int alpha);
void fill_surf(int c);
@@ -86,8 +86,8 @@
Font* load_fixed_font(char *fname, int off, int len, int w);
void free_font(Font **sfnt);
int write_text(Font *sfnt, SDL_Surface *dest, int x, int y, char *str, int alpha);
-inline void lock_font(Font *sfnt);
-inline void unlock_font(Font *sfnt);
+void lock_font(Font *sfnt);
+void unlock_font(Font *sfnt);
SDL_Rect last_write_rect(Font *fnt);
int text_width(Font *fnt, char *str);
@@ -132,14 +132,14 @@
char** get_mode_names( int *count );
int set_video_mode( Video_Mode mode );
void hardware_cap();
-inline void refresh_screen( int x, int y, int w, int h );
+void refresh_screen( int x, int y, int w, int h );
void refresh_rects();
void add_refresh_rect(int x, int y, int w, int h);
int wait_for_key();
void wait_for_click();
-inline void lock_screen();
-inline void unlock_screen();
-inline void flip_screen();
+void lock_screen();
+void unlock_screen();
+void flip_screen();
void fade_screen( int type, int ms );
void take_screenshot( int i );
@@ -148,8 +148,8 @@
SDL_Cursor* create_cursor( int width, int height, int hot_x, int hot_y, char *source );
/* timer */
-inline int get_time();
-inline void reset_timer();
+int get_time();
+void reset_timer();
#ifdef __cplusplus
};
Index: src/tools.c
===================================================================
--- a/src/tools.c (revision 163)
+++ b/src/tools.c (revision 164)
@@ -23,7 +23,7 @@
#include "ltris.h"
/* compares to strings and returns true if their first strlen(str1) chars are equal */
-inline int strequal( char *str1, char *str2 )
+int strequal( char *str1, char *str2 )
{
if ( strlen( str1 ) != strlen( str2 ) ) return 0;
return ( !strncmp( str1, str2, strlen( str1 ) ) );
@@ -30,7 +30,7 @@
}
/* set delay to ms milliseconds */
-inline void delay_set( Delay *delay, int ms )
+void delay_set( Delay *delay, int ms )
{
delay->limit = ms;
delay->cur = 0;
@@ -37,13 +37,13 @@
}
/* reset delay ( cur = 0 )*/
-inline void delay_reset( Delay *delay )
+void delay_reset( Delay *delay )
{
delay->cur = 0;
}
/* check if times out and reset */
-inline int delay_timed_out( Delay *delay, int ms )
+int delay_timed_out( Delay *delay, int ms )
{
delay->cur += ms;
if ( delay->cur >= delay->limit ) {
@@ -56,12 +56,12 @@
}
/* set timer so that we have a time out next call of delay_timed_out() */
-inline void delay_force_time_out( Delay *delay )
+void delay_force_time_out( Delay *delay )
{
delay->cur = delay->limit;
}
-inline void goto_tile( int *x, int *y, int d )
+void goto_tile( int *x, int *y, int d )
{
/* 0 -up, clockwise, 5 - left up */
switch ( d ) {
@@ -326,24 +326,24 @@
the target value until reached when counter_update() is called.
====================================================================
*/
-inline void counter_set( Counter *counter, double value )
+void counter_set( Counter *counter, double value )
{
counter->value = value;
counter->approach = value;
}
-inline void counter_add( Counter *counter, double add )
+void counter_add( Counter *counter, double add )
{
counter->value += add;
}
-inline double counter_get_approach( Counter counter )
+double counter_get_approach( Counter counter )
{
return counter.approach;
}
-inline double counter_get( Counter counter )
+double counter_get( Counter counter )
{
return counter.value;
}
-inline void counter_update( Counter *counter, int ms )
+void counter_update( Counter *counter, int ms )
{
double change;
if ( counter->approach == counter->value ) return;
Index: src/bowl.c
===================================================================
--- a/src/bowl.c (revision 163)
+++ b/src/bowl.c (revision 164)
@@ -333,7 +333,7 @@
Set a tile contents and pixel contents.
====================================================================
*/
-inline void bowl_set_tile( Bowl *bowl, int x, int y, int tile_id )
+void bowl_set_tile( Bowl *bowl, int x, int y, int tile_id )
{
int i, j = y * bowl->block_size;
bowl->contents[x][y] = tile_id;
Index: src/tools.h
===================================================================
--- a/src/tools.h (revision 163)
+++ b/src/tools.h (revision 164)
@@ -33,7 +33,7 @@
#define VEC_DIST( vec1, vec2 ) ( sqrt( ( vec1.x - vec2.x ) * ( vec1.x - vec2.x ) + ( vec1.y - vec2.y ) * ( vec1.y - vec2.y ) ) )
/* compares to strings and returns true if their first strlen(str1) chars are equal */
-inline int strequal( char *str1, char *str2 );
+int strequal( char *str1, char *str2 );
/* delete lines */
void delete_lines( char **lines, int line_number );
@@ -45,16 +45,16 @@
} Delay;
/* set delay to ms milliseconds */
-inline void delay_set( Delay *delay, int ms );
+void delay_set( Delay *delay, int ms );
/* reset delay ( cur = 0 )*/
-inline void delay_reset( Delay *delay );
+void delay_reset( Delay *delay );
/* check if time's out ( add ms milliseconds )and reset */
-inline int delay_timed_out( Delay *delay, int ms );
+int delay_timed_out( Delay *delay, int ms );
/* set timer so that we have a time out next call of delay_timed_out() */
-inline void delay_force_time_out( Delay *delay );
+void delay_force_time_out( Delay *delay );
/* return distance betwteen to map positions */
int get_dist( int x1, int y1, int x2, int y2 );

2
buildroot/package/ltris/ltris.hash
View File

@@ -1,3 +1,3 @@
# Locally computed:
sha256 8f6a9e7719d22004aee153db29ffd9ca41c7a6cd87fc791591994eecc2e625a1 ltris-1.0.19.tar.gz
sha256 a7bc6c5fc6539b88505077a1b4580edc9b179ce0a6b829c58fbd9416cf456195 ltris-1.2.tar.gz
sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING

2
buildroot/package/ltris/ltris.mk
View File

@@ -5,7 +5,7 @@
################################################################################
LTRIS_SITE = http://downloads.sourceforge.net/lgames/ltris
LTRIS_VERSION = 1.0.19
LTRIS_VERSION = 1.2
LTRIS_LICENSE = GPL-2.0+
LTRIS_LICENSE_FILES = COPYING