All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-webserver] Update to standalone tree
@ 2013-09-11  0:33 Randy MacLeod
  0 siblings, 0 replies; only message in thread
From: Randy MacLeod @ 2013-09-11  0:33 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Joe MacDonald

I have just done the same thing to meta-webserver
as Joe did to meta-networking so for all the text below:

     s/meta-networking/meta-webserver/g

I haven't updated Joe commit example but I used his script so
the tracking and format will be similar.

// Randy


Joe's original message:
-------------------------------------------------------------


    If you are only using meta-networking from meta-openembedded, you
    need read no further.  This is only for people using my side-project
    on github.  Absolutely nothing has changed in the official
    meta-networking.



For anyone using the standalone meta-networking subtree I maintain on
github, please be aware that I've made a change to the way I create the
subtree which, unfortunately, will result in a forced update for all of
your branches.  And probably a merge on whatever branch you happen to be
on already (eg. master).  If you get into that scenario, I suggest
pushing your current branch with the merge in it off a cliff and
re-creating the current branch tracking the up-stream.  If you're not in
the habit of doing a git-pull, though, this will probably be cleaner:

    % git fetch --all --tags ; git rebase origin/<up-stream-branch-name

The reason for this (and the advantage) has been in response to requests
I've had to preserve the original (that is, meta-oe) commit hash so it
is easy to connect a commit in the standalone meta-networking with the
official meta-networking I maintain as a part of the larger meta-oe.
The change is small and hopefully self-explanatory, but I won't let that 
stop
me.

Before:

commit a0f9363caddbfb92212b4bf5d4a2590c451b7cef
Author: Roy.Li <rongqing.li@windriver.com>
Date:   Fri Jul 19 10:19:25 2013 +0800

     Upgrade vsftpd to 3.0.0
         Upgrade vsftpd to 3.0.0 with below modification:
     1. more strict access limitation, like: do not allow anonymous access
     2. use vsftpd.ftpusers and vsftpd.user_list to confine user access
     3. enable pam if DISTRO_FEATURE includes pam
     4. enable tcp-wrapper
     5. install vsftpd.conf with 0600 permission, not 0755
         Signed-off-by: Roy.Li <rongqing.li@windriver.com>
     Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>

After:

commit b188e402a04db35424e22cb2b2100b7070648948
Author: Roy.Li <rongqing.li@windriver.com>
Date:   Fri Jul 19 10:19:25 2013 +0800

     Upgrade vsftpd to 3.0.0
           (original commit: 441502b68d03a4ce7796436a53c5e95399724ad2)
         Upgrade vsftpd to 3.0.0 with below modification:
     1. more strict access limitation, like: do not allow anonymous access
     2. use vsftpd.ftpusers and vsftpd.user_list to confine user access
     3. enable pam if DISTRO_FEATURE includes pam
     4. enable tcp-wrapper
     5. install vsftpd.conf with 0600 permission, not 0755
         Signed-off-by: Roy.Li <rongqing.li@windriver.com>
     Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>

Where 441502b6... is the commit in meta-oe from Roy that happens to
upgrade vsftpd.

FWIW, I don't anticipate doing anything destructive like this again.

--------------------------------------------------------------------

// Randy




^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-09-11  0:33 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-11  0:33 [meta-webserver] Update to standalone tree Randy MacLeod

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.